From 073250ce43d422c5807838e78d338dd490d5d4ce Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 7 Mar 2022 15:36:08 +0800 Subject: [PATCH 1/5] fix yd exemption list --- app/Classes/ValueObjects/Constants/WarehouseReferences.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Classes/ValueObjects/Constants/WarehouseReferences.php b/app/Classes/ValueObjects/Constants/WarehouseReferences.php index 66ce67e6..59943ae8 100644 --- a/app/Classes/ValueObjects/Constants/WarehouseReferences.php +++ b/app/Classes/ValueObjects/Constants/WarehouseReferences.php @@ -41,5 +41,8 @@ final class WarehouseReferences { public const YD_DESTINATION_WAREHOUSE = self::YD_KLANG; + public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726]; + + //2376 qce } From 6d77fe171a74048301fc892b4034037ae22155f6 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 7 Mar 2022 15:36:34 +0800 Subject: [PATCH 2/5] fix yd exemption list --- .../Modules/Orders/ControllersLogic/CreateOrderLogic.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php index 1cabb5e1..19b842e3 100644 --- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php +++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php @@ -63,10 +63,12 @@ class CreateOrderLogic extends AbstractControllerLogic $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]); $address = $this->fetchesAddress->execute(['id' => $request->input('address_id')]); - + $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]); - $originWarehouse = $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? $this->fetchesCompanyModule->execute(['reference' => in_array($company->id, [2376]) ? WarehouseReferences::VT_GUANG_ZHOU : WarehouseReferences::YD_GUANG_ZHOU]) : $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_YIWU]); + if(!in_array($company->id, WarehouseReferences::YD_EXEMPT_LIST)){ + $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::VT_GUANG_ZHOU : WarehouseReferences::YD_YIWU]); + } if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) { throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment. you can select our Guangzhou warehouse as an alternative.'); From 8701620dcf7d4035eec5b21347422e5a6b61c8af Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 8 Mar 2022 10:12:59 +0800 Subject: [PATCH 3/5] add warehouse remark to qr pdf --- app/Http/Controllers/Orders/DownloadOrderQrPdfController.php | 4 ++++ resources/views/pdfs/qr.blade.php | 1 + 2 files changed, 5 insertions(+) diff --git a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php index b456d880..5656a1bf 100644 --- a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php +++ b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php @@ -25,6 +25,7 @@ class DownloadOrderQrPdfController $deliveryPrefix = ''; if($warehouse->reference === WarehouseReferences::VT_GUANG_ZHOU || $warehouse->reference === WarehouseReferences::VT_YIWU) { + $remark = '周一 至 周六 , 早上八点到下午六点'; if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') { $deliveryPrefix = 'SB/'; } @@ -35,10 +36,12 @@ class DownloadOrderQrPdfController } if($warehouse->reference === WarehouseReferences::YD_YIWU){ + $remark = '周一 至 周六 , 早上九点到下午六点'; $warehousePrefix = 'YW/'; } if($warehouse->reference === WarehouseReferences::YD_GUANG_ZHOU){ + $remark = '周日 至 周五 , 早上八点到下午六点'; $warehousePrefix = 'YD/'; if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') { @@ -57,6 +60,7 @@ class DownloadOrderQrPdfController 'delivery_address' => $deliveryAddress, 'warehouse_address' => $warehouseAddress, 'warehouse_contacts' => $warehouseContacts, + 'remark' => $remark ]; $pdf = LaravelMpdf::loadView('pdfs.qr', $data, [], [ diff --git a/resources/views/pdfs/qr.blade.php b/resources/views/pdfs/qr.blade.php index d9271960..b09d22b5 100644 --- a/resources/views/pdfs/qr.blade.php +++ b/resources/views/pdfs/qr.blade.php @@ -40,6 +40,7 @@

仓库地址:

{{$warehouse_address->state->name.' '.$warehouse_address->district->name.' '.$warehouse_address->street_one.' '.$warehouse_address->street_two.' 邮编:'.$warehouse_address->postcode}}

联系：@foreach($warehouse_contacts as $contact){{ $loop->first ? '' : ' / ' }}{{ $contact->phone.' '.$contact->reference }}@endforeach

+

{{$remark}}

From 072e65c00c8d339bd853b4601d6d4a5c8c546619 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 8 Mar 2022 12:06:59 +0800 Subject: [PATCH 4/5] fix claim packinglist status --- .../ControllersLogic/AssignPackingListOrderLogic.php | 12 ++++++++++-- .../Services/UpdatesPackingListOwner.php | 4 +--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php index 3ba6d129..f91c637d 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php @@ -72,8 +72,16 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic /** * CreateRemarkLogic constructor. - * @param CanCreateRemark $canCreateRemark - * @param CreatesPackingListRemark $createsPackingListRemark + * @param FetchesPackingList $fetchesPackingList + * @param FetchesOrder $fetchesOrder + * @param UpdatesPackingListOwner $updatesPackingListOwner + * @param UpdatesTransportStatus $updatesTransportStatus + * @param CreatesContract $unityCreateContract + * @param ActivateContractProcessor $unityActivateContract + * @param CreateContractEntityProcessor $unityCreateContractEntity + * @param AssignContractEntityProcessor $unityAssignContractEntity + * @param UpdatesPackingListContractReference $updatesPackingListContractReference + * @param CreatesStep $createsStep */ public function __construct(FetchesPackingList $fetchesPackingList, FetchesOrder $fetchesOrder, UpdatesPackingListOwner $updatesPackingListOwner, UpdatesTransportStatus $updatesTransportStatus, CreatesContract $unityCreateContract, ActivateContractProcessor $unityActivateContract, CreateContractEntityProcessor $unityCreateContractEntity, AssignContractEntityProcessor $unityAssignContractEntity, UpdatesPackingListContractReference $updatesPackingListContractReference, CreatesStep $createsStep) { diff --git a/app/Classes/Modules/PackingLists/Services/UpdatesPackingListOwner.php b/app/Classes/Modules/PackingLists/Services/UpdatesPackingListOwner.php index 4a6b6dfb..351663a2 100644 --- a/app/Classes/Modules/PackingLists/Services/UpdatesPackingListOwner.php +++ b/app/Classes/Modules/PackingLists/Services/UpdatesPackingListOwner.php @@ -12,14 +12,12 @@ class UpdatesPackingListOwner extends AbstractUpdateRelationshipRecord /** * @param PackingList $model - * @param int $status + * @param Packable $packable * @return \Illuminate\Database\Eloquent\Model * @throws \App\Classes\Exceptions\MalformedRequestException */ public function execute(PackingList $model, Packable $packable) { - $model->status = ApprovalStatus::APPROVED; - return $this->handler($packable->packingLists(), $model); } From 89aa52e9c2b8a63bac2daf3a2e8d97b90e052ce2 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 8 Mar 2022 12:27:29 +0800 Subject: [PATCH 5/5] add enter trigger to search containers --- .../components/containers/elements/ContainerSearchComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/containers/elements/ContainerSearchComponent.vue b/resources/assets/vue/components/containers/elements/ContainerSearchComponent.vue index cea61ba9..c9ffa4cd 100644 --- a/resources/assets/vue/components/containers/elements/ContainerSearchComponent.vue +++ b/resources/assets/vue/components/containers/elements/ContainerSearchComponent.vue @@ -1,5 +1,5 @@