From 50a545595fabe9d475896bfbe60d127cb7d755e7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sun, 27 Feb 2022 15:34:13 +0800 Subject: [PATCH 01/24] fix detached containers --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 7a81972f..f1a4cd2d 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -310,6 +310,7 @@ class FetchOrderListsFromYdPortalProcessor if($containerReference) { try { $container = $this->fetchesContainer->execute(['reference' => $containerReference]); + $container->packingLists()->syncWithoutDetaching([$packingList->id]); } catch (ResourceNotFoundException $exception){ if (!$allow_contract) { From 34532d0f683f007d24db32798d6b8f2c446b26bb Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sun, 27 Feb 2022 15:37:25 +0800 Subject: [PATCH 02/24] fix detached containers --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index f1a4cd2d..e84da49e 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -381,6 +381,7 @@ class FetchOrderListsFromYdPortalProcessor } DB::commit(); + echo 'successful'; } } catch (\Exception $exception) { From 0ef2c9bf6dea9b99ab5490e1d1d90062ca027eff Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 28 Feb 2022 10:51:57 +0800 Subject: [PATCH 03/24] fix yd yiwu warehouse selection --- .../Modules/Orders/ControllersLogic/CreateOrderLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php index 3081cffc..70aca682 100644 --- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php +++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php @@ -66,7 +66,7 @@ class CreateOrderLogic extends AbstractControllerLogic $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' => $company->id === WarehouseReferences::YD_YIWU]); + $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($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 due to the chinese new year\'s holiday. you can select our Guangzhou warehouse as an alternative.'); From 788b63228536404ccf15934507913db62b01f1b1 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 1 Mar 2022 13:22:46 +0800 Subject: [PATCH 04/24] update announcements --- .../CustomerProfileSectionComponent.vue | 23 ------------------- .../orders/forms/OrderFormComponent.vue | 5 ++-- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue index 60466864..749e7ef8 100644 --- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue @@ -11,29 +11,6 @@
-
-
- -
-
diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue index 9b1a4ebd..23fb2c77 100644 --- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue +++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue @@ -45,9 +45,8 @@
-

请注意!! 由于近期船公司对于重量严格把控，我司对于货物超重的算法也进行了调整。新超重算法将从 2022 年 1 月 20日（货物装箱日期）起实行。

-

Attention!! Due to the shipping liner company are strict on checking the weight recently, our company has modified the calculation formula against overweight goods. The new formula will start to be applied on 20th January 2022 (goods loaded date).

-

For more details: https://www.cief-malaysia.com/services-sea-shipping/

+

最新运费价格 点击 “这里

+

For the latest shipping prices click here

From 5b7d6b0a2f7f704869928a877aa894703581df61 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 1 Mar 2022 13:26:30 +0800 Subject: [PATCH 05/24] update announcements --- .../assets/vue/components/orders/forms/OrderFormComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue index 23fb2c77..5259b492 100644 --- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue +++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue @@ -53,7 +53,7 @@
-

浙江北仑疫情爆发， 义乌船期非常不稳定，建议发广州仓库
Due to Beilun, Zhejiang pandemic outbreak our Yiwu warehouse might experience unexpected shipping delays, you can select our Guangzhou warehouse as an alternative.

+

由于义乌船期不稳定，建议发广州仓库。
Due to unexpected shipping delays for Yiwu warehouse, you may select an alternative warehouse.

From 22da7b5efd1a309a5db5f971343fe004ca311a0b Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 1 Mar 2022 13:31:07 +0800 Subject: [PATCH 06/24] update announcements --- .../assets/vue/components/orders/forms/OrderFormComponent.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue index 5259b492..e05e6117 100644 --- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue +++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue @@ -45,8 +45,7 @@
-

最新运费价格 点击 “这里

-

For the latest shipping prices click here

+

最新运费价格 点击 “这里
For the latest shipping prices click here

From f3c7422e6cc8e7057a2132b4efc98321d883ccd6 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 1 Mar 2022 13:33:34 +0800 Subject: [PATCH 07/24] update announcements --- .../assets/vue/components/orders/forms/OrderFormComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue index e05e6117..9b0020c9 100644 --- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue +++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue @@ -45,7 +45,7 @@
-

最新运费价格 点击 “这里
For the latest shipping prices click here

+

最新运费价格 点击 “这里
For the latest shipping prices click here

