From dc562f6554b15130eec3ae64f9fb21117f01f499 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 09:29:31 +0800
Subject: [PATCH 01/41] update holiday announcement

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

diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
index 749e7ef8..b1a12a19 100644
--- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
@@ -6,6 +6,39 @@
                     <customer-profile-component :data="company"></customer-profile-component>
                 </div>
             </div>
+            <div class="alert alert-info padding-15" role="alert" v-show="!isLoading">
+                <div class="row">
+                    <div class="col">
+                        <h5 class="pull-left">{{item.title}}</h5>
+                    </div>
+                    <div class="col-auto">
+                        <i class="fa fa-times text-info-darker pointer" data-dismiss="alert"></i>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col">
+                        <p>[清明节仓库放假通知 Qing Ming Warehouse Holiday Notice]<br>
+
+                            尊敬的客户们：<br>
+
+                            仓库将为 2022年清明节假期做出如下安排 ：<br>
+
+                            广州仓库 ： 2022 年 4月 4日 - 2022 年 4月 5日 （4月6日复工）<br>
+                            义乌仓库 ： 2022 年 4月 3日 - 2022 年 4月 4日 （4月5日复工）<br>
+
+                            *放假期间没有仓库人员值班， 请大家安排好送货时间， 感谢<br><br>
+
+                            Dear Customers :<br>
+
+                            Our warehouse holiday for Qing Ming is as below :<br>
+
+                            Guangzhou : 4 April 2022 - 5 April 2022 (Resume date : 6 April)<br>
+                            Yiwu : 3 April 2022 - 4 April 2022 (Resume date : 5 April)<br>
+
+                            *Warehouse personnel are on leave during the holiday period, please arrange delivery date in advance, thank you</p>
+                    </div>
+                </div>
+            </div>
             <div class="row" v-show="!$store.getters.isShowing('createOrderForm')">
                 <div class="col">
                     <on-boarding-section-component v-if="!company.last_order"></on-boarding-section-component>

From 4eded7a742f8d38c35240da57163ffdfdcd52a1b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 09:31:09 +0800
Subject: [PATCH 02/41] update holiday announcement

---
 .../companies/sections/CustomerProfileSectionComponent.vue  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
index b1a12a19..b10344e3 100644
--- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
@@ -6,11 +6,9 @@
                     <customer-profile-component :data="company"></customer-profile-component>
                 </div>
             </div>
-            <div class="alert alert-info padding-15" role="alert" v-show="!isLoading">
+            <div class="alert alert-info padding-15" role="alert">
                 <div class="row">
-                    <div class="col">
-                        <h5 class="pull-left">{{item.title}}</h5>
-                    </div>
+                    <div class="col"></div>
                     <div class="col-auto">
                         <i class="fa fa-times text-info-darker pointer" data-dismiss="alert"></i>
                     </div>

From 7338ebc78abb48e6abc1f3bdecadc0253cd240ba Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 13:49:47 +0800
Subject: [PATCH 03/41] fix packages is missing in yd api

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 4cd92f9d..5730cc24 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -310,6 +310,13 @@ class FetchOrderListsFromYdPortalProcessor
                     $this->createPackageProcessor->execute($packageObject, $packingList);
                 }
 
+                if(!$row->deliverysize){
+                    $measurement = round(($row->deliverysize/$row->goodcount) ** (1/3) * 100, 2);
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $measurement, (float) $measurement, (float) $measurement, 0, (float) $row->goodcount, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
                 $weightCbm = (float) $row->weight / 500;
                 $overWeightCbm = $weightCbm - $packingList->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity'));
 

From 29350dbb86ccb5a899ac4066fca824a8e5734953 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 13:52:16 +0800
Subject: [PATCH 04/41] fix packages is missing in yd api

---
 .../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 5730cc24..e8552f5f 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -311,7 +311,7 @@ class FetchOrderListsFromYdPortalProcessor
                 }
 
                 if(!$row->deliverysize){
-                    $measurement = round(($row->deliverysize/$row->goodcount) ** (1/3) * 100, 2);
+                    $measurement = round(((float) $row->deliverysize / (float) $row->goodcount) ** (1/3) * 100, 2);
                     $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $measurement, (float) $measurement, (float) $measurement, 0, (float) $row->goodcount, ApprovalStatus::APPROVED);
                     $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
                     $this->createPackageProcessor->execute($packageObject, $packingList);

From cd4e7aab10dde3bb69405ae2b5986a8effd7aea9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 13:52:36 +0800
Subject: [PATCH 05/41] fix packages is missing in yd api

---
 .../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 e8552f5f..709481f1 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -310,7 +310,7 @@ class FetchOrderListsFromYdPortalProcessor
                     $this->createPackageProcessor->execute($packageObject, $packingList);
                 }
 
-                if(!$row->deliverysize){
+                if(!count($row->deliverysize)){
                     $measurement = round(((float) $row->deliverysize / (float) $row->goodcount) ** (1/3) * 100, 2);
                     $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $measurement, (float) $measurement, (float) $measurement, 0, (float) $row->goodcount, ApprovalStatus::APPROVED);
                     $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);

From e7df49a0d11ee6b449a285fbf19e3ebf938fac2b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 13:54:48 +0800
Subject: [PATCH 06/41] fix packages is missing in yd api

