From 460b1411026380bcd2d4240913967cccb718ed62 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 11 Aug 2022 19:43:55 +0800
Subject: [PATCH 01/45] yiwu notice

---
 .../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 51c2ec09..0a86c3e2 100644
--- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
@@ -40,7 +40,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <p class="m-b-0 text-danger m-t-15" v-if="!parameters.warehouse_id">Due to pandemic prevention, we have decided to temporarily disable our Yiwu warehouse.</p>
+                                    <p class="m-b-0 text-danger m-t-15" v-if="!parameters.warehouse_id">Due to Yiwu city lock down, we are unable to receive any goods at our Yiwu warehouse at the moment, until further notice.</p>
                                 </div>
                             </div>
                             <div class="row justify-content-center m-t-15 align-items-center" v-if="parameters.warehouse_id">

From 8acbc56aebfc33b90407408edfa5535a069b36c4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 11 Aug 2022 19:47:04 +0800
Subject: [PATCH 02/45] yiwu notice

---
 .../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 0a86c3e2..2d402940 100644
--- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
@@ -40,7 +40,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <p class="m-b-0 text-danger m-t-15" v-if="!parameters.warehouse_id">Due to Yiwu city lock down, we are unable to receive any goods at our Yiwu warehouse at the moment, until further notice.</p>
+                                    <p class="m-b-0 text-danger m-t-15" v-if="!parameters.warehouse_id">Due to Yiwu city lock down, we are unable to receive any goods at our Yiwu warehouse until further notice.</p>
                                 </div>
                             </div>
                             <div class="row justify-content-center m-t-15 align-items-center" v-if="parameters.warehouse_id">

From 9e8ee0f405a8078ff173270f7e54712854fd8492 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 16 Aug 2022 12:14:04 +0800
Subject: [PATCH 03/45] export all cbm report

---
 app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php