From 2fad8a599448edbf80636b8b0cc9a4cddf556200 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 1 Mar 2022 20:08:59 +0800 Subject: [PATCH 08/24] debug release button --- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 980ebf01..3c99a121 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -75,6 +75,7 @@ class UpdateDoFromVTPortalProcessor $vt_do = $this->fetchesDataFRomVTPortal->getResponseBody($vt_do); if ($vt_do) { + dd($vt_do->Rows); foreach ($vt_do->Rows as $key => $row) { $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest( 'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', From d37dfa2aa8bc79d29784571e8477c5dc3ab7ef61 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 1 Mar 2022 20:11:02 +0800 Subject: [PATCH 09/24] debug release button --- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index 3c99a121..a8cda5c9 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -74,8 +74,8 @@ class UpdateDoFromVTPortalProcessor $vt_do = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Do","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"Filter": ["FullMarking:$contains$%js%\"' . $order->reference . '\"\u0000"]}}'), ''); $vt_do = $this->fetchesDataFRomVTPortal->getResponseBody($vt_do); + dd($vt_do); if ($vt_do) { - dd($vt_do->Rows); foreach ($vt_do->Rows as $key => $row) { $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest( 'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', From 56c71e1500c5927af49e0f40e238aded02175a5f Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 1 Mar 2022 20:12:04 +0800 Subject: [PATCH 10/24] debug release button --- .../Orders/Processors/UpdateDoFromVTPortalProcessor.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index a8cda5c9..ef78a45f 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -49,6 +49,7 @@ class UpdateDoFromVTPortalProcessor */ public function execute($address) { + dd('opened'); if(!app()->environment(['production'])){ return []; } @@ -74,7 +75,7 @@ class UpdateDoFromVTPortalProcessor $vt_do = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Do","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"Filter": ["FullMarking:$contains$%js%\"' . $order->reference . '\"\u0000"]}}'), ''); $vt_do = $this->fetchesDataFRomVTPortal->getResponseBody($vt_do); - dd($vt_do); + if ($vt_do) { foreach ($vt_do->Rows as $key => $row) { $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest( From 87d7a7572f6ed47d807373b355918bf4700f675e Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 1 Mar 2022 20:13:25 +0800 Subject: [PATCH 11/24] debug release button --- .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php | 1 - .../ControllersLogic/UpdatePackingListStatusLogic.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php index ef78a45f..9485b1c6 100644 --- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php +++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php @@ -49,7 +49,6 @@ class UpdateDoFromVTPortalProcessor */ public function execute($address) { - dd('opened'); if(!app()->environment(['production'])){ return []; } diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php index 4eb67646..1436a21b 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php @@ -75,6 +75,7 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id; + dd($appointee); $appointee === 2 ? $this->updateDoFromVTPortalProcessor->execute($address) : $this->updateDoFromYDPortalProcessor->execute($address); return $this->resourceResponse(new PackingListResource($packing_list)); From 9ab0133e00179b50de6b36450d7ef3f969965414 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 1 Mar 2022 20:14:40 +0800 Subject: [PATCH 12/24] debug release button --- .../ControllersLogic/UpdatePackingListStatusLogic.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php index 1436a21b..19b70a55 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php @@ -74,9 +74,10 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic $address = $packing_list->owner()->first()->addresses()->where('status', ApprovalStatus::APPROVED)->first(); - $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id; - dd($appointee); - $appointee === 2 ? $this->updateDoFromVTPortalProcessor->execute($address) : $this->updateDoFromYDPortalProcessor->execute($address); +// $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id; + + $this->updateDoFromVTPortalProcessor->execute($address); + $this->updateDoFromYDPortalProcessor->execute($address); return $this->resourceResponse(new PackingListResource($packing_list)); } From 7e4b5d852845d52e65f041df36b0ebc5fc660754 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 2 Mar 2022 11:20:07 +0800 Subject: [PATCH 13/24] update yiwu warehouse west malaysia notice --- .../Modules/Orders/ControllersLogic/CreateOrderLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php index 70aca682..1cabb5e1 100644 --- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php +++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php @@ -69,7 +69,7 @@ class CreateOrderLogic extends AbstractControllerLogic $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($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 due to the chinese new year\'s holiday. you can select our Guangzhou warehouse as an alternative.'); + 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.'); } $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute()); From 251d44912f408b299239f6b13e8974b384e2d4c3 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 2 Mar 2022 20:31:05 +0800 Subject: [PATCH 14/24] show estimated parcel cbm --- .../assets/vue/components/orders/elements/ParcelComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue index 08218b96..6563983f 100644 --- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue +++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue @@ -26,7 +26,7 @@

Qty

{{item.quantity}}

-
+

Est. CBM

{{((parseFloat(item.cbm) * 1000) / 1000).toFixed(3)}}

From e83206ceab3f0cdc651960360b7a025c1a7cf190 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 2 Mar 2022 20:35:03 +0800 Subject: [PATCH 15/24] show estimated parcel cbm --- resources/views/pages/warehouse_list.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php index 4c72ebe0..58e96926 100644 --- a/resources/views/pages/warehouse_list.blade.php +++ b/resources/views/pages/warehouse_list.blade.php @@ -1,7 +1,7 @@ @extends('layouts.base_portal') @section('inner_content')
-
+