---
 .../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 709481f1..9999e1e6 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -167,7 +167,7 @@ class FetchOrderListsFromYdPortalProcessor
                 ]);
 
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-
+dd($rows);
                 foreach (array_reverse($rows->data) as $trackingRow) {
                     if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
                         $receiveDate = Carbon::parse($trackingRow->trackingtime);

From 9753eb3a18efebe60fd8a5c53421aa0215a97453 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 13:56:47 +0800
Subject: [PATCH 07/41] fix packages is missing in yd api

---
 .../FetchOrderListsFromYdPortalProcessor.php  | 54 +------------------
 1 file changed, 2 insertions(+), 52 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 9999e1e6..f6526ebe 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -167,59 +167,9 @@ class FetchOrderListsFromYdPortalProcessor
                 ]);
 
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-dd($rows);
-                foreach (array_reverse($rows->data) as $trackingRow) {
-                    if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
-                        $receiveDate = Carbon::parse($trackingRow->trackingtime);
-                    }
 
-                    if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
-                        $tracking = explode(':', $trackingRow->tracking);
-                        $containerReference = explode('预计到港时间', $tracking[1])[0];
-                        $loadingDate = Carbon::parse($trackingRow->trackingtime);
-                        $etd = Carbon::parse($tracking[2])->subDays(5);
-                        $eta = Carbon::parse($tracking[2]);
-                    }
-
-                    $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
-                    $rescheduleETA = strpos($trackingRow->remark, '到港');
-                    if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
-                        preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
-                        $dates = collect();
-
-                        foreach($matches[0] as $date){
-                            try {
-                                $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
-                            } catch (\Exception $exception) {
-                                continue;
-                            }
-
-                        }
-
-                        $rescheduleDate = $dates->sortDesc()->first();
-                        if(!$delayDate || $rescheduleDate > $delayDate){
-                            /** @var Carbon $delayDate */
-                            $delayDate = $rescheduleDate;
-
-                            if($rescheduleETA === false && $delayDate) {
-                                $delayDate = $delayDate->addDays('5');
-                            }
-                        }
-
-                    }
-
-                    if ($trackingRow->tracking === '已开船') {
-                        $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
-                    }
-
-
-                    if ($trackingRow->tracking === '货物已进目的港仓库') {
-                        $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
-                    }
-
-                    if ($trackingRow->tracking === '货物已派送完成') {
-                        $deliveryDate = Carbon::parse($trackingRow->trackingtime);
-                    }
+                if($rows) {
+                    continue;
                 }
 
                 $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);

From d7457e71749b5ea6c209b48f7b2bd8d0f16ad09d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 14:10:24 +0800
Subject: [PATCH 08/41] fix missing yd delivery

---
 .../FetchOrderListsFromYdPortalProcessor.php  | 56 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index f6526ebe..44e4fbf0 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -168,8 +168,60 @@ class FetchOrderListsFromYdPortalProcessor
 
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
-                if($rows) {
-                    continue;
+                if($rows) continue;
+
+                foreach (array_reverse($rows->data) as $trackingRow) {
+                    if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
+                        $receiveDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
+                        $tracking = explode(':', $trackingRow->tracking);
+                        $containerReference = explode('预计到港时间', $tracking[1])[0];
+                        $loadingDate = Carbon::parse($trackingRow->trackingtime);
+                        $etd = Carbon::parse($tracking[2])->subDays(5);
+                        $eta = Carbon::parse($tracking[2]);
+                    }
+
+                    $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
+                    $rescheduleETA = strpos($trackingRow->remark, '到港');
+                    if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
+                        preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
+                        $dates = collect();
+
+                        foreach($matches[0] as $date){
+                            try {
+                                $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
+                            } catch (\Exception $exception) {
+                                continue;
+                            }
+
+                        }
+
+                        $rescheduleDate = $dates->sortDesc()->first();
+                        if(!$delayDate || $rescheduleDate > $delayDate){
+                            /** @var Carbon $delayDate */
+                            $delayDate = $rescheduleDate;
+
+                            if($rescheduleETA === false && $delayDate) {
+                                $delayDate = $delayDate->addDays('5');
+                            }
+                        }
+
+                    }
+
+                    if ($trackingRow->tracking === '已开船') {
+                        $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
+                    }
+
+
+                    if ($trackingRow->tracking === '货物已进目的港仓库') {
+                        $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if (strpos($trackingRow->tracking, '派送中') || strpos($trackingRow->tracking, '派送完成')) {
+                        $deliveryDate = Carbon::parse($trackingRow->trackingtime);
+                    }
                 }
 
                 $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);

From 65daceb59c7b77d0393d9b2e26e7cd95026854b7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 14:13:26 +0800
Subject: [PATCH 09/41] fix missing yd delivery

---
 .../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 44e4fbf0..8b4861b1 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -168,7 +168,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