index 45b42a45..80fde322 100644
--- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php
+++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php
@@ -37,9 +37,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping,
      */
     public function query()
     {
-        return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class)->whereHas('transports', function($query){
-            return $query->where('drop_date', '>=',Carbon::now()->subMonth());
-        });
+        return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class);
     }
 
     /**

From 4f7097772fc92084239c9cfc1cc747eaf4f78a81 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 22 Aug 2022 15:23:51 +0800
Subject: [PATCH 04/45] enable yiwu

---
 .../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..5597261e 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -134,7 +134,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="row">
+                    <div class="row" v-if="false">
                         <div class="col">
                             <div class="row m-b-20">
                                 <div class="col">

From fcb16cc11570995b581f60c2d4c2141ce818d2eb Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 22 Aug 2022 15:32:12 +0800
Subject: [PATCH 05/45] enable yiwu

---
 .../assets/vue/components/orders/forms/OrderFormComponent.vue | 4 +---
 .../orders/sections/OrderProfileSectionComponent.vue          | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
index 2d402940..1d5b9255 100644
--- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
@@ -27,8 +27,7 @@
                                     </div>
                                 </div>
                                 <div class="col col-md-3 p-l-5">
-                                    <!--@click="parameters.warehouse_id = 4"-->
-                                    <div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 bg-master-light" style="cursor: not-allowed" :class="{ 'b-primary': parameters.warehouse_id === 4, 'b-grey': parameters.warehouse_id !== 4 }">
+                                    <div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 pointer" @click="parameters.warehouse_id = 4" :class="{ 'b-primary': parameters.warehouse_id === 4, 'b-grey': parameters.warehouse_id !== 4 }">
                                         <div class="row m-b-15 justify-content-center">
                                             <div class="col-8">
                                                 <img src="/images/yiwu-map.png" class="w-100">
@@ -40,7 +39,6 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <p class="m-b-0 text-danger m-t-15" v-if="!parameters.warehouse_id">Due to Yiwu city lock down, we are unable to receive any goods at our Yiwu warehouse until further notice.</p>
                                 </div>
                             </div>
                             <div class="row justify-content-center m-t-15 align-items-center" v-if="parameters.warehouse_id">
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 5597261e..a0880e40 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -134,7 +134,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="row" v-if="false">
+                    <div class="row">
                         <div class="col">
                             <div class="row m-b-20">
                                 <div class="col">

From 6d7a05d264591c44806ee9e225c0d3451c1ca2c5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 24 Aug 2022 17:11:47 +0800
Subject: [PATCH 06/45] add customer to exception for auto release from china

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index a5a1901b..47e0a8f4 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -351,7 +351,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 if($order instanceof Order){
                     $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-                    if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB'])){
+                    if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB', '1152AAT', '962LOW', '3992WHE'])){
                         $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
                             'expressno' => $row->expressno
                         ]);

From 5acd08d8e4de60a75202715d1805538e1a1b9fd2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 24 Aug 2022 18:18:52 +0800
Subject: [PATCH 07/45] debug vt

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index eeaca44c..e296b425 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -155,6 +155,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $containerObject = new ContainerObject($container[0], str_replace(' ', '', $container[24]), str_replace(' ', '', $container[16]), ContainerTypes::FORTY_FEET_DRY_CONTAINER, Carbon::parse($container[6]), ApprovalStatus::PENDING_VERIFICATION);
                 $containerInfo = $container;
 
+                dd($containerInfo);
 
                 try {
                     $container = $this->fetchesContainer->execute(['reference' => $containerObject->getReference()]);

From 77812e625a73fb5b7fc9830a5e614603772ab390 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 24 Aug 2022 18:28:15 +0800
Subject: [PATCH 08/45] fix vt

---
 .../FetchLoadedContainersFromVTPortalProcessor.php     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index e296b425..dfe76145 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -155,8 +155,6 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $containerObject = new ContainerObject($container[0], str_replace(' ', '', $container[24]), str_replace(' ', '', $container[16]), ContainerTypes::FORTY_FEET_DRY_CONTAINER, Carbon::parse($container[6]), ApprovalStatus::PENDING_VERIFICATION);
                 $containerInfo = $container;
 
-                dd($containerInfo);
-
                 try {
                     $container = $this->fetchesContainer->execute(['reference' => $containerObject->getReference()]);
                 } catch (ResourceNotFoundException $exception){
@@ -164,15 +162,15 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
-                $eta = Carbon::parse($containerInfo[4]);
+                $eta = Carbon::parse($containerInfo[3]);
 
                 $etd = Carbon::parse($eta)->subDays(5);
 
-                $delayDate = $containerInfo[7];
+                $delayDate = $containerInfo[6];
 
-                $containerStatus = $containerInfo[10];
+                $containerStatus = $containerInfo[9];
 
-                $unstuffingDate = $containerInfo[8];
+                $unstuffingDate = $containerInfo[7];
 
                 $transport = $container->transports()->first();
 

From e638186367c9d4c6efe9a9ab508bef04c842f199 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 24 Aug 2022 18:34:38 +0800
Subject: [PATCH 09/45] fix vt container updates

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index dfe76145..52a9c2ae 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -162,6 +162,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
+
                 $eta = Carbon::parse($containerInfo[3]);
 
                 $etd = Carbon::parse($eta)->subDays(5);
@@ -172,6 +173,7 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                 $unstuffingDate = $containerInfo[7];
 
+                var_dump($eta, $etd, $delayDate, $containerStatus, $unstuffingDate);
                 $transport = $container->transports()->first();
 
                 if(!$transport){

From 750ebbd7692a60879ae56414cd45f3e5944e399b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 24 Aug 2022 18:35:35 +0800
Subject: [PATCH 10/45] fix vt container updates

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 52a9c2ae..9e4822b9 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -173,7 +173,7 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                 $unstuffingDate = $containerInfo[7];
 
-                var_dump($eta, $etd, $delayDate, $containerStatus, $unstuffingDate);
+                var_dump($containerObject->getReference(), $eta, $etd, $delayDate, $containerStatus, $unstuffingDate);
                 $transport = $container->transports()->first();
 
                 if(!$transport){

From 4b6d2884850200681f0d67bfb0f6497cab38dcfa Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 24 Aug 2022 18:37:33 +0800
Subject: [PATCH 11/45] fix vt container update

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 9e4822b9..6e9517c2 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -140,6 +140,7 @@ class FetchLoadedContainersFromVTPortalProcessor
             }
 
             $end = $end ? $end : Carbon::today()->addDay();
+            var_dump($start, $end);
             $filter = '["LoadedTime:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
             $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"LoadedTime asc","Filter":'.$filter.'}}'), '');

From fffd6da513624a1dd818a76843407e36ebd6770b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 24 Aug 2022 18:40:17 +0800
Subject: [PATCH 12/45] fix vt container update

---
 .../FetchLoadedContainersFromVTPortalProcessor.php    |  2 --
 routes/web.php                                        | 11 +++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 6e9517c2..f095df80 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -140,7 +140,6 @@ class FetchLoadedContainersFromVTPortalProcessor
             }
 
             $end = $end ? $end : Carbon::today()->addDay();
-            var_dump($start, $end);
             $filter = '["LoadedTime:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
             $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"LoadedTime asc","Filter":'.$filter.'}}'), '');
@@ -174,7 +173,6 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                 $unstuffingDate = $containerInfo[7];
 
-                var_dump($containerObject->getReference(), $eta, $etd, $delayDate, $containerStatus, $unstuffingDate);
                 $transport = $container->transports()->first();
 
                 if(!$transport){
diff --git a/routes/web.php b/routes/web.php
index 9407d990..3679b98e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -257,8 +257,15 @@ Route::get('/container/{reference}/refresh/', function (string $reference){
     $supplier = in_array($container->owner_id, [3, 4]) ? 'VT' : 'YD';
 
     if($supplier === 'VT'){
-        $startDate = $container->loading_date->subDays(3);
-        $endDate = $container->loading_date->addDay();
+        $arrivalDates = \App\Models\PackingList::whereIn('reference', $container->packingLists->pluck('reference'))->where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->get()->map(function($packingList){
+            return $packingList->transports()->first()->drop_date;
+        })->sortBy(function($date){
+            return $date;
+        });
+
+        $startDate = $arrivalDates->first()->subDay()->format('d-m-Y');
+        $endDate = $arrivalDates->last()->addDay()->format('d-m-Y');
+
         (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute($startDate, $endDate);
     }
 

From ea35cd0c10f1dd943724df8590c40250a939dd7f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 24 Aug 2022 18:41:16 +0800
Subject: [PATCH 13/45] fix vt container update

---
 routes/web.php | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 3679b98e..5daa2957 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -256,29 +256,20 @@ Route::get('/container/{reference}/refresh/', function (string $reference){
     $container = Container::where('reference', $reference)->first();
     $supplier = in_array($container->owner_id, [3, 4]) ? 'VT' : 'YD';
 
+    $arrivalDates = \App\Models\PackingList::whereIn('reference', $container->packingLists->pluck('reference'))->where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->get()->map(function($packingList){
+        return $packingList->transports()->first()->drop_date;
+    })->sortBy(function($date){
+        return $date;
+    });
+
+    $startDate = $arrivalDates->first()->subDay()->format('d-m-Y');
+    $endDate = $arrivalDates->last()->addDay()->format('d-m-Y');
+
     if($supplier === 'VT'){
-        $arrivalDates = \App\Models\PackingList::whereIn('reference', $container->packingLists->pluck('reference'))->where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->get()->map(function($packingList){
-            return $packingList->transports()->first()->drop_date;
-        })->sortBy(function($date){
-            return $date;
-        });
-
-        $startDate = $arrivalDates->first()->subDay()->format('d-m-Y');
-        $endDate = $arrivalDates->last()->addDay()->format('d-m-Y');
-
-        (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute($startDate, $endDate);
+        return (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute($startDate, $endDate);
     }
 
     if($supplier === 'YD'){
-        $arrivalDates = \App\Models\PackingList::whereIn('reference', $container->packingLists->pluck('reference'))->where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->get()->map(function($packingList){
-            return $packingList->transports()->first()->drop_date;
-        })->sortBy(function($date){
-            return $date;
-        });
-
-        $startDate = $arrivalDates->first()->subDay()->format('d-m-Y');
-        $endDate = $arrivalDates->last()->addDay()->format('d-m-Y');
-
         return redirect(route('yd.refresh').'?start_date='.$startDate.'&end_date='.$endDate);
     }
 

From 3108d20c16ab878cf3b9e98e340839fe5edf8464 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 24 Aug 2022 18:42:53 +0800
Subject: [PATCH 14/45] fix vt update container

---
 routes/web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index 5daa2957..8f51878e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -266,7 +266,7 @@ Route::get('/container/{reference}/refresh/', function (string $reference){
     $endDate = $arrivalDates->last()->addDay()->format('d-m-Y');
 
     if($supplier === 'VT'){
-        return (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute($startDate, $endDate);
+        return (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute(\Carbon\Carbon::parse($startDate), \Carbon\Carbon::parse($endDate));
     }
 
     if($supplier === 'YD'){

From 4e64d8cd1d10139babae8fc61bf32d068d12dc27 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 24 Aug 2022 18:49:50 +0800
Subject: [PATCH 15/45] fix vt api

---
 routes/web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index 8f51878e..1bd223ff 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -266,7 +266,7 @@ Route::get('/container/{reference}/refresh/', function (string $reference){
     $endDate = $arrivalDates->last()->addDay()->format('d-m-Y');
 
     if($supplier === 'VT'){
-        return (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute(\Carbon\Carbon::parse($startDate), \Carbon\Carbon::parse($endDate));
+        return (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute(\Carbon\Carbon::parse($startDate), \Carbon\Carbon::parse($endDate)->addDays(7));
     }
 
     if($supplier === 'YD'){

From 41dbd80d0d2ccda1ccbbf2abe0f91dc4168e5964 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 14:10:43 +0800
Subject: [PATCH 16/45] fix vt container api

---
 routes/web.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routes/web.php b/routes/web.php
index 1bd223ff..209ffabe 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -266,6 +266,7 @@ Route::get('/container/{reference}/refresh/', function (string $reference){
     $endDate = $arrivalDates->last()->addDay()->format('d-m-Y');
 
     if($supplier === 'VT'){
+        dd(\Carbon\Carbon::parse($startDate), \Carbon\Carbon::parse($endDate)->addDays(7));
         return (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute(\Carbon\Carbon::parse($startDate), \Carbon\Carbon::parse($endDate)->addDays(7));
     }
 

From 3e19696d026277e0934ce4faebfdc80b88b74d02 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 14:16:32 +0800
Subject: [PATCH 17/45] fix vt container api

---
 routes/web.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 209ffabe..5554254e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -266,8 +266,7 @@ Route::get('/container/{reference}/refresh/', function (string $reference){
     $endDate = $arrivalDates->last()->addDay()->format('d-m-Y');
 
     if($supplier === 'VT'){
-        dd(\Carbon\Carbon::parse($startDate), \Carbon\Carbon::parse($endDate)->addDays(7));
-        return (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute(\Carbon\Carbon::parse($startDate), \Carbon\Carbon::parse($endDate)->addDays(7));
+        return (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute(\Carbon\Carbon::parse($endDate), \Carbon\Carbon::parse($endDate)->addDays(5));
     }
 
     if($supplier === 'YD'){

From 516372829859b72a8ef7f3c01049443ade2a1773 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 14:17:41 +0800
Subject: [PATCH 18/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index f095df80..06d6af98 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -155,6 +155,9 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $containerObject = new ContainerObject($container[0], str_replace(' ', '', $container[24]), str_replace(' ', '', $container[16]), ContainerTypes::FORTY_FEET_DRY_CONTAINER, Carbon::parse($container[6]), ApprovalStatus::PENDING_VERIFICATION);
                 $containerInfo = $container;
 
+                if($containerObject->getReference() !== 'SM22-060') continue;
+                dd($container);
+
                 try {
                     $container = $this->fetchesContainer->execute(['reference' => $containerObject->getReference()]);
                 } catch (ResourceNotFoundException $exception){

From 9845b85cf01963b8d5e1d0001afe7126e1da8426 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 14:24:58 +0800
Subject: [PATCH 19/45] fix vt container api

---
 .../FetchLoadedContainersFromVTPortalProcessor.php     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 06d6af98..7c229358 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -156,7 +156,6 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $containerInfo = $container;
 
                 if($containerObject->getReference() !== 'SM22-060') continue;
-                dd($container);
 
                 try {
                     $container = $this->fetchesContainer->execute(['reference' => $containerObject->getReference()]);
@@ -184,10 +183,15 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $transport = $this->createsTransport->execute($transportObject, $container);
                     $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
                 }
+                dd($eta !== $transport->eta);
 
-                if($delayDate){
+                if($delayDate || $eta !== $transport->eta){
 
-                    $delayDate = Carbon::parse($delayDate);
+                    $rescheduleDate = Carbon::parse($eta);
+
+                    if($eta === $transport->eta) $rescheduleDate = Carbon::parse($delayDate);
+
+                    $delayDate = $rescheduleDate;
                     $transport = $container->transports()->first();
 
                     if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {

From f8bd9c037225d28275e988b6709c177ad5d59a03 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 14:26:43 +0800
Subject: [PATCH 20/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 7c229358..ba5a6186 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -164,7 +164,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
-
+dd($container);
                 $eta = Carbon::parse($containerInfo[3]);
 
                 $etd = Carbon::parse($eta)->subDays(5);

From 18fab0e8d4c572ae512405072b05b48d32d0fd72 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 14:27:21 +0800
Subject: [PATCH 21/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index ba5a6186..8f085761 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -164,7 +164,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
-dd($container);
+
                 $eta = Carbon::parse($containerInfo[3]);
 
                 $etd = Carbon::parse($eta)->subDays(5);
@@ -176,6 +176,7 @@ dd($container);
                 $unstuffingDate = $containerInfo[7];
 
                 $transport = $container->transports()->first();
+                dd($container);
 
                 if(!$transport){
                     $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);

From 42e7ee43f2d6ae13f2175b54c261b34b85ca20c4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 14:28:13 +0800
Subject: [PATCH 22/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 8f085761..689e3493 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -166,7 +166,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                 }
 
                 $eta = Carbon::parse($containerInfo[3]);
-
+                dd($container);
                 $etd = Carbon::parse($eta)->subDays(5);
 
                 $delayDate = $containerInfo[6];
@@ -176,7 +176,6 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $unstuffingDate = $containerInfo[7];
 
                 $transport = $container->transports()->first();
-                dd($container);
 
                 if(!$transport){
                     $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);

From 32c03caff10ca7d11797ffd0a4a077f4f01c2aa8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 14:28:53 +0800
Subject: [PATCH 23/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 689e3493..5f39061c 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -165,8 +165,8 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
 
-                $eta = Carbon::parse($containerInfo[3]);
                 dd($container);
+                $eta = Carbon::parse($containerInfo[3]);
                 $etd = Carbon::parse($eta)->subDays(5);
 
                 $delayDate = $containerInfo[6];

From 49a21865b6a1f2e3fe0d5d8377918569bf951dd4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 14:33:21 +0800
Subject: [PATCH 24/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 5f39061c..00a2f52b 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -165,7 +165,8 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
 
-                dd($container);
+                dd($containerInfo[3]);
+
                 $eta = Carbon::parse($containerInfo[3]);
                 $etd = Carbon::parse($eta)->subDays(5);
 

From a495d5ac0ab7b881cfec8d9439150176b4fb2709 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 14:33:58 +0800
Subject: [PATCH 25/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 00a2f52b..08e3d285 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -165,7 +165,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
 
-                dd($containerInfo[3]);
+                dd($containerInfo);
 
                 $eta = Carbon::parse($containerInfo[3]);
                 $etd = Carbon::parse($eta)->subDays(5);

From 10fc3d7f68ba2bc4e72a0f57f9c8f647aa3cb7ba Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 14:39:39 +0800
Subject: [PATCH 26/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 08e3d285..d2128fbd 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -145,7 +145,7 @@ class FetchLoadedContainersFromVTPortalProcessor
             $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"LoadedTime asc","Filter":'.$filter.'}}'), '');
 
             $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest);
-
+            dd($containers->Fields);
             foreach ($containers->Rows as $container){
                 $filter = '["ContainerID:=%js%'.$container[12].'"]';
                 $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"ParcelInContainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":null,"Filter":'.$filter.'}}'), '');
@@ -167,7 +167,7 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                 dd($containerInfo);
 
-                $eta = Carbon::parse($containerInfo[3]);
+                $eta = Carbon::parse($containerInfo[4]);
                 $etd = Carbon::parse($eta)->subDays(5);
 
                 $delayDate = $containerInfo[6];

From 5fada5310e204050a4f39312d690f19bf520c977 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 16:41:24 +0800
Subject: [PATCH 27/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index d2128fbd..d25a7a89 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -145,7 +145,6 @@ class FetchLoadedContainersFromVTPortalProcessor
             $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"LoadedTime asc","Filter":'.$filter.'}}'), '');
 
             $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest);
-            dd($containers->Fields);
             foreach ($containers->Rows as $container){
                 $filter = '["ContainerID:=%js%'.$container[12].'"]';
                 $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"ParcelInContainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":null,"Filter":'.$filter.'}}'), '');
@@ -174,7 +173,7 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                 $containerStatus = $containerInfo[9];
 
-                $unstuffingDate = $containerInfo[7];
+                $unstuffingDate = $containerInfo[8];
 
                 $transport = $container->transports()->first();
 

From 41c76c7c09de82d5fbc91335affc6f4baa96684a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 16:43:43 +0800
Subject: [PATCH 28/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index d25a7a89..5dbc8c23 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -169,9 +169,9 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $eta = Carbon::parse($containerInfo[4]);
                 $etd = Carbon::parse($eta)->subDays(5);
 
-                $delayDate = $containerInfo[6];
+                $delayDate = $containerInfo[7];
 
-                $containerStatus = $containerInfo[9];
+                $containerStatus = $containerInfo[10];
 
                 $unstuffingDate = $containerInfo[8];
 

From 4e4e0b5d9c127787554bd61752fa5a78d2e7fbf4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 16:45:48 +0800
Subject: [PATCH 29/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 5dbc8c23..1963226a 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -164,8 +164,6 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
 
-                dd($containerInfo);
-
                 $eta = Carbon::parse($containerInfo[4]);
                 $etd = Carbon::parse($eta)->subDays(5);
 

From fb3405cdbc9e57a04d336f49e1cffe491ca3f8ba Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 16:48:12 +0800
Subject: [PATCH 30/45] fix vt container api

---
 .../FetchLoadedContainersFromVTPortalProcessor.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 1963226a..01f51e15 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -175,21 +175,17 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                 $transport = $container->transports()->first();
 
-                if(!$transport){
+                if(!$transport || $eta !== $transport->eta){
+                    $container->transports()->delete();
+
                     $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
                     /** @var Transport $transport */
                     $transport = $this->createsTransport->execute($transportObject, $container);
                     $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
                 }
