From 42205ddbc377d90c0ed44d1149f5e48613b162f0 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 24 Mar 2022 13:29:59 +0800 Subject: [PATCH 1/6] small clean up --- .../components/orders/sections/OrderProfileSectionComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue index 0dacb883..a0880e40 100644 --- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue +++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue @@ -274,7 +274,7 @@ style=" fill:#000000;"> -
+
Add Arrived Parcel
From fff428882d5b7bb3d7cf7a02c1c1426f1fceeaaf Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 24 Mar 2022 13:31:37 +0800 Subject: [PATCH 2/6] small clean up --- .../components/orders/sections/OrderProfileSectionComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue index a0880e40..539c5264 100644 --- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue +++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue @@ -274,7 +274,7 @@ style=" fill:#000000;">
-
+
Add Arrived Parcel
From d4897759242d72e400e93e0d14311acb086a88e4 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 24 Mar 2022 13:32:34 +0800 Subject: [PATCH 3/6] small clean up --- .../components/orders/sections/OrderProfileSectionComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue index 539c5264..a0880e40 100644 --- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue +++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue @@ -274,7 +274,7 @@ style=" fill:#000000;">
-
+
Add Arrived Parcel
From c932cb00cc8e94d2c4f1884bd1b52d7e4c686ffe Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 25 Mar 2022 17:36:27 +0800 Subject: [PATCH 4/6] add chat widget --- resources/views/vendor/js.blade.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/resources/views/vendor/js.blade.php b/resources/views/vendor/js.blade.php index 9adee26b..f356043c 100644 --- a/resources/views/vendor/js.blade.php +++ b/resources/views/vendor/js.blade.php @@ -6,6 +6,17 @@ 'routes' => collect(\Route::getRoutes())->mapWithKeys(function ($route) { return [$route->getName() => $route->uri()]; }) ]) !!}; + From d617001412b93fc333ff385e896b1eb99f79acb4 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sun, 27 Mar 2022 11:49:32 +0800 Subject: [PATCH 5/6] fix vt YW orders --- .../FetchLoadedContainersFromVTPortalProcessor.php | 8 ++------ .../FetchWarehouseReceiveListFromVTPortalProcessor.php | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php index 98d02888..0c8a2512 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php @@ -158,13 +158,9 @@ class FetchLoadedContainersFromVTPortalProcessor } foreach($containerDetail->Rows as $packingList){ - $marking = explode('/', explode('CIEF/', $packingList[13])[1]); + $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[13])); - if(!array_key_exists(1, $marking)){ - continue; - } - - $orderNumber = $marking[1]; + $orderNumber = $marking[array_key_last($marking)]; if(!$packingList[22]){ continue; diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php index a4b846cf..fc15e580 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -134,13 +134,9 @@ class FetchWarehouseReceiveListFromVTPortalProcessor foreach ($response->Rows as $parcel){ - $marking = explode('/', explode('CIEF/', $parcel[5])[1]); + $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[5])); - if(!array_key_exists(1, $marking)){ - continue; - } - - $orderNumber = $marking[1]; + $orderNumber = $marking[array_key_last($marking)]; if(!$parcel[9]){ continue; From 368a055bb4760ab64873b223cf900f0b956663b1 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sun, 27 Mar 2022 11:50:27 +0800 Subject: [PATCH 6/6] add chat box to development --- resources/views/vendor/js.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/vendor/js.blade.php b/resources/views/vendor/js.blade.php index f356043c..2e3eb60c 100644 --- a/resources/views/vendor/js.blade.php +++ b/resources/views/vendor/js.blade.php @@ -6,6 +6,7 @@ 'routes' => collect(\Route::getRoutes())->mapWithKeys(function ($route) { return [$route->getName() => $route->uri()]; }) ]) !!}; +@if(!App::environment('production')) +@endif