-                if($rows) continue;
+                if(!property_exists($rows, 'data')) continue;
 
                 foreach (array_reverse($rows->data) as $trackingRow) {
                     if ($trackingRow->tracking === '货物已送达仓库准备入库中') {

From 2b4d3f19921fac73ad15aafa5de05a9df21e9534 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 14:16:40 +0800
Subject: [PATCH 10/41] fix missing yd delivery

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 8b4861b1..03ac846d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -168,7 +168,9 @@ class FetchOrderListsFromYdPortalProcessor
 
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
-                if(!property_exists($rows, 'data')) continue;
+                if($rows){
+                    Log::debug($row->expressno);
+                }
 
                 foreach (array_reverse($rows->data) as $trackingRow) {
                     if ($trackingRow->tracking === '货物已送达仓库准备入库中') {

From 627fb3aa967da805ac6948e7425f7a1aa22ab625 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 14:18:34 +0800
Subject: [PATCH 11/41] fix missing yd delivery

---
 .../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 03ac846d..2eecb386 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -168,7 +168,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
-                if($rows){
+                if(!$rows){
                     Log::debug($row->expressno);
                 }
 

From 3b8079785a832ad7e77e1eaca935e21583af0643 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 14:19:47 +0800
Subject: [PATCH 12/41] fix missing yd delivery

---
 .../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 2eecb386..70d0d0c4 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -170,6 +170,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 if(!$rows){
                     Log::debug($row->expressno);
+                    continue;
                 }
 
                 foreach (array_reverse($rows->data) as $trackingRow) {

From 24f5de8c2c36d1971ab7a0ea182da19c51633088 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 14:41:10 +0800
Subject: [PATCH 13/41] fix missing yd delivery

---
 .../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 70d0d0c4..353f4249 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -316,7 +316,7 @@ class FetchOrderListsFromYdPortalProcessor
                 }
 
                 if(!count($row->deliverysize)){
-                    $measurement = round(((float) $row->deliverysize / (float) $row->goodcount) ** (1/3) * 100, 2);
+                    $measurement = round(((float) $row->volume / (float) $row->goodcount) ** (1/3) * 100, 2);
                     $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $measurement, (float) $measurement, (float) $measurement, 0, (float) $row->goodcount, ApprovalStatus::APPROVED);
                     $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
                     $this->createPackageProcessor->execute($packageObject, $packingList);

From 9f9c17977dd18b2d5f1fac959ca09e85815c9e48 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 19:44:11 +0800
Subject: [PATCH 14/41] show delivery delay days

---
 app/Http/Resources/TransportResource.php      |  4 ++-
 .../elements/PackingListComponent.vue         |  3 +-
 resources/views/pages/delivery_list.blade.php | 34 +++++++++++--------
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/app/Http/Resources/TransportResource.php b/app/Http/Resources/TransportResource.php
index b931964d..2677782f 100644
--- a/app/Http/Resources/TransportResource.php
+++ b/app/Http/Resources/TransportResource.php
@@ -3,6 +3,7 @@
 namespace App\Http\Resources;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class TransportResource extends JsonResource
@@ -24,7 +25,8 @@ class TransportResource extends JsonResource
             'drop_date' => $this->drop_date ? $this->drop_date->format('d-m-Y') : $this->drop_date,
             'status' => $this->status,
             'current_schedule' => new ScheduleResource($this->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()),
-            'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get())
+            'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get()),
+            'dropped_days' => Carbon::now()->diffInDays($this->drop_date, false)
         ];
     }
 }
diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
index 89747c80..36748461 100644
--- a/resources/assets/vue/components/containers/elements/PackingListComponent.vue
+++ b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
@@ -23,7 +23,8 @@
             </div>
         </div>
         <div class="col">
-            <p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
+            <p class="no-margin" v-if="item.transport">{{ item.transport.current_schedule.eta }}</p>
+            <p class="no-margin text-danger" v-if="!item.transport">{{ item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days : 'n/a'}}</p>
         </div>
         <div class="col-auto text-right" v-if="!item.transport">
             <div class="row m-b-5">
diff --git a/resources/views/pages/delivery_list.blade.php b/resources/views/pages/delivery_list.blade.php
index 41c6d8e8..46a79c3d 100644
--- a/resources/views/pages/delivery_list.blade.php
+++ b/resources/views/pages/delivery_list.blade.php
@@ -75,19 +75,23 @@
             <div class="col bg-master-lightest p-1 p-sm-4">
                 <div class="row tabsContainer tabContent" tab-name="pendingArrangement">
                     <div class="col">
-                        <div class="row align-items-center m-b-5 p-b-10 b-b b-grey muted all-caps fs-10">
-                            <div class="col-2">Marking</div>
-                            <div class="col text-center">Quantity</div>
-                            <div class="col">CBM</div>
-                            <div class="col">Overweight CBM</div>
-                            <div class="col">Total CBM</div>
-                            <div class="col">status</div>
-                            <div class="col">Delivery Date</div>
-                            <div class="col text-right">Action</div>
+                        <div class="row">
+                            <div class="col">
+                                <div class="row align-items-center p-t-10 p-b-10 b-t b-grey muted all-caps fs-10">
+                                    <div class="col-2">Marking</div>
+                                    <div class="col-1 text-center">Quantity</div>
+                                    <div class="col-1">CBM</div>
+                                    <div class="col-1">Overweight CBM</div>
+                                    <div class="col-1">Total CBM</div>
+                                    <div class="col-1 text-center">status</div>
+                                    <div class="col-3">Delivery Details</div>
+                                    <div class="col">Delivery Date</div>
+                                </div>
+                            </div>
                         </div>
-                        <list-component section="activeContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 1, with_arrival_date: true ,'per_page': 30, order_by: {column: 'arrival_date', DESC: true}}">
+                        <list-component section="activeContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 1, with_arrival_date: true ,'per_page': 10, order_by: {column: 'arrival_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
-                                <warehouse-packing-list-component :data="data"></warehouse-packing-list-component>
+                                <packing-list-component :data="data"></packing-list-component>
                             </template>
                         </list-component>
                     </div>
@@ -103,9 +107,9 @@
                             <div class="col">status</div>
                             <div class="col">Delivery Date</div>
                         </div>
-                        <list-component section="arrivedContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 2, with_arrival_date: true ,'per_page': 30, order_by: {column: 'arrival_date', DESC: true}}">
+                        <list-component section="arrivedContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 2, with_arrival_date: true ,'per_page': 10, order_by: {column: 'arrival_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
-                                <warehouse-packing-list-component :data="data"></warehouse-packing-list-component>
+                                <packing-list-component :data="data"></packing-list-component>
                             </template>
                         </list-component>
                     </div>
@@ -121,9 +125,9 @@
                             <div class="col">status</div>
                             <div class="col">Delivery Date</div>
                         </div>
-                        <list-component section="completeContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 3, with_arrival_date: true ,'per_page': 30, order_by: {column: 'arrival_date', DESC: true}}">
+                        <list-component section="completeContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 3, with_arrival_date: true ,'per_page': 10, order_by: {column: 'arrival_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
-                                <warehouse-packing-list-component :data="data"></warehouse-packing-list-component>
+                                <packing-list-component :data="data"></packing-list-component>
                             </template>
                         </list-component>
                     </div>

From 531ab699ba7887d091e453ff544018bf1f128f5b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 19:45:06 +0800
Subject: [PATCH 15/41] show delivery delay days

---
 resources/views/pages/delivery_list.blade.php | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/resources/views/pages/delivery_list.blade.php b/resources/views/pages/delivery_list.blade.php
index 46a79c3d..2f27f146 100644
--- a/resources/views/pages/delivery_list.blade.php
+++ b/resources/views/pages/delivery_list.blade.php
@@ -98,14 +98,19 @@
                 </div>
                 <div class="row tabsContainer tabContent hide" tab-name="pendingDelivery">
                     <div class="col">
-                        <div class="row align-items-center m-b-5 p-b-10 b-b b-grey muted all-caps fs-10">
-                            <div class="col-2">Marking</div>
-                            <div class="col text-center">Quantity</div>
-                            <div class="col">CBM</div>
-                            <div class="col">Overweight CBM</div>
-                            <div class="col">Total CBM</div>
-                            <div class="col">status</div>
-                            <div class="col">Delivery Date</div>
+                        <div class="row">
+                            <div class="col">
+                                <div class="row align-items-center p-t-10 p-b-10 b-t b-grey muted all-caps fs-10">
+                                    <div class="col-2">Marking</div>
+                                    <div class="col-1 text-center">Quantity</div>
+                                    <div class="col-1">CBM</div>
+                                    <div class="col-1">Overweight CBM</div>
+                                    <div class="col-1">Total CBM</div>
+                                    <div class="col-1 text-center">status</div>
+                                    <div class="col-3">Delivery Details</div>
+                                    <div class="col">Delivery Date</div>
+                                </div>
+                            </div>
                         </div>
                         <list-component section="arrivedContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 2, with_arrival_date: true ,'per_page': 10, order_by: {column: 'arrival_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
@@ -116,14 +121,19 @@
                 </div>
                 <div class="row tabsContainer tabContent hide" tab-name="delivered">
                     <div class="col">
-                        <div class="row align-items-center m-b-5 p-b-10 b-b b-grey muted all-caps fs-10">
-                            <div class="col-2">Marking</div>
-                            <div class="col text-center">Quantity</div>
-                            <div class="col">CBM</div>
-                            <div class="col">Overweight CBM</div>
-                            <div class="col">Total CBM</div>
-                            <div class="col">status</div>
-                            <div class="col">Delivery Date</div>
+                        <div class="row">
+                            <div class="col">
+                                <div class="row align-items-center p-t-10 p-b-10 b-t b-grey muted all-caps fs-10">
+                                    <div class="col-2">Marking</div>
+                                    <div class="col-1 text-center">Quantity</div>
+                                    <div class="col-1">CBM</div>
+                                    <div class="col-1">Overweight CBM</div>
+                                    <div class="col-1">Total CBM</div>
+                                    <div class="col-1 text-center">status</div>
+                                    <div class="col-3">Delivery Details</div>
+                                    <div class="col">Delivery Date</div>
+                                </div>
+                            </div>
                         </div>
                         <list-component section="completeContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 3, with_arrival_date: true ,'per_page': 10, order_by: {column: 'arrival_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">

From bebce6fbaa4b6f6106eae811fe7e11195f290757 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 19:50:55 +0800
Subject: [PATCH 16/41] fix yd older than 2 months orders

---
 .../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 353f4249..e0edf3fd 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -135,7 +135,7 @@ class FetchOrderListsFromYdPortalProcessor
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
         try {
-            $start = $start ? $start : Carbon::now()->subMonths(2);
+            $start = $start ? $start : Carbon::now()->subMonths(4);
 
             $startLimit = Carbon::parse('01-12-2021');
 

From cce0cae57cb0bf4aa454d914d87c87e2b0307ae5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 20:17:03 +0800
Subject: [PATCH 17/41] fix yd older than 2 months orders

---
 .../FetchOrderListsFromYdPortalProcessor.php    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index e0edf3fd..d991ede8 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -36,6 +36,7 @@ use App\Models\Transport;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 
 class FetchOrderListsFromYdPortalProcessor
 {
@@ -145,6 +146,20 @@ class FetchOrderListsFromYdPortalProcessor
 
             $end = $end ? $end : Carbon::now();
 
+            $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
+                'trakingno' => 'M202202230904163'
+            ]);
+
+            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
+
+            foreach (array_reverse($rows->data) as $trackingRow) {
+                if (Str::contains('', ['派送中'])) {
+                    $deliveryDate = Carbon::parse($trackingRow->trackingtime);
+                }
+            }
+
+            dd($deliveryDate);
+
             $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                 'begintime' => $start->timestamp,
                 'endtime' => $end->timestamp,
@@ -222,7 +237,7 @@ class FetchOrderListsFromYdPortalProcessor
                         $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
                     }
 
-                    if (strpos($trackingRow->tracking, '派送中') || strpos($trackingRow->tracking, '派送完成')) {
+                    if (Str::contains('', ['派送中'])) {
                         $deliveryDate = Carbon::parse($trackingRow->trackingtime);
                     }
                 }

From 7159c1c11df43f1aaa822ec0ed1ed9d10483c114 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 20:17:55 +0800
Subject: [PATCH 18/41] fix yd older than 2 months orders

---
 .../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 d991ede8..a80e3c1c 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -153,7 +153,7 @@ class FetchOrderListsFromYdPortalProcessor
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
             foreach (array_reverse($rows->data) as $trackingRow) {
-                if (Str::contains('', ['派送中'])) {
+                if (Str::contains($trackingRow->tracking, ['派送中'])) {
                     $deliveryDate = Carbon::parse($trackingRow->trackingtime);
                 }
             }

From 7180f802b3405077a7da00026065fabc75a32ecb Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 20:20:19 +0800
Subject: [PATCH 19/41] fix yd older than 2 months orders

---
 .../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 a80e3c1c..f154b675 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -153,7 +153,7 @@ class FetchOrderListsFromYdPortalProcessor
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
             foreach (array_reverse($rows->data) as $trackingRow) {
-                if (Str::contains($trackingRow->tracking, ['派送中'])) {
+                if (Str::contains($trackingRow->tracking, ['派送中', '派送完成'])) {
                     $deliveryDate = Carbon::parse($trackingRow->trackingtime);
                 }
             }

From b7e6269aa941af21e13d678a8ef519dc3d797367 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 20:25:14 +0800
Subject: [PATCH 20/41] fix yd older than 2 months orders

---
 .../FetchOrderListsFromYdPortalProcessor.php  | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index f154b675..b23ae1e7 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -138,27 +138,13 @@ class FetchOrderListsFromYdPortalProcessor
         try {
             $start = $start ? $start : Carbon::now()->subMonths(4);
 
-            $startLimit = Carbon::parse('01-12-2021');
+            $startLimit = Carbon::parse('23-02-2022');
 
             if($start->isBefore($startLimit)){
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::now();
-
-            $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
-                'trakingno' => 'M202202230904163'
-            ]);
-
-            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-
-            foreach (array_reverse($rows->data) as $trackingRow) {
-                if (Str::contains($trackingRow->tracking, ['派送中', '派送完成'])) {
-                    $deliveryDate = Carbon::parse($trackingRow->trackingtime);
-                }
-            }
-
-            dd($deliveryDate);
+            $end = $end ? $end : Carbon::parse('24-02-2022');
 
             $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                 'begintime' => $start->timestamp,
@@ -166,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
+dd($rows->data);
             foreach($rows->data as $row){
 
                 $containerReference = null;
@@ -237,7 +223,7 @@ class FetchOrderListsFromYdPortalProcessor
                         $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
                     }
 
-                    if (Str::contains('', ['派送中'])) {
+                    if (Str::contains($trackingRow->tracking, ['派送中'])) {
                         $deliveryDate = Carbon::parse($trackingRow->trackingtime);
                     }
                 }

From b290f954268a7a436c89a2b098c6e6ccae50c2ca Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 20:27:31 +0800
Subject: [PATCH 21/41] fix yd older than 2 months orders

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index b23ae1e7..60af9e1d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -152,9 +152,9 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-dd($rows->data);
-            foreach($rows->data as $row){
 
+            foreach($rows->data as $row){
+                if($row->expressno !== 'M202202230904163') continue;
                 $containerReference = null;
                 $loadingDate = null;
                 $unstuffingDate = null;
@@ -409,6 +409,7 @@ dd($rows->data);
                 }
 
                 if($deliveryDate && !$packingList->transports){
+                    dd($deliveryDate);
                     $packingList->status = ApprovalStatus::COMPLETED;
                     $packingList->save();
 

From 144464621ef8869a1c1156d79c2059add38c60fd Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 20:28:07 +0800
Subject: [PATCH 22/41] fix yd older than 2 months orders

---
 .../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 60af9e1d..489960ac 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -408,8 +408,8 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
+                dd($deliveryDate);
                 if($deliveryDate && !$packingList->transports){
-                    dd($deliveryDate);
                     $packingList->status = ApprovalStatus::COMPLETED;
                     $packingList->save();
 

From 782bcc69f1061701de0b1d11e5737420261f2b58 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 20:28:41 +0800
Subject: [PATCH 23/41] fix yd older than 2 months orders

---
 .../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 489960ac..a65f1b7d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -408,7 +408,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
-                dd($deliveryDate);
+                dd($packingList->transports);
                 if($deliveryDate && !$packingList->transports){
                     $packingList->status = ApprovalStatus::COMPLETED;
                     $packingList->save();

From 8e9f12b17e0559320fe01d5b3a3efcd15d0798b5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 20:29:14 +0800
Subject: [PATCH 24/41] fix yd older than 2 months orders

---
 .../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 a65f1b7d..b14c6987 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -408,7 +408,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
-                dd($packingList->transports);
+                dd($packingList->transports()->exists());
                 if($deliveryDate && !$packingList->transports){
                     $packingList->status = ApprovalStatus::COMPLETED;
                     $packingList->save();

From 908f3fc11b0944b252f5b422ad88c166b1a873b0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 20:29:49 +0800
Subject: [PATCH 25/41] fix yd older than 2 months orders

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index b14c6987..6fe91544 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -408,8 +408,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
-                dd($packingList->transports()->exists());
-                if($deliveryDate && !$packingList->transports){
+                if($deliveryDate && !$packingList->transports()->exists()){
                     $packingList->status = ApprovalStatus::COMPLETED;
                     $packingList->save();
 

From cd141bf988f9d3c41e13db021c6f9bdc47bbfd7f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 20:30:49 +0800
Subject: [PATCH 26/41] fix yd older than 2 months orders

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 6fe91544..fe84118f 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -138,13 +138,13 @@ class FetchOrderListsFromYdPortalProcessor
         try {
             $start = $start ? $start : Carbon::now()->subMonths(4);
 
-            $startLimit = Carbon::parse('23-02-2022');
+            $startLimit = Carbon::parse('01-12-2021');
 
             if($start->isBefore($startLimit)){
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::parse('24-02-2022');
+            $end = $end ? $end : Carbon::now();
 
             $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                 'begintime' => $start->timestamp,
@@ -154,7 +154,6 @@ class FetchOrderListsFromYdPortalProcessor
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
             foreach($rows->data as $row){
-                if($row->expressno !== 'M202202230904163') continue;
                 $containerReference = null;
                 $loadingDate = null;
                 $unstuffingDate = null;

From 53c325b36d684106b539a9c095ab3ea12e5b018c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 20:47:14 +0800
Subject: [PATCH 27/41] fetch only 2 months orders from yd

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php         | 2 +-
 .../vue/components/containers/elements/PackingListComponent.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index fe84118f..1b409fc2 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -136,7 +136,7 @@ class FetchOrderListsFromYdPortalProcessor
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
         try {
-            $start = $start ? $start : Carbon::now()->subMonths(4);
+            $start = $start ? $start : Carbon::now()->subMonths(2);
 
             $startLimit = Carbon::parse('01-12-2021');
 
diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
index 36748461..1139f971 100644
--- a/resources/assets/vue/components/containers/elements/PackingListComponent.vue
+++ b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
@@ -24,7 +24,7 @@
         </div>
         <div class="col">
             <p class="no-margin" v-if="item.transport">{{ item.transport.current_schedule.eta }}</p>
-            <p class="no-margin text-danger" v-if="!item.transport">{{ item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days : 'n/a'}}</p>
+            <p class="no-margin text-danger" v-if="!item.transport">{{ item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days+' Days': 'n/a'}}</p>
         </div>
         <div class="col-auto text-right" v-if="!item.transport">
             <div class="row m-b-5">

From f33efd373cb5e7bd4b0d32d922a2bb3ba63f4beb Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 21:05:44 +0800
Subject: [PATCH 28/41] fix order address update to vt

---
 .../Processors/ApproveChangeOrderAddressProcessor.php       | 6 +++++-
 resources/views/pages/admin/dashboard.blade.php             | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
index 9fe6c5a7..2c33b00d 100644
--- a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
@@ -65,7 +65,11 @@ class ApproveChangeOrderAddressProcessor
             $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);
 
             $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-            if($appointee === 2) $this->updateDoFromVTPortalProcessor->execute($address);
+            if($appointee === 2) {
+                foreach($address->owner->packingLists as $packingList){
+                    $this->updateDoFromVTPortalProcessor->execute($packingList);
+                }
+            }
 
         }
 
diff --git a/resources/views/pages/admin/dashboard.blade.php b/resources/views/pages/admin/dashboard.blade.php
index 7f694bb9..616453c5 100644
--- a/resources/views/pages/admin/dashboard.blade.php
+++ b/resources/views/pages/admin/dashboard.blade.php
@@ -45,7 +45,7 @@
             </div>
             <div class="col">
                 <div class="row">
-                    <div class="col-7">
+                    <div class="col">
                         <list-component section="unclaimedPackingListSection" :endpoint="route('api.packing_list.list')" :options="{claimant_id: 2037, owner_id: 1, status: 4}">
                             <template slot="list" slot-scope="{data}">
                                 <unclaimed-packinglist-component :data="data"></unclaimed-packinglist-component>

From 5561442932a45cab8eb4c90c41cf3684349f4ff7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 21:09:01 +0800
Subject: [PATCH 29/41] fix order address update to vt

---
 .../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 da77ca4a..0bacd235 100644
--- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
@@ -42,6 +42,7 @@ class UpdateDoFromVTPortalProcessor
 
         try {
             $address= $packing_list->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+            dd($address);
             $order = $packing_list->owner;
 
             if ($packing_list) {

From 8b38bcac8abfeb95ffd2339914706ed8638b56d2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 21:10:23 +0800
Subject: [PATCH 30/41] fix order address update to vt

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

diff --git a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
index 2c33b00d..83ce0057 100644
--- a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
@@ -7,6 +7,7 @@ use App\Classes\Modules\Orders\Standards\Rules\CanApproveChangeOrderAddress;
 use App\Classes\Modules\Orders\Services\UpdatesOrdersAddress;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
 use Illuminate\Http\Request;
 
 class ApproveChangeOrderAddressProcessor
@@ -66,7 +67,7 @@ class ApproveChangeOrderAddressProcessor
 
             $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
             if($appointee === 2) {
-                foreach($address->owner->packingLists as $packingList){
+                foreach($address->owner->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST) as $packingList){
                     $this->updateDoFromVTPortalProcessor->execute($packingList);
                 }
             }

From 5fe8a7a59ef6bedd053b28d7f40b6457f4941bc4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 31 Mar 2022 21:15:19 +0800
Subject: [PATCH 31/41] fix order address update to vt

---
 resources/views/pages/admin/dashboard.blade.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/views/pages/admin/dashboard.blade.php b/resources/views/pages/admin/dashboard.blade.php
index 616453c5..62a6df6b 100644
--- a/resources/views/pages/admin/dashboard.blade.php
+++ b/resources/views/pages/admin/dashboard.blade.php
@@ -46,12 +46,16 @@
             <div class="col">
                 <div class="row">
                     <div class="col">
+                        <div class="row p-b-5 b-b b-grey m-b-10 m-l-0 m-r-0">
+                            <div class="col no-padding">
+                                <h6>Unclaimed Packing Lists</h6>
+                            </div>
+                        </div>
                         <list-component section="unclaimedPackingListSection" :endpoint="route('api.packing_list.list')" :options="{claimant_id: 2037, owner_id: 1, status: 4}">
                             <template slot="list" slot-scope="{data}">
                                 <unclaimed-packinglist-component :data="data"></unclaimed-packinglist-component>
                             </template>
                         </list-component>
-
                     </div>
                 </div>
                 <profit-model-report-section-component></profit-model-report-section-component>

From 6077b1fbbbf088e231dc7d057cbbeda3038f6f10 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 1 Apr 2022 10:56:56 +0800
Subject: [PATCH 32/41] fix yd missing packages from order

---
 .../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 1b409fc2..fe84118f 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -136,7 +136,7 @@ class FetchOrderListsFromYdPortalProcessor
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
         try {
-            $start = $start ? $start : Carbon::now()->subMonths(2);
+            $start = $start ? $start : Carbon::now()->subMonths(4);
 
             $startLimit = Carbon::parse('01-12-2021');
 

From e1d751b859d347b9128e4be72cc85079ce52d38c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 1 Apr 2022 11:21:44 +0800
Subject: [PATCH 33/41] fix yd missing packages from order

---
 .../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 fe84118f..1b409fc2 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -136,7 +136,7 @@ class FetchOrderListsFromYdPortalProcessor
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
         try {
-            $start = $start ? $start : Carbon::now()->subMonths(4);
+            $start = $start ? $start : Carbon::now()->subMonths(2);
 
             $startLimit = Carbon::parse('01-12-2021');
 

From 745f476f891cf5ebddb1968b72ae4b931c2baa8a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 1 Apr 2022 14:41:24 +0800
Subject: [PATCH 34/41] fix yd missing packages from order

---
 .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
index 0bacd235..da77ca4a 100644
--- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
@@ -42,7 +42,6 @@ class UpdateDoFromVTPortalProcessor
 
         try {
             $address= $packing_list->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
-            dd($address);
             $order = $packing_list->owner;
 
             if ($packing_list) {

From 1aff95b41c654c2087942959ef1ea6f2fde5dec1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 1 Apr 2022 14:51:57 +0800
Subject: [PATCH 35/41] fix yd missing packages from order

---
 .../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 da77ca4a..fe9c26dd 100644
--- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
@@ -65,6 +65,7 @@ class UpdateDoFromVTPortalProcessor
                 if ($vt_do) {
                     foreach ($vt_do->Rows as $key => $row) {
                         if($row[4] !== $packing_list->containers()->first()->reference) continue;
+                        dd($row);
                         $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(
                         'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 
                         'POST', 

From 0af84a9b7dbd41ba4d20ce46559679b92e077a11 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 1 Apr 2022 14:54:09 +0800
Subject: [PATCH 36/41] fix yd missing packages from order

---
 .../UpdateDoFromVTPortalProcessor.php         | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
index fe9c26dd..8771136f 100644
--- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
@@ -65,7 +65,52 @@ class UpdateDoFromVTPortalProcessor
                 if ($vt_do) {
                     foreach ($vt_do->Rows as $key => $row) {
                         if($row[4] !== $packing_list->containers()->first()->reference) continue;
-                        dd($row);
+                        dump('[
+                                    {
+                                        "Name": "ShippingAddress",
+                                        "NewValue": "' . $address->street_one . ' ' . $address->street_two  . ' '. $address->district->name.' '. $address->postcode.' '.$address->state->name.' '.$address->country->name.'",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "Attn",
+                                        "NewValue": "'.$reference.'",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "Tel",
+                                        "NewValue": "'.$phone.'",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "Status",
+                                        "NewValue": "' . $status . '",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "Doremarks",
+                                        "NewValue": "'. $remark .'",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "DoID",
+                                        "OldValue": '.$row[0].',
+                                        "NewValue": '.$row[0].',
+                                        "Modified": false,
+                                        "ReadOnly": true,
+                                        "Error": null
+                                    }
+                                ]');
+                        continue;
                         $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(
                         'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 
                         'POST', 
@@ -126,6 +171,7 @@ class UpdateDoFromVTPortalProcessor
                             }
                         }'), '');
                     }
+                    die();
                 }
             }
 

From f44aace3c557869ab0aebe82a9f86e1abf93e3be Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 1 Apr 2022 14:56:05 +0800
Subject: [PATCH 37/41] fix yd missing packages from order

---
 .../UpdateDoFromVTPortalProcessor.php         | 47 -------------------
 1 file changed, 47 deletions(-)

diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
index 8771136f..da77ca4a 100644
--- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
@@ -65,52 +65,6 @@ class UpdateDoFromVTPortalProcessor
                 if ($vt_do) {
                     foreach ($vt_do->Rows as $key => $row) {
                         if($row[4] !== $packing_list->containers()->first()->reference) continue;
-                        dump('[
-                                    {
-                                        "Name": "ShippingAddress",
-                                        "NewValue": "' . $address->street_one . ' ' . $address->street_two  . ' '. $address->district->name.' '. $address->postcode.' '.$address->state->name.' '.$address->country->name.'",
-                                        "Modified": true,
-                                        "ReadOnly": false,
-                                        "Error": null
-                                    },
-                                    {
-                                        "Name": "Attn",
-                                        "NewValue": "'.$reference.'",
-                                        "Modified": true,
-                                        "ReadOnly": false,
-                                        "Error": null
-                                    },
-                                    {
-                                        "Name": "Tel",
-                                        "NewValue": "'.$phone.'",
-                                        "Modified": true,
-                                        "ReadOnly": false,
-                                        "Error": null
-                                    },
-                                    {
-                                        "Name": "Status",
-                                        "NewValue": "' . $status . '",
-                                        "Modified": true,
-                                        "ReadOnly": false,
-                                        "Error": null
-                                    },
-                                    {
-                                        "Name": "Doremarks",
-                                        "NewValue": "'. $remark .'",
-                                        "Modified": true,
-                                        "ReadOnly": false,
-                                        "Error": null
-                                    },
-                                    {
-                                        "Name": "DoID",
-                                        "OldValue": '.$row[0].',
-                                        "NewValue": '.$row[0].',
-                                        "Modified": false,
-                                        "ReadOnly": true,
-                                        "Error": null
-                                    }
-                                ]');
-                        continue;
                         $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(
                         'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 
                         'POST', 
@@ -171,7 +125,6 @@ class UpdateDoFromVTPortalProcessor
                             }
                         }'), '');
                     }
-                    die();
                 }
             }
 

From 0abdbd525ed20ea6031d4cd4a4800a5ed2727496 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 1 Apr 2022 14:56:46 +0800
Subject: [PATCH 38/41] fix yd missing packages from order

---
 .../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 da77ca4a..552119d7 100644
--- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
@@ -63,6 +63,7 @@ class UpdateDoFromVTPortalProcessor
                 $vt_do = $this->fetchesDataFRomVTPortal->getResponseBody($vt_do);
 
                 if ($vt_do) {
+                    dd($vt_do->Rows);
                     foreach ($vt_do->Rows as $key => $row) {
                         if($row[4] !== $packing_list->containers()->first()->reference) continue;
                         $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(

From 2ff9a381142c68213a403717231b3a58851d1aac Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 1 Apr 2022 14:57:41 +0800
Subject: [PATCH 39/41] fix yd missing packages from order

---
 .../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 552119d7..9444ad03 100644
--- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
@@ -63,7 +63,7 @@ class UpdateDoFromVTPortalProcessor
                 $vt_do = $this->fetchesDataFRomVTPortal->getResponseBody($vt_do);
 
                 if ($vt_do) {
-                    dd($vt_do->Rows);
+                    dd($vt_do);
                     foreach ($vt_do->Rows as $key => $row) {
                         if($row[4] !== $packing_list->containers()->first()->reference) continue;
                         $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(

From ab1d92af8665baf60bbaf0371da96d9697a37e9f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 1 Apr 2022 14:58:27 +0800
Subject: [PATCH 40/41] fix yd missing packages from order

---
 .../Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
index 9444ad03..da77ca4a 100644
--- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
@@ -63,7 +63,6 @@ class UpdateDoFromVTPortalProcessor
                 $vt_do = $this->fetchesDataFRomVTPortal->getResponseBody($vt_do);
 
                 if ($vt_do) {
-                    dd($vt_do);
                     foreach ($vt_do->Rows as $key => $row) {
                         if($row[4] !== $packing_list->containers()->first()->reference) continue;
                         $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(

From b764ee07696b3728c2f44881f8f51458a03d55ff Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 1 Apr 2022 17:02:36 +0800
Subject: [PATCH 41/41] update packing list monthly summary containers

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

diff --git a/routes/web.php b/routes/web.php
index 31c961b1..98a630ec 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -241,7 +241,7 @@ Route::get('/settings', function () {
 
 Route::get('/customer/summary/monthly', function () {
 //    $containers = Container::whereMonth('loading_date', 1)->where('owner_id', 3)->get();
-    $containers = Container::whereIn('reference', ['SM21-166', 'SM21-168', 'SM21-170', 'SM21-171', 'SM21-172', 'SM21-173', 'EPS-3833'])->get();
+    $containers = Container::whereIn('reference', ['EPS-3850', 'EPS-3863', 'WP-1331', 'EPS-3856'])->get();
     foreach ($containers as $container){
         $packingLists = $container->packingLists()->get()->filter(function ($packingList) {
             return $packingList->owner->company_module_id === 248;