-                dd($eta !== $transport->eta);
 
-                if($delayDate || $eta !== $transport->eta){
-
-                    $rescheduleDate = Carbon::parse($eta);
-
-                    if($eta === $transport->eta) $rescheduleDate = Carbon::parse($delayDate);
-
-                    $delayDate = $rescheduleDate;
+                if($delayDate){
+                    $delayDate = Carbon::parse($delayDate);
                     $transport = $container->transports()->first();
 
                     if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {

From 8635e5f71fcfc10f115936991cd7de92f883fe42 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 16:49:26 +0800
Subject: [PATCH 31/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 01f51e15..f2efe539 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -174,7 +174,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $unstuffingDate = $containerInfo[8];
 
                 $transport = $container->transports()->first();
-
+dd($eta !== $transport->eta);
                 if(!$transport || $eta !== $transport->eta){
                     $container->transports()->delete();
 

From 73ba896e7ccbf3c63a7a21d117130f741c5b3084 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 16:50:20 +0800
Subject: [PATCH 32/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index f2efe539..63acaca6 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -174,11 +174,12 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $unstuffingDate = $containerInfo[8];
 
                 $transport = $container->transports()->first();
-dd($eta !== $transport->eta);
+
                 if(!$transport || $eta !== $transport->eta){
                     $container->transports()->delete();
 
                     $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
+                    dd($transportObject);
                     /** @var Transport $transport */
                     $transport = $this->createsTransport->execute($transportObject, $container);
                     $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));

From 01b539bea8141841f211a8fa4a093599d904085b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 16:52:15 +0800
Subject: [PATCH 33/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 63acaca6..01f51e15 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -179,7 +179,6 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $container->transports()->delete();
 
                     $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
-                    dd($transportObject);
                     /** @var Transport $transport */
                     $transport = $this->createsTransport->execute($transportObject, $container);
                     $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));

From 6c1a9fe992836ba44d6305dbf393f75062992a43 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 25 Aug 2022 16:54:12 +0800
Subject: [PATCH 34/45] fix vt container api

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 01f51e15..280d4b8b 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -154,8 +154,6 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $containerObject = new ContainerObject($container[0], str_replace(' ', '', $container[24]), str_replace(' ', '', $container[16]), ContainerTypes::FORTY_FEET_DRY_CONTAINER, Carbon::parse($container[6]), ApprovalStatus::PENDING_VERIFICATION);
                 $containerInfo = $container;
 
-                if($containerObject->getReference() !== 'SM22-060') continue;
-
                 try {
                     $container = $this->fetchesContainer->execute(['reference' => $containerObject->getReference()]);
                 } catch (ResourceNotFoundException $exception){

From a79d9249af9be6f57de62e62867b7be31597b471 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 26 Aug 2022 11:14:14 +0800
Subject: [PATCH 35/45] update holiday announcement

---
 .../sections/CustomerProfileSectionComponent.vue         | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
index 749e7ef8..3345efe0 100644
--- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
@@ -11,6 +11,15 @@
                     <on-boarding-section-component v-if="!company.last_order"></on-boarding-section-component>
                     <div class="row" v-if="company.last_order">
                         <div class="col">
+                            <div class="row text-center"><div class="col"><div role="alert" class="alert alert-info padding-15"><div class="row"><div class="col"><h5 class="pull-left">📢国庆日休假通告 Malaysia National Day Holiday Notice</h5></div> <div class="col-auto"><i data-dismiss="alert" class="fa fa-times text-info-darker pointer"></i></div></div> <div class="row"><div class="col"><p>亲爱的用户们,
+                                <br>
+                                我们CIEF办公处将在国庆日 31/8/2022 (星期三) 休假，并于 1/9/2022（星期四）复工。 所有转账将在复工后安排，谢谢理解。
+
+                                <br><br>
+
+                                Dear valued customers,
+                                <br>
+                                Our office will close for National Day, 31/8/2022 (Wednesday), and will resume business on 1/9/2022 (Thursday). All orders will be processed after we resume work.</p></div></div></div></div></div>
                             <div class="row m-b-30 relative">
                                 <div class="col">
                                     <div class="row">

From 3b394773690fa211604ab43d97b4a46279444a09 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 26 Aug 2022 11:15:42 +0800
Subject: [PATCH 36/45] holiday announcement

---
 .../companies/sections/CustomerProfileSectionComponent.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
index 3345efe0..62079d48 100644
--- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
@@ -11,7 +11,7 @@
                     <on-boarding-section-component v-if="!company.last_order"></on-boarding-section-component>
                     <div class="row" v-if="company.last_order">
                         <div class="col">
-                            <div class="row text-center"><div class="col"><div role="alert" class="alert alert-info padding-15"><div class="row"><div class="col"><h5 class="pull-left">📢国庆日休假通告 Malaysia National Day Holiday Notice</h5></div> <div class="col-auto"><i data-dismiss="alert" class="fa fa-times text-info-darker pointer"></i></div></div> <div class="row"><div class="col"><p>亲爱的用户们,
+                            <div class="row"><div class="col"><div role="alert" class="alert alert-info padding-15"><div class="row"><div class="col"><h5>📢国庆日休假通告 Malaysia National Day Holiday Notice</h5></div> <div class="col-auto"><i data-dismiss="alert" class="fa fa-times text-info-darker pointer"></i></div></div> <div class="row"><div class="col"><p>亲爱的用户们,
                                 <br>
                                 我们CIEF办公处将在国庆日 31/8/2022 (星期三) 休假，并于 1/9/2022（星期四）复工。 所有转账将在复工后安排，谢谢理解。
 

From 29fe4cf53c077fd01359fc6dcbd59ef527678647 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 30 Aug 2022 15:21:10 +0800
Subject: [PATCH 37/45] csw move to yd

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php       | 2 +-
 app/Classes/ValueObjects/Constants/WarehouseReferences.php    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 47e0a8f4..05714387 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -351,7 +351,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 if($order instanceof Order){
                     $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-                    if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB', '1152AAT', '962LOW', '3992WHE'])){
+                    if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB', '1152AAT', '962LOW', '3992WHE', '1290CSW'])){
                         $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
                             'expressno' => $row->expressno
                         ]);
diff --git a/app/Classes/ValueObjects/Constants/WarehouseReferences.php b/app/Classes/ValueObjects/Constants/WarehouseReferences.php
index 702059b7..39d27dcf 100644
--- a/app/Classes/ValueObjects/Constants/WarehouseReferences.php
+++ b/app/Classes/ValueObjects/Constants/WarehouseReferences.php
@@ -43,7 +43,9 @@ final class WarehouseReferences {
 
     public const YD_DESTINATION_WAREHOUSE = self::YD_KLANG;
 
-    public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726, 2349, 2574];
+    public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726, 2349, 2574, 652];
+
+    public const MIN_CBM_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726, 2349, 2574];
 
     public const REPLICA_WHITE_LIST = [502];
 

From 4dba55eb32469651203f8a34b21bc70b86536f30 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 2 Sep 2022 14:39:17 +0800
Subject: [PATCH 38/45] add customers to the exception list for auto release

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 05714387..ac3e5bb6 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -351,7 +351,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 if($order instanceof Order){
                     $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-                    if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB', '1152AAT', '962LOW', '3992WHE', '1290CSW'])){
+                    if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB', '1152AAT', '962LOW', '3992WHE', '1290CSW', '9493TYS', '3397GSH'])){
                         $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
                             'expressno' => $row->expressno
                         ]);

From d2e3e1979ad14c09a1d3ffea5148504a4660414c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sat, 3 Sep 2022 11:33:55 +0800
Subject: [PATCH 39/45] remove announcement

---
 .../sections/CustomerProfileSectionComponent.vue         | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
index 62079d48..749e7ef8 100644
--- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
@@ -11,15 +11,6 @@
                     <on-boarding-section-component v-if="!company.last_order"></on-boarding-section-component>
                     <div class="row" v-if="company.last_order">
                         <div class="col">
-                            <div class="row"><div class="col"><div role="alert" class="alert alert-info padding-15"><div class="row"><div class="col"><h5>📢国庆日休假通告 Malaysia National Day Holiday Notice</h5></div> <div class="col-auto"><i data-dismiss="alert" class="fa fa-times text-info-darker pointer"></i></div></div> <div class="row"><div class="col"><p>亲爱的用户们,
-                                <br>
-                                我们CIEF办公处将在国庆日 31/8/2022 (星期三) 休假，并于 1/9/2022（星期四）复工。 所有转账将在复工后安排，谢谢理解。
-
-                                <br><br>
-
-                                Dear valued customers,
-                                <br>
-                                Our office will close for National Day, 31/8/2022 (Wednesday), and will resume business on 1/9/2022 (Thursday). All orders will be processed after we resume work.</p></div></div></div></div></div>
                             <div class="row m-b-30 relative">
                                 <div class="col">
                                     <div class="row">

From 856302f480e486e066e388a7f981074421286e27 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 7 Sep 2022 15:22:36 +0800
Subject: [PATCH 40/45] break line for postcode

---
 resources/views/pdfs/qr.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pdfs/qr.blade.php b/resources/views/pdfs/qr.blade.php
index 9595f389..7ba88bce 100644
--- a/resources/views/pdfs/qr.blade.php
+++ b/resources/views/pdfs/qr.blade.php
@@ -38,7 +38,7 @@
                         <tr>
                             <td>
                                 <p style="font-size: 25px; margin-bottom: 0 !important; margin-top: 10px !important;">仓库地址:</p>
-                                <p style="margin-top: 5px !important;  margin-bottom: 5px !important; word-wrap: break-word; font-size: 25px;">{{$warehouse_address->state->name.' '.$warehouse_address->district->name.' '.$warehouse_address->street_one.' '.$warehouse_address->street_two.' 邮编:'.$warehouse_address->postcode}}</p>
+                                <p style="margin-top: 5px !important;  margin-bottom: 5px !important; word-wrap: break-word; font-size: 25px;">{{$warehouse_address->state->name.' '.$warehouse_address->district->name.' '.$warehouse_address->street_one.' '.$warehouse_address->street_two.'<br> 邮编:'.$warehouse_address->postcode}}</p>
                                 <p style="margin-top: 5px !important; margin-bottom: 0px !important; font-size: 25px;">联系：@foreach($warehouse_contacts as $contact){{ $loop->first ? '' : ' / ' }}{{ $contact->phone.' '.$contact->reference }}@endforeach</p>
                                 <p style="font-style: italic; font-weight: bold; margin-top: 5px !important; margin-bottom: 0px !important; font-size: 25px;">{!! $remark !!}</p>
                             </td>

From 3e45f58b3bfc31688065a0ac5976900acdf898d9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 7 Sep 2022 15:24:33 +0800
Subject: [PATCH 41/45] break line for postcode

---
 resources/views/pdfs/qr.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/pdfs/qr.blade.php b/resources/views/pdfs/qr.blade.php
index 7ba88bce..cb416588 100644
--- a/resources/views/pdfs/qr.blade.php
+++ b/resources/views/pdfs/qr.blade.php
@@ -38,7 +38,8 @@
                         <tr>
                             <td>
                                 <p style="font-size: 25px; margin-bottom: 0 !important; margin-top: 10px !important;">仓库地址:</p>
-                                <p style="margin-top: 5px !important;  margin-bottom: 5px !important; word-wrap: break-word; font-size: 25px;">{{$warehouse_address->state->name.' '.$warehouse_address->district->name.' '.$warehouse_address->street_one.' '.$warehouse_address->street_two.'<br> 邮编:'.$warehouse_address->postcode}}</p>
+                                <p style="margin-top: 5px !important;  margin-bottom: 5px !important; word-wrap: break-word; font-size: 25px;">{{$warehouse_address->state->name.' '.$warehouse_address->district->name.' '.$warehouse_address->street_one.' '.$warehouse_address->street_two}}</p>
+                                <p>邮编:{{$warehouse_address->postcode}}</p>
                                 <p style="margin-top: 5px !important; margin-bottom: 0px !important; font-size: 25px;">联系：@foreach($warehouse_contacts as $contact){{ $loop->first ? '' : ' / ' }}{{ $contact->phone.' '.$contact->reference }}@endforeach</p>
                                 <p style="font-style: italic; font-weight: bold; margin-top: 5px !important; margin-bottom: 0px !important; font-size: 25px;">{!! $remark !!}</p>
                             </td>

From 84bef88f1681fe1055319bd3bd5b0558ef82bd94 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 7 Sep 2022 15:25:22 +0800
Subject: [PATCH 42/45] break line for postcode

---
 resources/views/pdfs/qr.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pdfs/qr.blade.php b/resources/views/pdfs/qr.blade.php
index cb416588..312e3aa2 100644
--- a/resources/views/pdfs/qr.blade.php
+++ b/resources/views/pdfs/qr.blade.php
@@ -39,7 +39,7 @@
                             <td>
                                 <p style="font-size: 25px; margin-bottom: 0 !important; margin-top: 10px !important;">仓库地址:</p>
                                 <p style="margin-top: 5px !important;  margin-bottom: 5px !important; word-wrap: break-word; font-size: 25px;">{{$warehouse_address->state->name.' '.$warehouse_address->district->name.' '.$warehouse_address->street_one.' '.$warehouse_address->street_two}}</p>
-                                <p>邮编:{{$warehouse_address->postcode}}</p>
+                                <p style="font-size: 25px;">邮编:{{$warehouse_address->postcode}}</p>
                                 <p style="margin-top: 5px !important; margin-bottom: 0px !important; font-size: 25px;">联系：@foreach($warehouse_contacts as $contact){{ $loop->first ? '' : ' / ' }}{{ $contact->phone.' '.$contact->reference }}@endforeach</p>
                                 <p style="font-style: italic; font-weight: bold; margin-top: 5px !important; margin-bottom: 0px !important; font-size: 25px;">{!! $remark !!}</p>
                             </td>

From c8399cc3365573b45d1480e898e7835d5784abe7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 7 Sep 2022 15:31:13 +0800
Subject: [PATCH 43/45] break line for postcode

---
 routes/web.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index 5554254e..c513cdef 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -202,7 +202,7 @@ Route::group(['prefix' => 'template', 'as' => 'template.'], function () {
 
 Route::get('/yiwu', function () {
     $orders = \App\Models\Order::whereHas('OrderRoles', function($query){
-        return $query->where('role_id', \App\Classes\ValueObjects\Constants\OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 4);
+        return $query->where('role_id', \App\Classes\ValueObjects\Constants\OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 2358);
     })->whereHas('addresses', function($query){
         return $query->where('status', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->whereIn('state_id', [5, 13, 14]);
     })->get();
@@ -418,3 +418,5 @@ Route::get('/payment-and-billing', function () {
     return view('pages.paymentAndBilling');
 })->name('admin.payment-and-billing');
 Route::get('/notifications/list', 'Notifications\ListNotificationsController@list')->name('notifications.list');
+
+

From 08398c481e016f61af8e6354a165594b0a3a2a95 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 7 Sep 2022 15:35:40 +0800
Subject: [PATCH 44/45] break line for postcode

---
 routes/web.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index c513cdef..e53d5a52 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -203,8 +203,6 @@ Route::group(['prefix' => 'template', 'as' => 'template.'], function () {
 Route::get('/yiwu', function () {
     $orders = \App\Models\Order::whereHas('OrderRoles', function($query){
         return $query->where('role_id', \App\Classes\ValueObjects\Constants\OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 2358);
-    })->whereHas('addresses', function($query){
-        return $query->where('status', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->whereIn('state_id', [5, 13, 14]);
     })->get();
 
     foreach ($orders as $order){

From 4280a9188c829e63f96b0bf8259ff72e420eab51 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 7 Sep 2022 17:30:45 +0800
Subject: [PATCH 45/45] add 2 days to eta date

---
 .../FetchLoadedContainersFromVTPortalProcessor.php          | 6 +++---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 280d4b8b..ee511a0b 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -162,8 +162,8 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
 
-                $eta = Carbon::parse($containerInfo[4]);
-                $etd = Carbon::parse($eta)->subDays(5);
+                $eta = Carbon::parse($containerInfo[4])->addDays(2);
+                $etd = Carbon::parse($eta)->subDays(7);
 
                 $delayDate = $containerInfo[7];
 
@@ -183,7 +183,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                 }
 
                 if($delayDate){
-                    $delayDate = Carbon::parse($delayDate);
+                    $delayDate = Carbon::parse($delayDate)->addDays(2);
                     $transport = $container->transports()->first();
 
                     if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index ac3e5bb6..16205f62 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -184,7 +184,7 @@ class FetchOrderListsFromYdPortalProcessor
                         $containerReference = explode('预计到港时间', $tracking[1])[0];
                         $loadingDate = Carbon::parse($trackingRow->trackingtime);
                         $etd = Carbon::parse($tracking[2])->subDays(5);
-                        $eta = Carbon::parse($tracking[2]);
+                        $eta = Carbon::parse($tracking[2])->addDays(2);
                     }
 
                     $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
@@ -393,7 +393,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
 
                     if($delayDate){
-
+                        $delayDate = $delayDate->addDays(2);
                         $transport = $container->transports()->first();
 
                         if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {