diff --git a/app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php index aea1f932..fed6e182 100644 --- a/app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php +++ b/app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php @@ -27,7 +27,6 @@ class LogoutUserLogic extends AbstractControllerLogic */ public function __construct(InvalidatesAuthenticationToken $invalidatesAuthenticationToken) { - logger("logout user logic"); $this->invalidatesAuthenticationToken = $invalidatesAuthenticationToken; } diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateShippingPackingListLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateShippingPackingListLogic.php index 574200fe..4ac8d3c4 100644 --- a/app/Classes/Modules/Orders/ControllersLogic/CreateShippingPackingListLogic.php +++ b/app/Classes/Modules/Orders/ControllersLogic/CreateShippingPackingListLogic.php @@ -19,6 +19,7 @@ use App\Classes\ValueObjects\Constants\PackingListType; use App\Classes\ValueObjects\Constants\TransportType; use App\Http\Resources\PackingListResource; +use App\Models\PackingList; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Carbon\Carbon; @@ -80,6 +81,9 @@ class CreateShippingPackingListLogic extends AbstractControllerLogic /** * @param Request $request * @return JsonResponse + * @throws \App\Classes\Exceptions\AccessForbiddenException + * @throws \App\Classes\Exceptions\MalformedRequestException + * @throws \App\Classes\Exceptions\RequestValidationException */ public function logic(Request $request) : JsonResponse { @@ -93,6 +97,8 @@ class CreateShippingPackingListLogic extends AbstractControllerLogic PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::PENDING_SUBMISSION ); + + /** @var PackingList $packingList */ $packingList = $this->createPackingListProcessor->execute($packingListObject, $order); $packages = $request->input('packages'); diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php index 3a9ebdea..520e64ec 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php @@ -66,6 +66,10 @@ class FetchDeliveryListFromVTPortalProcessor $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest); + if(!array_key_exists(0, $shippingPackingLists->Rows)){ + continue; + } + $shippingPackingList = $shippingPackingLists->Rows[0]; if(!$shippingPackingList[9] && !$shippingPackingList[10]) { @@ -87,6 +91,7 @@ class FetchDeliveryListFromVTPortalProcessor $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]); } catch (GuzzleException $exception) { + dd($exception); continue; } diff --git a/app/Classes/Modules/PackingLists/Services/CreatesPackingList.php b/app/Classes/Modules/PackingLists/Services/CreatesPackingList.php index 0654557f..1f2f6321 100644 --- a/app/Classes/Modules/PackingLists/Services/CreatesPackingList.php +++ b/app/Classes/Modules/PackingLists/Services/CreatesPackingList.php @@ -23,6 +23,7 @@ class CreatesPackingList extends AbstractUpdateRelationshipRecord $model->claimant_id = $object->getClaimantId(); $model->type = $object->getType(); $model->status = $object->getStatus(); + $model->reference_contract = $object->getContractReference(); return $this->handler($packable->packingLists(), $model); } diff --git a/app/Classes/Modules/Unity/Services/UpdatesContractObligation.php b/app/Classes/Modules/Unity/Services/UpdatesContractObligation.php index 70246a66..25a5c0f5 100644 --- a/app/Classes/Modules/Unity/Services/UpdatesContractObligation.php +++ b/app/Classes/Modules/Unity/Services/UpdatesContractObligation.php @@ -22,7 +22,7 @@ class UpdatesContractObligation $accessToken=$this->getAccessToken->execute(); - $this->updateContractStatusEndpoint = str_replace('{hash}',$obligation_hash_id,$this->updateContractStatusEndpoint); + $this->updateContractStatusEndpoint = str_replace('{hash}', $obligation_hash_id, $this->updateContractStatusEndpoint); $response = Http::withToken($accessToken)->put($this->updateContractStatusEndpoint,['entity_signature_id'=>$contract_entity_signature])->object(); diff --git a/app/Http/Controllers/Accounts/UserAuthenticationLogoutController.php b/app/Http/Controllers/Accounts/UserAuthenticationLogoutController.php index 46013fa4..9d574a21 100644 --- a/app/Http/Controllers/Accounts/UserAuthenticationLogoutController.php +++ b/app/Http/Controllers/Accounts/UserAuthenticationLogoutController.php @@ -15,7 +15,6 @@ class UserAuthenticationLogoutController * @return JsonResponse */ public function logout(Request $request, LogoutUserLogic $logic): JsonResponse { - logger("logout controller"); return $logic->execute($request); } diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue index 749e7ef8..055097ed 100644 --- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue @@ -11,6 +11,30 @@
+
+
+ + +
+
diff --git a/resources/assets/vue/components/general/elements/chineseNewYearMemoComponent.vue b/resources/assets/vue/components/general/elements/chineseNewYearMemoComponent.vue new file mode 100644 index 00000000..d24e197f --- /dev/null +++ b/resources/assets/vue/components/general/elements/chineseNewYearMemoComponent.vue @@ -0,0 +1,133 @@ + + + + \ No newline at end of file diff --git a/resources/views/pages/customers/dashboard.blade.php b/resources/views/pages/customers/dashboard.blade.php index 80cddfcd..3f1ff132 100644 --- a/resources/views/pages/customers/dashboard.blade.php +++ b/resources/views/pages/customers/dashboard.blade.php @@ -1,32 +1,5 @@
-
-
- -
-
\ No newline at end of file diff --git a/routes/web.php b/routes/web.php index efc1b5cf..73f7841b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -102,6 +102,7 @@ Route::get('/orders/refresh', function(){ Route::get('/containers/refresh', function(){ +// FetchLoadedContainersFromVTPortalJob::dispatch(); FetchContainersStatusUpdateFromVTPortalJob::dispatch(); return redirect('orders');