From 0d4db39013e04895994e0956812fb2bd4e52c587 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:09:50 +0800
Subject: [PATCH 01/62] yd debug

---
 .../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 40eb347a..1c365135 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -152,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
+dd($rows);
             foreach($rows->data as $row){
                 $containerReference = null;
                 $loadingDate = null;

From 39e1c09f0586aec060e82dc9712368e894555912 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:11:00 +0800
Subject: [PATCH 02/62] yd debug

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 1c365135..9b4aeaca 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(3);
+            $start = $start ? $start : Carbon::now()->subMonths(1);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -152,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-dd($rows);
+
             foreach($rows->data as $row){
                 $containerReference = null;
                 $loadingDate = null;

From 16031665a9e790124f07e9fc3bd946a01e08a65d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:32:49 +0800
Subject: [PATCH 03/62] yd debug

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 9b4aeaca..8052393f 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(1);
+            $start = $start ? $start : Carbon::now()->subdays(5);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -144,7 +144,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::now();
+            $end = $end ? $end : Carbon::now()->subdays(1);
 
             $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                 'begintime' => $start->timestamp,
@@ -152,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
+dd($rows);
             foreach($rows->data as $row){
                 $containerReference = null;
                 $loadingDate = null;

From e4af160ad287eae2e1763a02ee6764ed15b25317 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:33:59 +0800
Subject: [PATCH 04/62] yd debug

---
 .../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 8052393f..8e698055 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -152,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-dd($rows);
+dd($start, $end);
             foreach($rows->data as $row){
                 $containerReference = null;
                 $loadingDate = null;

From 952333e5cb7bd4ba8c1b1dc9b59cb81de9d5bbb9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:34:46 +0800
Subject: [PATCH 05/62] yd debug

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 8e698055..b412a7cb 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()->subdays(5);
+            $start = $start ? $start : Carbon::now()->subdays(10);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -144,7 +144,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::now()->subdays(1);
+            $end = $end ? $end : Carbon::now()->subdays(5);
 
             $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                 'begintime' => $start->timestamp,

From 1429f97bca71e1fe5433be4838a1d15e6e15e421 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:35:51 +0800
Subject: [PATCH 06/62] yd debug

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index b412a7cb..1d150006 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()->subdays(10);
+            $start = $start ? $start : Carbon::today()->subdays(10);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -144,7 +144,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::now()->subdays(5);
+            $end = $end ? $end : Carbon::today()->subdays(5);
 
             $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                 'begintime' => $start->timestamp,

From e497eec33173a3eb649a1e6c73a2cf3a0b172547 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:37:38 +0800
Subject: [PATCH 07/62] yd debug

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 1d150006..2b559f05 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::today()->subdays(10);
+            $start = $start ? $start : Carbon::today()->subdays(5);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -144,7 +144,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::today()->subdays(5);
+            $end = $end ? $end : Carbon::today()->subdays(0);
 
             $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                 'begintime' => $start->timestamp,

From e0f0e0e59e56d74b1de3911fcb74c16c51549b81 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:38:53 +0800
Subject: [PATCH 08/62] yd debug

---
 .../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 2b559f05..e7e2cc9f 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -152,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-dd($start, $end);
+
             foreach($rows->data as $row){
                 $containerReference = null;
                 $loadingDate = null;

From ad39cdd124a66a67af1fc01933e8b4b98a5ceacb Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:41:34 +0800
Subject: [PATCH 09/62] yd debug

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index e7e2cc9f..346474f8 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -154,6 +154,7 @@ class FetchOrderListsFromYdPortalProcessor
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
             foreach($rows->data as $row){
+
                 $containerReference = null;
                 $loadingDate = null;
                 $unstuffingDate = null;
@@ -167,7 +168,7 @@ class FetchOrderListsFromYdPortalProcessor
                 ]);
 
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-
+dd($rows);
                 if(!$rows){
                     Log::debug($row->expressno);
                     continue;

From d90347d2ee093219b70d1b0c17af00fc7104b24f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:42:34 +0800
Subject: [PATCH 10/62] yd debug

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 346474f8..31a0861a 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::today()->subdays(5);
+            $start = $start ? $start : Carbon::today()->subdays(3);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -152,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
+dd($rows);
             foreach($rows->data as $row){
 
                 $containerReference = null;
@@ -168,7 +168,7 @@ class FetchOrderListsFromYdPortalProcessor
                 ]);
 
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-dd($rows);
+
                 if(!$rows){
                     Log::debug($row->expressno);
                     continue;

From 12e2ce4de179ae82853549663cfd66fbeed37da3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:44:49 +0800
Subject: [PATCH 11/62] yd fetch daily

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 31a0861a..c500cd77 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::today()->subdays(3);
+            $start = $start ? $start : Carbon::today()->subdays(2);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -152,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-dd($rows);
+
             foreach($rows->data as $row){
 
                 $containerReference = null;

From b3b048ef2b4bbcace7924dd99edbc3367705bb67 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:47:02 +0800
Subject: [PATCH 12/62] yd fetch daily

---
 .../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 c500cd77..6e9576f9 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -425,7 +425,7 @@ class FetchOrderListsFromYdPortalProcessor
                 }
 
                 DB::commit();
-                echo 'successful';
+                dd('successful');
 
             }
         } catch (\Exception $exception) {

From ee7acbc683d4c0fe8ad44d1d8cb08f427d7ebc1e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:49:13 +0800
Subject: [PATCH 13/62] yd fetch daily

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 6e9576f9..8d727274 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -245,8 +245,6 @@ class FetchOrderListsFromYdPortalProcessor
 
                 }
 
-                DB::beginTransaction();
-
                 $packingListReference = $row->expressno;
 
                 try{
@@ -424,8 +422,7 @@ class FetchOrderListsFromYdPortalProcessor
                     $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
                 }
 
-                DB::commit();
-                dd('successful');
+                echo 'successful';
 
             }
         } catch (\Exception $exception) {

From 7767b4f177ba8948880cb54fb48ef6d159bea2e3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 03:51:16 +0800
Subject: [PATCH 14/62] yd fetch daily

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 8d727274..c7eaca9e 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::today()->subdays(2);
+            $start = $start ? $start : Carbon::today()->subMonths(1);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -144,7 +144,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::today()->subdays(0);
+            $end = $end ? $end : Carbon::today()->addDay();
 
             $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                 'begintime' => $start->timestamp,

From 0775c2687f8c1e35513ee6b90822bda5003c5c07 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 04:03:13 +0800
Subject: [PATCH 15/62] yd fetch daily

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index c7eaca9e..f108beb9 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::today()->subMonths(1);
+            $start = $start ? $start : Carbon::today()->subDays(7);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -144,7 +144,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::today()->addDay();
+            $end = $end ? $end : Carbon::today()->addDay()->subDays(0);
 
             $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                 'begintime' => $start->timestamp,
@@ -152,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
+dd($rows);
             foreach($rows->data as $row){
 
                 $containerReference = null;

From c487b316734e2bf156e4271bdff954f37eccb6a0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 04:03:45 +0800
Subject: [PATCH 16/62] yd fetch daily

---
 .../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 f108beb9..537ec544 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -152,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-dd($rows);
+
             foreach($rows->data as $row){
 
                 $containerReference = null;

From 1619bc212f53b52fb9487d67d2a13cca04511707 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 04:05:49 +0800
Subject: [PATCH 17/62] yd fetch daily

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 537ec544..42d84de0 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::today()->subDays(7);
+            $start = $start ? $start : Carbon::today()->subDays(14);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -144,7 +144,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::today()->addDay()->subDays(0);
+            $end = $end ? $end : Carbon::today()->addDay()->subDays(7);
 
             $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                 'begintime' => $start->timestamp,

From ac461a48b75b3000ba53c757eecb56a42b7a8c04 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 04:20:07 +0800
Subject: [PATCH 18/62] yd fetch daily

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 42d84de0..c7eaca9e 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::today()->subDays(14);
+            $start = $start ? $start : Carbon::today()->subMonths(1);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -144,7 +144,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::today()->addDay()->subDays(7);
+            $end = $end ? $end : Carbon::today()->addDay();
 
             $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                 'begintime' => $start->timestamp,
diff --git a/routes/web.php b/routes/web.php
index 8dc4b0be..4d0c797b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -228,8 +228,10 @@ Route::get('/debug', function (){
     dd($issues);
 });
 
-Route::get('/yd', function (){
-    (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
+Route::get('/yd', function (\Illuminate\Http\Request $request){
+    $start = $request->input('start_date') ? \Carbon\Carbon::parse($request->input('start_date')): null;
+    $end = $request->input('end_date') ? \Carbon\Carbon::parse($request->input('end_date')): null;
+    (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute($start, $end);
 });
 
 Route::get('/min_cbm', function (){

From 1be99a0730f2129843bf23c531d55cda2454379c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 04:30:54 +0800
Subject: [PATCH 19/62] yd fetch daily

---
 .../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 c7eaca9e..5abe023d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -426,6 +426,7 @@ class FetchOrderListsFromYdPortalProcessor
 
             }
         } catch (\Exception $exception) {
+            dump($exception);
             Log::debug($exception);
         }
 

From 22aaccbe211f4e00f356f577bc8552790af25147 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 04:38:44 +0800
Subject: [PATCH 20/62] yd fetch daily

---
 .../FetchOrderListsFromYdPortalProcessor.php  | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 5abe023d..99ebf9c1 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -397,11 +397,14 @@ class FetchOrderListsFromYdPortalProcessor
                                 $packingList->save();
                             }
 
-                            $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                            foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
-                                $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
-                                $step->update(['status' => ApprovalStatus::COMPLETED]);
+                            if ($allow_contract) {
+                                $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                                foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
+                                    $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
+                                    $step->update(['status' => ApprovalStatus::COMPLETED]);
+                                }
                             }
+
                         }
                     }
                 }
@@ -416,10 +419,14 @@ class FetchOrderListsFromYdPortalProcessor
                     $transport = $this->createsTransport->execute($transportObject, $packingList);
                     $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
 
-                    $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
-                    $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                    $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
-                    $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
+
+                    if ($allow_contract) {
+                        $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
+                        $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                        $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
+                        $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
+                    }
+
                 }
 
                 echo 'successful';

From daa861861665616df288c751f7d658e6ab04525f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 06:23:12 +0800
Subject: [PATCH 21/62] fix packinglist without package bug in packinglist
 component

---
 .../vue/components/containers/elements/PackingListComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
index 1139f971..b52745fa 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+' Days': 'n/a'}}</p>
+            <p class="no-margin text-danger" v-if="!item.transport">{{ item.packages ? item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days+' Days': 'n/a' : 'n/a'}}</p>
         </div>
         <div class="col-auto text-right" v-if="!item.transport">
             <div class="row m-b-5">

From 846f617e00735e5fba39a803d4f624da47518ebf Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 06:25:23 +0800
Subject: [PATCH 22/62] fix packinglist without package bug in packinglist
 component

---
 .../vue/components/containers/elements/PackingListComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
index b52745fa..1b557d78 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 ? item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days+' Days': 'n/a' : 'n/a'}}</p>
+            <p class="no-margin text-danger" v-if="!item.transport">{{ item.packages.length ? item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days+' Days': 'n/a' : 'n/a'}}</p>
         </div>
         <div class="col-auto text-right" v-if="!item.transport">
             <div class="row m-b-5">

From af2d3adbcd4832e5c3c9b056abceac34bebb43c7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 08:01:44 +0800
Subject: [PATCH 23/62] fix vt warehouse list api

---
 ...ehouseReceiveListFromVTPortalProcessor.php | 21 +++++++++--------
 .../elements/ContainerComponent.vue           |  4 ++--
 routes/web.php                                | 23 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 8ba2957e..3b20d24b 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -116,7 +116,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
         try {
 
-            $start = $start ? $start : Carbon::now()->subMonth();
+            $start = $start ? $start : Carbon::today()->subDays(2);
 
             $startLimit = Carbon::parse('11-08-2021');
 
@@ -124,7 +124,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::now();
+            $end = $end ? $end : Carbon::today()->addDay();
 
             $filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
@@ -134,18 +134,20 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             foreach ($response->Rows as $parcel){
 
-                $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[29]));
+                $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[11]));
                 $orderNumber = $marking[array_key_last($marking)];
 
-                if(!$parcel[3]){
+                $quantity = $parcel[16];
+                if(!$quantity){
                     continue;
                 }
+
                 try {
+
                     $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
                 } catch (ResourceNotFoundException $exception) {
 
                     $oldOrder = OldOrders::where('marking', '=', $orderNumber)->first();
-
                     if(!$oldOrder){
                         continue;
                     }
@@ -175,7 +177,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                     }
 
 
-                    $warehouseId = $parcel[44];
+                    $warehouseId = $parcel[43];
                     $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
 
                     $order = $this->createOrderProcessor->execute($companyModule->company, $originWarehouse, $address, $orderNumber);
@@ -186,10 +188,9 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                 }
 
                 $packingListReference = $parcel[0];
-                $quantity = $parcel[3];
 //                $measurement = round(($parcel[10]/$quantity) ** (1/3) * 100, 2);
-                $description = $parcel[31];
-                $tracking = $parcel[38];
+                $description = $parcel[13];
+                $tracking = $parcel[37];
                 $receiveDate = $parcel[1];
 
                 $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
@@ -215,7 +216,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                 $packingList->packages()->delete();
                 if($replica) $replica->packages()->delete();
 
-                $packageObject = new PackageObject(PackageType::CARTON, $description, $parcel[10], $parcel[9], $parcel[8], 0, $quantity, ApprovalStatus::APPROVED);
+                $packageObject = new PackageObject(PackageType::CARTON, $description, $parcel[23], $parcel[22], $parcel[21], 0, $quantity, ApprovalStatus::APPROVED);
                 $this->createPackageProcessor->execute($packageObject, $packingList);
             }
         } catch (\Exception $exception){
diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index e60059a1..c23cafaf 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -57,8 +57,8 @@
                             <div class="btn btn-default no-border" @click="expanded = !expanded">
                                 <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
                             </div>
-                            <a class="btn btn-default no-border" :href="route('container.show', item.container_reference)">
-                                <i class="fa fa-angle-right fa-fw"></i>
+                            <a class="btn btn-default no-border" :href="route('container.refresh', item.container_reference)" target="_blank">
+                                <i class="fa fa-refresh fa-fw"></i>
                             </a>
                         </div>
                     </div>
diff --git a/routes/web.php b/routes/web.php
index 4d0c797b..5f03d2bf 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -139,6 +139,8 @@ Route::get('/customer/{marking}/details', function ($marking) {
 
 Route::get('/orders/refresh', function(){
 
+    dd((App()->make(\App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute());
+
     FetchWarehouseReceiveListFromVTPortalJob::withChain([
         new FetchLoadedContainersFromVTPortalJob,
         new FetchPackingListFromVTPortalJob,
@@ -232,7 +234,26 @@ Route::get('/yd', function (\Illuminate\Http\Request $request){
     $start = $request->input('start_date') ? \Carbon\Carbon::parse($request->input('start_date')): null;
     $end = $request->input('end_date') ? \Carbon\Carbon::parse($request->input('end_date')): null;
     (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute($start, $end);
-});
+})->name('yd.refresh');
+
+Route::get('/container/{reference}/refresh/', function (string $reference){
+    $container = Container::where('reference', $reference)->first();
+    $supplier = in_array($container->owner_id, [3, 4]) ? 'VT' : 'YD';
+
+    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);
+    }
+
+})->name('container.refresh');
 
 Route::get('/min_cbm', function (){
     $companies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orders', function ($query){

From b260d30e42eacc528bcd084168fc1b0100bef264 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 08:02:56 +0800
Subject: [PATCH 24/62] fix vt warehouse list api

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 3b20d24b..e05f9462 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -131,7 +131,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
             $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Parcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), '');
 
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
-
+dd($response);
             foreach ($response->Rows as $parcel){
 
                 $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[11]));

From d93d51ff09e7445b00f3647073fbfd3558d62a41 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 08:35:23 +0800
Subject: [PATCH 25/62] fix vt warehouse list api

---
 ...ehouseReceiveListFromVTPortalProcessor.php | 52 +++----------------
 .../orders/elements/ParcelComponent.vue       |  2 +-
 2 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index e05f9462..78f86e2d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -116,7 +116,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
         try {
 
-            $start = $start ? $start : Carbon::today()->subDays(2);
+            $start = $start ? $start : Carbon::today()->subMonth();
 
             $startLimit = Carbon::parse('11-08-2021');
 
@@ -131,9 +131,9 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
             $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Parcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), '');
 
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
-dd($response);
-            foreach ($response->Rows as $parcel){
 
+            foreach ($response->Rows as $parcel){
+                $allow_contract = true;
                 $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[11]));
                 $orderNumber = $marking[array_key_last($marking)];
 
@@ -143,48 +143,12 @@ dd($response);
                 }
 
                 try {
-
                     $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                    $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
                 } catch (ResourceNotFoundException $exception) {
-
-                    $oldOrder = OldOrders::where('marking', '=', $orderNumber)->first();
-                    if(!$oldOrder){
-                        continue;
-                    }
-
-
-                    $customerMarking = str_replace('/', '', str_replace(' ', '', explode('CIEF/', $oldOrder->company->marking)[1]));
-
-                    $companyModule = CompanyModule::whereHas('inviters', function($query) use ($customerMarking) {
-                        return $query->where('invitee_reference', '=', $customerMarking);
-                    })->first();
-
-
-                    if(!$companyModule){
-                        log::error('unknown customer: '.$customerMarking);
-                        continue;
-                    }
-
-                    if(!$oldOrder->address) {
-                        continue;
-                    }
-
-                    /** @var Address $address */
-                    $address = $this->createAddressFromOldAddressProcessor->execute($oldOrder->address, $companyModule);
-
-                    if(!$address){
-                        continue;
-                    }
-
-
-                    $warehouseId = $parcel[43];
-                    $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
-
-                    $order = $this->createOrderProcessor->execute($companyModule->company, $originWarehouse, $address, $orderNumber);
-
-                    $order->created_at = Carbon::parse($parcel[1]);
-                    $order->save();
-
+                    $allow_contract = false;
+                    $order = $this->fetchesCompanyModule->execute(['id' => 1]);
+                    $appointee_id = 2037;
                 }
 
                 $packingListReference = $parcel[0];
@@ -193,7 +157,7 @@ dd($response);
                 $tracking = $parcel[37];
                 $receiveDate = $parcel[1];
 
-                $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
+                $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
                 /** @var PackingList $packingList */
                 $packingList = $order->packingLists()->where('reference', '=', $packingListReference)->first();
diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 01299ad1..84ccbe82 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -32,7 +32,7 @@
                         </div>
                         <div class="col" v-if="$store.getters.isAdmin">
                             <p class="no-margin all-caps fs-10 light">Warehouse</p>
-                            <p class="no-margin">{{item.order.warehouse.reference}}</p>
+                            <p class="no-margin">{{item.order ? item.order.warehouse.reference : '<span class='text-danger'>Unclaimed</span>'}}</p>
                         </div>
                         <div class="col-auto text-right">
                             <div class="btn btn-xs btn-default" @click="expanded = !expanded"><i class="fa" :class="{'fa-angle-up': expanded, 'fa-angle-down': !expanded}"></i></div>

From fafc7161098ef27cf01f64537e35fc41d3fc48ec Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 08:37:54 +0800
Subject: [PATCH 26/62] fix vt warehouse list api

---
 routes/web.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 5f03d2bf..9b68921b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -137,9 +137,11 @@ Route::get('/customer/{marking}/details', function ($marking) {
     return view('pages.customers.profile_details', ['id' => $id]);
 })->name('customer.profile.details');
 
-Route::get('/orders/refresh', function(){
+Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
 
-    dd((App()->make(\App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute());
+    $start = $request->input('start_date') ? \Carbon\Carbon::parse($request->input('start_date')): null;
+    $end = $request->input('end_date') ? \Carbon\Carbon::parse($request->input('end_date')): null;
+    dd((App()->make(\App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute($start, $end));
 
     FetchWarehouseReceiveListFromVTPortalJob::withChain([
         new FetchLoadedContainersFromVTPortalJob,

From 66ef0c08f562e634215a590b7b3ce9ff1f983e71 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 08:45:41 +0800
Subject: [PATCH 27/62] fix vt warehouse list api

---
 .../assets/vue/components/orders/elements/ParcelComponent.vue  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 84ccbe82..9386f121 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -32,7 +32,8 @@
                         </div>
                         <div class="col" v-if="$store.getters.isAdmin">
                             <p class="no-margin all-caps fs-10 light">Warehouse</p>
-                            <p class="no-margin">{{item.order ? item.order.warehouse.reference : '<span class='text-danger'>Unclaimed</span>'}}</p>
+                            <p class="no-margin" v-if="item.order">{{item.order.warehouse.reference}}</p>
+                            <span class='text-danger' v-if="!item.order">Unclaimed</span>
                         </div>
                         <div class="col-auto text-right">
                             <div class="btn btn-xs btn-default" @click="expanded = !expanded"><i class="fa" :class="{'fa-angle-up': expanded, 'fa-angle-down': !expanded}"></i></div>

From 79ada10312e0892c96f02d51016a33821535f839 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 09:15:04 +0800
Subject: [PATCH 28/62] fix vt containers api

---
 ...hLoadedContainersFromVTPortalProcessor.php | 59 ++++++++++++-------
 routes/web.php                                |  2 +-
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index f8b915a8..0349c859 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -126,7 +126,7 @@ class FetchLoadedContainersFromVTPortalProcessor
 
         DB::beginTransaction();
         try {
-            $start = $start ? $start : Carbon::now()->subDays(30);
+            $start = $start ? $start : Carbon::today()->subMonth();
 
             $startLimit = Carbon::parse('11-08-2021');
 
@@ -134,7 +134,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::now();
+            $end = $end ? $end : Carbon::today()->addDay();
             $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.'}}'), '');
@@ -158,6 +158,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                 }
 
                 foreach($containerDetail->Rows as $packingList){
+                    $allow_contract = true;
                     $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[39]));
 
                     $orderNumber = $marking[array_key_last($marking)];
@@ -166,46 +167,60 @@ class FetchLoadedContainersFromVTPortalProcessor
                         continue;
                     }
 
+                    $allow_contract = true;
+
                     try {
-                        /** @var Order $order */
                         $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
-                    } catch (ResourceNotFoundException $exception){
-                        continue;
+                    } catch (ResourceNotFoundException $exception) {
+                        try {
+                            $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]);
+                        } catch (ResourceNotFoundException $exception) {
+                            $order = $this->fetchesCompanyModule->execute(['id' => 1]);
+                            $allow_contract = false;
+                        }
+
                     }
 
-                    $packingListReference = $packingList[6];
+
+                    $packingListReference = $packingList[3];
 
                     try{
                         $this->fetchesPackingList->execute(['reference' => $packingListReference]);
                     } catch (ResourceNotFoundException $exception){
-                        $contract = $this->unityCreateContract->execute();
-                        $contractReference = $contract->hash_id;
-                        $contractObligations = $contract->contract_obligation_list;
 
-                        $this->unityActivateContract->execute($contractReference);
+                        if ($allow_contract) {
+                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+                            $contract = $this->unityCreateContract->execute();
+                            $contractReference = $contract->hash_id;
+                            $contractObligations = $contract->contract_obligation_list;
 
-                        $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
+                            $this->unityActivateContract->execute($contractReference);
 
-                        $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
-                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
+                            $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
 
-                        $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+                            $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
+                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
 
-                        $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
+                            $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
+                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
 
-                        $connection = $order->companyModule->connections()->first();
-                        $marking = $connection->invitee_reference;
+                            $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
+                        } else {
+                            $appointee_id = 2037;
+                        }
 
-                        $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, $contractReference);
+                        $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
 
                         /** @var PackingList $packingList */
                         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+                        $container->packingLists()->detach($packingList);
                         $container->packingLists()->attach($packingList);
 
-                        foreach($contractObligations as $obligation) {
-                            $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
-                            $this->createsStep->execute($packingList, $stepObject);
+                        if ($allow_contract) {
+                            foreach ($contractObligations as $obligation) {
+                                $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+                                $this->createsStep->execute($packingList, $stepObject);
+                            }
                         }
 
                     }
diff --git a/routes/web.php b/routes/web.php
index 9b68921b..85cbb8dd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -141,7 +141,7 @@ Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
 
     $start = $request->input('start_date') ? \Carbon\Carbon::parse($request->input('start_date')): null;
     $end = $request->input('end_date') ? \Carbon\Carbon::parse($request->input('end_date')): null;
-    dd((App()->make(\App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute($start, $end));
+    dd((App()->make(\App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor::class))->execute($start, $end));
 
     FetchWarehouseReceiveListFromVTPortalJob::withChain([
         new FetchLoadedContainersFromVTPortalJob,

From 651dea8f3abf7a137be937a9bc45b5df0c0e7510 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 09:31:15 +0800
Subject: [PATCH 29/62] fix vt packing list api

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index 2cfd94dd..dffe1380 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -48,13 +48,12 @@ class FetchPackingListFromVTPortalProcessor
 
         $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){
             $query->where('status', '=', ApprovalStatus::COMPLETED);
-        })->get();
+        })->limit(10)->get();
 
         DB::beginTransaction();
         foreach($packingLists as $packingList){
             try {
 
-
                 $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
 
                 $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
@@ -77,6 +76,7 @@ class FetchPackingListFromVTPortalProcessor
                 }
 
             } catch (GuzzleException $exception) {
+                Log::error($exception);
                 continue;
             }
 

From a71ca9dd29df4d33b1b2c7ef77fa6d4f06cf6d78 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 09:44:31 +0800
Subject: [PATCH 30/62] fix vt packing list api

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

diff --git a/routes/web.php b/routes/web.php
index 85cbb8dd..3ae6c438 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -141,7 +141,7 @@ Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
 
     $start = $request->input('start_date') ? \Carbon\Carbon::parse($request->input('start_date')): null;
     $end = $request->input('end_date') ? \Carbon\Carbon::parse($request->input('end_date')): null;
-    dd((App()->make(\App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor::class))->execute($start, $end));
+    dd((App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute($start, $end));
 
     FetchWarehouseReceiveListFromVTPortalJob::withChain([
         new FetchLoadedContainersFromVTPortalJob,

From f62fc486365d5721d4ac2375eda1e6c4f6717021 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 14:39:40 +0800
Subject: [PATCH 31/62] fix vt packing list api

---
 ...hLoadedContainersFromVTPortalProcessor.php | 75 +++++++++++++++++--
 .../FetchPackingListFromVTPortalProcessor.php | 24 ++----
 .../elements/PackingListComponent.vue         |  2 +-
 routes/web.php                                |  8 ++
 4 files changed, 84 insertions(+), 25 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 0349c859..7ae869ef 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -7,12 +7,15 @@ use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
 use App\Classes\Modules\Orders\Services\FetchesOrder;
 use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
 use App\Classes\Modules\Schedules\Services\CreatesSchedule;
 use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
 use App\Classes\Modules\Steps\Services\CreatesStep;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
 use App\Classes\Modules\Transports\Services\CreatesTransport;
 use App\Classes\Modules\Unity\Processors\ActivateContractProcessor;
 use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
@@ -21,10 +24,13 @@ use App\Classes\Modules\Unity\Services\CreatesContract;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\ContainerTypes;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\Order;
 use App\Models\PackingList;
+use App\Models\Transport;
 use Carbon\Carbon;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Facades\DB;
@@ -126,7 +132,7 @@ class FetchLoadedContainersFromVTPortalProcessor
 
         DB::beginTransaction();
         try {
-            $start = $start ? $start : Carbon::today()->subMonth();
+            $start = $start ? $start : Carbon::today()->subDays(10);
 
             $startLimit = Carbon::parse('11-08-2021');
 
@@ -148,9 +154,56 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $containerDetail = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailRequest);
 
                 $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;
                 try {
                     $container = $this->fetchesContainer->execute(['reference' => $containerObject->getReference()]);
+
+                    $eta = Carbon::parse($containerInfo[4]);
+
+                    $etd = Carbon::parse($eta)->subDays(5);
+
+                    $delayDate = $containerInfo[7];
+
+                    $containerStatus = $containerInfo[10];
+
+                    $unstuffingDate = $containerInfo[8];
+
+                    $transport = $container->transports()->first();
+
+                    if(!$transport){
+                        $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));
+                    }
+
+                    if($delayDate){
+
+                        $delayDate = Carbon::parse($delayDate);
+                        $transport = $container->transports()->first();
+
+                        if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {
+                            $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
+                            $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
+                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
+                        }
+
+                    }
+
+                    if($containerStatus === 'Unstuffing'){
+                        $container->update(['status' => ApprovalStatus::COMPLETED]);
+                        $container->transports()->first()->update(['drop_date' => Carbon::parse($unstuffingDate)->subDay(), 'status' => ApprovalStatus::COMPLETED]);
+
+                        /** @var PackingList $packingList */
+                        foreach($container->packingLists as $packingList){
+
+                            if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
+                                $packingList->status = ApprovalStatus::APPROVED;
+                                $packingList->save();
+                            }
+
+                        }
+                    }
                 } catch (ResourceNotFoundException $exception){
                     $warehouseId = $container[13];
                     $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
@@ -158,7 +211,6 @@ class FetchLoadedContainersFromVTPortalProcessor
                 }
 
                 foreach($containerDetail->Rows as $packingList){
-                    $allow_contract = true;
                     $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[39]));
 
                     $orderNumber = $marking[array_key_last($marking)];
@@ -181,13 +233,14 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                     }
 
-
                     $packingListReference = $packingList[3];
+                    $package = $packingList;
 
-                    try{
-                        $this->fetchesPackingList->execute(['reference' => $packingListReference]);
+                    try {
+                        $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference]);
+                        $container->packingLists()->detach($packingList);
+                        $container->packingLists()->attach($packingList);
                     } catch (ResourceNotFoundException $exception){
-
                         if ($allow_contract) {
                             $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
                             $contract = $this->unityCreateContract->execute();
@@ -225,6 +278,14 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                     }
 
+                    $packingList->packages()->delete();
+
+                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                    $packageObject = new PackageObject(PackageType::CARTON, $package[8], $package[21], $package[22], $package[20], 0, $package[11], ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+
                 }
 
             }
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index dffe1380..cebd8101 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -46,42 +46,32 @@ class FetchPackingListFromVTPortalProcessor
      */
     public function execute(){
 
-        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){
+        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->where('reference', 'not like', '%PO%')->whereIn('claimant_id', [2])->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){
             $query->where('status', '=', ApprovalStatus::COMPLETED);
         })->limit(10)->get();
 
-        DB::beginTransaction();
         foreach($packingLists as $packingList){
             try {
 
-                $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
+                $filter = '["PoID:=%js%'.$packingList->reference.'"]';
 
-                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
+                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Po","view":"grid1","request":{"PageIndex":-1,"PageSize":1000,"Filter":'.$filter.'}}'), '');
 
                 $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
+
                 if(count($shippingPackingLists->Rows)) {
-                    $packingList->packages()->delete();
 
-                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-                    if($replica) $replica->packages()->delete();
-
-                    foreach($shippingPackingLists->Rows as $shippingPackingList){
-                        if(!$shippingPackingList[22]) {
-                            continue;
-                        }
-
-                        $packageObject = new PackageObject(PackageType::CARTON, $shippingPackingList[19], $shippingPackingList[31], $shippingPackingList[30], $shippingPackingList[29], 0, $shippingPackingList[22], ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
+                } else {
+                    dump($packingList->reference);
                 }
 
             } catch (GuzzleException $exception) {
+                dd($exception);
                 Log::error($exception);
                 continue;
             }
 
         }
-        DB::commit();
 
         return [];
 
diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
index 1b557d78..26e6abf6 100644
--- a/resources/assets/vue/components/containers/elements/PackingListComponent.vue
+++ b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
@@ -13,7 +13,7 @@
         <div class="col-1">{{ (parseFloat(cbm) + parseFloat(overweight)).toFixed(3)}}</div>
         <div class="col-1 bold text-center" :class="{'text-danger': item.status === 5, 'text-success': item.status !== 5}">{{item.transport ? 'Delivery' : item.status === 5 ? 'On Hold' : 'Release'}}</div>
         <div class="col-3">
-            <div v-if="item.order">
+            <div v-if="item.order" style="overflow-wrap: break-word;">
                 {{item.order.address.contact ? item.order.address.contact.reference+' '+item.order.address.contact.phone : ''}}<br>
                 {{item.order.address.street_one+' '+(item.order.address.street_two ? item.order.address.street_two : '')+', '+ item.order.address.district.name+', '+item.order.address.post_code+' '+item.order.address.state.name+', '+item.order.address.country.name}}<br>{{item.order.address.remark ? item.order.address.remark.content: ''}}
                 <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="defineLocation">Define Location</div>
diff --git a/routes/web.php b/routes/web.php
index 3ae6c438..41fc64a9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -7,6 +7,7 @@ use App\Classes\Jobs\FetchOrdersFromYDPortalJob;
 use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
 use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
+use App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor;
 use App\Models\CompanyConnection;
 use App\Models\CompanyModule;
 use Illuminate\Support\Facades\Crypt;
@@ -236,12 +237,19 @@ Route::get('/yd', function (\Illuminate\Http\Request $request){
     $start = $request->input('start_date') ? \Carbon\Carbon::parse($request->input('start_date')): null;
     $end = $request->input('end_date') ? \Carbon\Carbon::parse($request->input('end_date')): null;
     (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute($start, $end);
+    (App()->make(FetchPackingListFromVTPortalProcessor::class))->execute();
 })->name('yd.refresh');
 
 Route::get('/container/{reference}/refresh/', function (string $reference){
     $container = Container::where('reference', $reference)->first();
     $supplier = in_array($container->owner_id, [3, 4]) ? 'VT' : 'YD';
 
+    if($supplier === 'VT'){
+        $startDate = $container->loading_date->subDays(3);
+        $endDate = $container->loading_date->addDay();
+        (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;

From 92b463b78e2bf4f5c6ff249a58274bcc1ba86f9a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 18 Jul 2022 14:41:46 +0800
Subject: [PATCH 32/62] fix vt packing list api

---
 app/Http/Resources/ContainerResource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index 42cc5fbb..49a33232 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -30,7 +30,7 @@ class ContainerResource extends JsonResource
             'remarks' => RemarkResource::collection($this->remarks),
             'status' => $this->status,
             'packing_lists' =>  $this->whenLoaded('packingLists', PackingListResource::collection($this->whenLoaded('packingLists', function(){
-                return $this->packingLists()->whereHas('packages')->get()->sortBy(function ($packingList) {
+                return $this->packingLists()->get()->sortBy(function ($packingList) {
                     return $packingList->owner->company_module_id;
                 });
             })))

From 42935d025df961ae6cc566870f7cce9b78420e70 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 16:36:22 +0800
Subject: [PATCH 33/62] fix vt packing list api

---
 ...FetchDeliveryListFromVTPortalProcessor.php |   1 -
 ...hLoadedContainersFromVTPortalProcessor.php | 116 ++++++++++--------
 2 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
index 520e64ec..c6239da5 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -91,7 +91,6 @@ class FetchDeliveryListFromVTPortalProcessor
                     $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
 
                 } catch (GuzzleException $exception) {
-                    dd($exception);
                     continue;
                 }
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 7ae869ef..2db5721f 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -155,60 +155,61 @@ 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;
+
+
                 try {
                     $container = $this->fetchesContainer->execute(['reference' => $containerObject->getReference()]);
-
-                    $eta = Carbon::parse($containerInfo[4]);
-
-                    $etd = Carbon::parse($eta)->subDays(5);
-
-                    $delayDate = $containerInfo[7];
-
-                    $containerStatus = $containerInfo[10];
-
-                    $unstuffingDate = $containerInfo[8];
-
-                    $transport = $container->transports()->first();
-
-                    if(!$transport){
-                        $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));
-                    }
-
-                    if($delayDate){
-
-                        $delayDate = Carbon::parse($delayDate);
-                        $transport = $container->transports()->first();
-
-                        if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {
-                            $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
-                            $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
-                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
-                        }
-
-                    }
-
-                    if($containerStatus === 'Unstuffing'){
-                        $container->update(['status' => ApprovalStatus::COMPLETED]);
-                        $container->transports()->first()->update(['drop_date' => Carbon::parse($unstuffingDate)->subDay(), 'status' => ApprovalStatus::COMPLETED]);
-
-                        /** @var PackingList $packingList */
-                        foreach($container->packingLists as $packingList){
-
-                            if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
-                                $packingList->status = ApprovalStatus::APPROVED;
-                                $packingList->save();
-                            }
-
-                        }
-                    }
                 } catch (ResourceNotFoundException $exception){
                     $warehouseId = $container[13];
                     $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
+                $eta = Carbon::parse($containerInfo[4]);
+
+                $etd = Carbon::parse($eta)->subDays(5);
+
+                $delayDate = $containerInfo[7];
+
+                $containerStatus = $containerInfo[10];
+
+                $unstuffingDate = $containerInfo[8];
+
+                $transport = $container->transports()->first();
+
+                if(!$transport){
+                    $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));
+                }
+
+                if($delayDate){
+
+                    $delayDate = Carbon::parse($delayDate);
+                    $transport = $container->transports()->first();
+
+                    if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {
+                        $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
+                        $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
+                        $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
+                    }
+
+                }
+
+                if($containerStatus === 'Unstuffing'){
+                    $container->update(['status' => ApprovalStatus::COMPLETED]);
+                    $container->transports()->first()->update(['drop_date' => Carbon::parse($unstuffingDate)->subDay(), 'status' => ApprovalStatus::COMPLETED]);
+
+                    /** @var PackingList $packingList */
+                    foreach($container->packingLists as $packingList){
+
+                        if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
+                            $packingList->status = ApprovalStatus::APPROVED;
+                            $packingList->save();
+                        }
+
+                    }
+                }
 
                 foreach($containerDetail->Rows as $packingList){
                     $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[39]));
@@ -235,6 +236,7 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                     $packingListReference = $packingList[3];
                     $package = $packingList;
+                    $deliveryDate = Carbon::parse($package[1] ? $package[1]:$package[2]);
 
                     try {
                         $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference]);
@@ -269,12 +271,6 @@ class FetchLoadedContainersFromVTPortalProcessor
                         $container->packingLists()->detach($packingList);
                         $container->packingLists()->attach($packingList);
 
-                        if ($allow_contract) {
-                            foreach ($contractObligations as $obligation) {
-                                $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
-                                $this->createsStep->execute($packingList, $stepObject);
-                            }
-                        }
 
                     }
 
@@ -285,6 +281,20 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                     $packageObject = new PackageObject(PackageType::CARTON, $package[8], $package[21], $package[22], $package[20], 0, $package[11], ApprovalStatus::APPROVED);
                     $this->createPackageProcessor->execute($packageObject, $packingList);
+                    if($containerStatus === 'Unstuffing'){
+                        if($deliveryDate) {
+//                            && !$packingList->transports()->exists()
+                            $packingList->status = ApprovalStatus::COMPLETED;
+                            $packingList->save();
+
+                            $transportObject = new TransportObject(TransportType::LAND, null, null, $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
+                            /** @var Transport $transport */
+                            $transport = $this->createsTransport->execute($transportObject, $packingList);
+                            $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
+                        } else {
+                            $packingList->transports()->delete();
+                        }
+                    }
 
                 }
 

From bdb81daf1a32a23dfa0cc238a62b5bd6cd8b835d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 16:45:44 +0800
Subject: [PATCH 34/62] fix vt packing list 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 2db5721f..4928f0b5 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -239,7 +239,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $deliveryDate = Carbon::parse($package[1] ? $package[1]:$package[2]);
 
                     try {
-                        $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference]);
+                        $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference, 'type', PackingListType::SHIPPING_PACKING_LIST]);
                         $container->packingLists()->detach($packingList);
                         $container->packingLists()->attach($packingList);
                     } catch (ResourceNotFoundException $exception){

From 2f59295f67c16cb06ea990a013e5d275c8e75eb2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 18:34:01 +0800
Subject: [PATCH 35/62] fix vt packing list api

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

diff --git a/routes/web.php b/routes/web.php
index 41fc64a9..84cbacd0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -140,17 +140,16 @@ Route::get('/customer/{marking}/details', function ($marking) {
 
 Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
 
-    $start = $request->input('start_date') ? \Carbon\Carbon::parse($request->input('start_date')): null;
-    $end = $request->input('end_date') ? \Carbon\Carbon::parse($request->input('end_date')): null;
-    dd((App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute($start, $end));
+    $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
+    dd($packingLists);
 
-    FetchWarehouseReceiveListFromVTPortalJob::withChain([
-        new FetchLoadedContainersFromVTPortalJob,
-        new FetchPackingListFromVTPortalJob,
-        new FetchContainersStatusUpdateFromVTPortalJob,
-        new FetchDeliveryListFromVTPortalJob,
-        new FetchOrdersFromYDPortalJob
-    ])->dispatch();
+//    FetchWarehouseReceiveListFromVTPortalJob::withChain([
+//        new FetchLoadedContainersFromVTPortalJob,
+//        new FetchPackingListFromVTPortalJob,
+//        new FetchContainersStatusUpdateFromVTPortalJob,
+//        new FetchDeliveryListFromVTPortalJob,
+//        new FetchOrdersFromYDPortalJob
+//    ])->dispatch();
 
     return redirect('orders');
 

From a88512e973594ed73eb1b8a2a7c75bd7b2845c19 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 18:36:23 +0800
Subject: [PATCH 36/62] fix vt packing list api

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

diff --git a/routes/web.php b/routes/web.php
index 84cbacd0..0756fda0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -140,7 +140,7 @@ Route::get('/customer/{marking}/details', function ($marking) {
 
 Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
 
-    $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
+    $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->detach();
     dd($packingLists);
 
 //    FetchWarehouseReceiveListFromVTPortalJob::withChain([

From 9152bae815da26c385fdfd04e6c36eac1a1d1f1c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 18:38:35 +0800
Subject: [PATCH 37/62] fix vt packing list api

---
 routes/web.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 0756fda0..7ba9a394 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -140,8 +140,10 @@ Route::get('/customer/{marking}/details', function ($marking) {
 
 Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
 
-    $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->detach();
-    dd($packingLists);
+    $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
+    dd($packingLists->each(function (\App\Models\PackingList $packingList) {
+        $packingList->containers()->detach;
+    }));
 
 //    FetchWarehouseReceiveListFromVTPortalJob::withChain([
 //        new FetchLoadedContainersFromVTPortalJob,

From 3dedb752398ec204092b73fa40661674bbccb49d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 18:38:56 +0800
Subject: [PATCH 38/62] fix vt packing list api

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

diff --git a/routes/web.php b/routes/web.php
index 7ba9a394..63fb91f1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -142,7 +142,7 @@ Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
 
     $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
     dd($packingLists->each(function (\App\Models\PackingList $packingList) {
-        $packingList->containers()->detach;
+        $packingList->containers()->detach();
     }));
 
 //    FetchWarehouseReceiveListFromVTPortalJob::withChain([

From ebfa25933dddb2ab3442b7f04054f0b9abb79432 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 18:39:34 +0800
Subject: [PATCH 39/62] fix vt packing list api

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

diff --git a/routes/web.php b/routes/web.php
index 63fb91f1..84cbacd0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -141,9 +141,7 @@ Route::get('/customer/{marking}/details', function ($marking) {
 Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
 
     $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
-    dd($packingLists->each(function (\App\Models\PackingList $packingList) {
-        $packingList->containers()->detach();
-    }));
+    dd($packingLists);
 
 //    FetchWarehouseReceiveListFromVTPortalJob::withChain([
 //        new FetchLoadedContainersFromVTPortalJob,

From c59bbd6677d9156ca0d3f20b207c8b0e8a3308ea Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 18:41:27 +0800
Subject: [PATCH 40/62] fix vt packing list api

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

diff --git a/routes/web.php b/routes/web.php
index 84cbacd0..63fb91f1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -141,7 +141,9 @@ Route::get('/customer/{marking}/details', function ($marking) {
 Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
 
     $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
-    dd($packingLists);
+    dd($packingLists->each(function (\App\Models\PackingList $packingList) {
+        $packingList->containers()->detach();
+    }));
 
 //    FetchWarehouseReceiveListFromVTPortalJob::withChain([
 //        new FetchLoadedContainersFromVTPortalJob,

From 202456289b66214ac8ef2c65619fcd7aa6443cb3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 18:46:10 +0800
Subject: [PATCH 41/62] fix vt packing list api

---
 .../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 4928f0b5..869685a2 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -240,6 +240,7 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                     try {
                         $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference, 'type', PackingListType::SHIPPING_PACKING_LIST]);
+                        dd($packingList);
                         $container->packingLists()->detach($packingList);
                         $container->packingLists()->attach($packingList);
                     } catch (ResourceNotFoundException $exception){

From 9613ed32c1b4784234e9c5907a4b963ebb590345 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 18:46:54 +0800
Subject: [PATCH 42/62] fix vt packing list 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 869685a2..a798ef65 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -239,8 +239,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $deliveryDate = Carbon::parse($package[1] ? $package[1]:$package[2]);
 
                     try {
-                        $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference, 'type', PackingListType::SHIPPING_PACKING_LIST]);
-                        dd($packingList);
+                        $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
                         $container->packingLists()->detach($packingList);
                         $container->packingLists()->attach($packingList);
                     } catch (ResourceNotFoundException $exception){

From f5b2664f5f6a92a9874f6835ab07a5cca9e8f128 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 18:56:44 +0800
Subject: [PATCH 43/62] fix vt packing list api

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index a798ef65..1f3ad20b 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -130,7 +130,6 @@ class FetchLoadedContainersFromVTPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null){
 
-        DB::beginTransaction();
         try {
             $start = $start ? $start : Carbon::today()->subDays(10);
 
@@ -240,8 +239,6 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                     try {
                         $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
-                        $container->packingLists()->detach($packingList);
-                        $container->packingLists()->attach($packingList);
                     } catch (ResourceNotFoundException $exception){
                         if ($allow_contract) {
                             $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
@@ -268,12 +265,10 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                         /** @var PackingList $packingList */
                         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-                        $container->packingLists()->detach($packingList);
-                        $container->packingLists()->attach($packingList);
-
-
                     }
 
+                    $container->packingLists()->detach($packingList);
+                    $container->packingLists()->attach($packingList);
                     $packingList->packages()->delete();
 
                     $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
@@ -303,8 +298,6 @@ class FetchLoadedContainersFromVTPortalProcessor
             Log::error($exception);
         }
 
-
-        DB::commit();
         return [];
 
     }

From 0c939dca6ffb6738bad8f0018ebcf77359306b7a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 18:59:11 +0800
Subject: [PATCH 44/62] fix vt packing list api

---
 ...hLoadedContainersFromVTPortalProcessor.php | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 1f3ad20b..e95bcb8c 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -240,26 +240,26 @@ class FetchLoadedContainersFromVTPortalProcessor
                     try {
                         $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
                     } catch (ResourceNotFoundException $exception){
-                        if ($allow_contract) {
-                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-                            $contract = $this->unityCreateContract->execute();
-                            $contractReference = $contract->hash_id;
-                            $contractObligations = $contract->contract_obligation_list;
-
-                            $this->unityActivateContract->execute($contractReference);
-
-                            $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
-
-                            $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
-                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
-
-                            $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
-
-                            $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
-                        } else {
-                            $appointee_id = 2037;
-                        }
+//                        if ($allow_contract) {
+//                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+//                            $contract = $this->unityCreateContract->execute();
+//                            $contractReference = $contract->hash_id;
+//                            $contractObligations = $contract->contract_obligation_list;
+//
+//                            $this->unityActivateContract->execute($contractReference);
+//
+//                            $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
+//
+//                            $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
+//                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
+//
+//                            $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
+//                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+//
+//                            $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
+//                        } else {
+//                            $appointee_id = 2037;
+//                        }
 
                         $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
 

From b4f816b90d756e6c754c80974c9c7d722b7fb8ec Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 19:00:00 +0800
Subject: [PATCH 45/62] fix vt packing list api

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index e95bcb8c..0b009da3 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -240,8 +240,8 @@ class FetchLoadedContainersFromVTPortalProcessor
                     try {
                         $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
                     } catch (ResourceNotFoundException $exception){
-//                        if ($allow_contract) {
-//                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+                        if ($allow_contract) {
+                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
 //                            $contract = $this->unityCreateContract->execute();
 //                            $contractReference = $contract->hash_id;
 //                            $contractObligations = $contract->contract_obligation_list;
@@ -257,9 +257,9 @@ class FetchLoadedContainersFromVTPortalProcessor
 //                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
 //
 //                            $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
-//                        } else {
-//                            $appointee_id = 2037;
-//                        }
+                        } else {
+                            $appointee_id = 2037;
+                        }
 
                         $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
 

From 582534849ac16df4a2eeca9d80a972466a593ea0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 19:00:55 +0800
Subject: [PATCH 46/62] fix vt packing list 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 0b009da3..fcdf244e 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -261,7 +261,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                             $appointee_id = 2037;
                         }
 
-                        $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
+                        $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, null);
 
                         /** @var PackingList $packingList */
                         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);

From 6caa68cfa4034499f06fe6ff991eaf41f40a146c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 19:21:55 +0800
Subject: [PATCH 47/62] fix vt packing list api

---
 app/Console/Commands/CurlVTCommand.php | 3 ---
 app/Console/Kernel.php                 | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/Console/Commands/CurlVTCommand.php b/app/Console/Commands/CurlVTCommand.php
index 2fa093e4..c0fc5b5d 100644
--- a/app/Console/Commands/CurlVTCommand.php
+++ b/app/Console/Commands/CurlVTCommand.php
@@ -49,9 +49,6 @@ class CurlVTCommand extends Command
     {
         return FetchWarehouseReceiveListFromVTPortalJob::withChain([
             new FetchLoadedContainersFromVTPortalJob,
-            new FetchPackingListFromVTPortalJob,
-            new FetchContainersStatusUpdateFromVTPortalJob,
-            new FetchDeliveryListFromVTPortalJob
         ])->dispatch();
     }
 }
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 885b78cc..5fc88d3c 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -28,10 +28,10 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
 
-//        $schedule->command('command:curlVTCommand')
-//            ->cron('0 9-18/3 * * *')
-//            ->withoutOverlapping()
-//            ->appendOutputTo (storage_path().'/logs/curlvt.log');
+        $schedule->command('command:curlVTCommand')
+            ->cron('0 8 * * *')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlvt.log');
 
         $schedule->command('command:curlYdOrderListCommand')
             ->cron('30 9-18/3 * * *')

From 2be24c4dace6837690dfe6abda72356602a66b45 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 19 Jul 2022 19:24:05 +0800
Subject: [PATCH 48/62] fix vt packing list api

---
 ...etchLoadedContainersFromVTPortalProcessor.php |  2 +-
 ...WarehouseReceiveListFromVTPortalProcessor.php |  2 +-
 routes/web.php                                   | 16 ++++------------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index fcdf244e..bb4046bd 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -131,7 +131,7 @@ class FetchLoadedContainersFromVTPortalProcessor
     public function execute(?Carbon $start = null, ?Carbon $end = null){
 
         try {
-            $start = $start ? $start : Carbon::today()->subDays(10);
+            $start = $start ? $start : Carbon::today()->subDays(5);
 
             $startLimit = Carbon::parse('11-08-2021');
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 78f86e2d..4709b2e1 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -116,7 +116,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
         try {
 
-            $start = $start ? $start : Carbon::today()->subMonth();
+            $start = $start ? $start : Carbon::today()->subDays(5);
 
             $startLimit = Carbon::parse('11-08-2021');
 
diff --git a/routes/web.php b/routes/web.php
index 63fb91f1..8e498a30 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -140,18 +140,10 @@ Route::get('/customer/{marking}/details', function ($marking) {
 
 Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
 
-    $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
-    dd($packingLists->each(function (\App\Models\PackingList $packingList) {
-        $packingList->containers()->detach();
-    }));
-
-//    FetchWarehouseReceiveListFromVTPortalJob::withChain([
-//        new FetchLoadedContainersFromVTPortalJob,
-//        new FetchPackingListFromVTPortalJob,
-//        new FetchContainersStatusUpdateFromVTPortalJob,
-//        new FetchDeliveryListFromVTPortalJob,
-//        new FetchOrdersFromYDPortalJob
-//    ])->dispatch();
+    FetchWarehouseReceiveListFromVTPortalJob::withChain([
+        new FetchLoadedContainersFromVTPortalJob,
+        new FetchOrdersFromYDPortalJob
+    ])->dispatch();
 
     return redirect('orders');
 

From d4b85f29529331b3b9484f6af86b7b4c3ff3179f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 21 Jul 2022 10:43:40 +0800
Subject: [PATCH 49/62] fix vt packing list api

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

diff --git a/routes/web.php b/routes/web.php
index 8e498a30..7d9a46af 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -139,7 +139,11 @@ Route::get('/customer/{marking}/details', function ($marking) {
 })->name('customer.profile.details');
 
 Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
-
+    $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
+    dd($packingLists);
+    $packingLists->each(function (\App\Models\PackingList $packingList) {
+        $packingList->containers()->detach();
+    });
     FetchWarehouseReceiveListFromVTPortalJob::withChain([
         new FetchLoadedContainersFromVTPortalJob,
         new FetchOrdersFromYDPortalJob

From ac839c5835619d275f6cb2f3a48843260b029fe1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 21 Jul 2022 10:48:38 +0800
Subject: [PATCH 50/62] break address words in packing list component

---
 .../containers/elements/PackingListComponent.vue       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
index 26e6abf6..01c9a63b 100644
--- a/resources/assets/vue/components/containers/elements/PackingListComponent.vue
+++ b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
@@ -13,13 +13,13 @@
         <div class="col-1">{{ (parseFloat(cbm) + parseFloat(overweight)).toFixed(3)}}</div>
         <div class="col-1 bold text-center" :class="{'text-danger': item.status === 5, 'text-success': item.status !== 5}">{{item.transport ? 'Delivery' : item.status === 5 ? 'On Hold' : 'Release'}}</div>
         <div class="col-3">
-            <div v-if="item.order" style="overflow-wrap: break-word;">
+            <div v-if="item.order" style="word-break: break-word;">
                 {{item.order.address.contact ? item.order.address.contact.reference+' '+item.order.address.contact.phone : ''}}<br>
                 {{item.order.address.street_one+' '+(item.order.address.street_two ? item.order.address.street_two : '')+', '+ item.order.address.district.name+', '+item.order.address.post_code+' '+item.order.address.state.name+', '+item.order.address.country.name}}<br>{{item.order.address.remark ? item.order.address.remark.content: ''}}
-                <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="defineLocation">Define Location</div>
-                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="defineLocation">
-                    <declare-postcode-area-form-component :data="item.order.address.post_code"></declare-postcode-area-form-component>
-                </modal-component>
+                <!--<div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="defineLocation">Define Location</div>-->
+                <!--<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="defineLocation">-->
+                    <!--<declare-postcode-area-form-component :data="item.order.address.post_code"></declare-postcode-area-form-component>-->
+                <!--</modal-component>-->
             </div>
         </div>
         <div class="col">

From c0383243393055ff71ff26cd375a79f4eb47cab8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 21 Jul 2022 11:00:32 +0800
Subject: [PATCH 51/62] fix vt wrong delivery date

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index bb4046bd..b29dc77b 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -235,7 +235,7 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                     $packingListReference = $packingList[3];
                     $package = $packingList;
-                    $deliveryDate = Carbon::parse($package[1] ? $package[1]:$package[2]);
+                    $deliveryDate = $package[1] ? Carbon::parse($package[1]) : null;
 
                     try {
                         $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
@@ -277,6 +277,8 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $packageObject = new PackageObject(PackageType::CARTON, $package[8], $package[21], $package[22], $package[20], 0, $package[11], ApprovalStatus::APPROVED);
                     $this->createPackageProcessor->execute($packageObject, $packingList);
                     if($containerStatus === 'Unstuffing'){
+                        $packingList->transports()->delete();
+
                         if($deliveryDate) {
 //                            && !$packingList->transports()->exists()
                             $packingList->status = ApprovalStatus::COMPLETED;
@@ -286,8 +288,6 @@ class FetchLoadedContainersFromVTPortalProcessor
                             /** @var Transport $transport */
                             $transport = $this->createsTransport->execute($transportObject, $packingList);
                             $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
-                        } else {
-                            $packingList->transports()->delete();
                         }
                     }
 

From 0616ee0bac1907318cc71bf90f7e3c219ab358c1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 22 Jul 2022 14:08:57 +0800
Subject: [PATCH 52/62] show more data for unclaimed packages

---
 .../elements/UnclaimedPackinglistComponent.vue   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
index ab09f62a..52f4ea79 100644
--- a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
+++ b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
@@ -22,8 +22,20 @@
                                     <p class="no-margin all-caps fs-10 light">Arrival Date</p>
                                     <p class="no-margin text-success bold">{{data.transport ? data.transport.drop_date : 'n/a'}}</p>
                                 </div>
-                                <div class="col text-right" v-if="$store.getters.isSuperAdmin">
-                                    <button type="button" class="btn b-rad-none btn-primary fs-11 requestModal" data-type="claimPackingList">Claim</button>
+                            </div>
+                            <div class="row align-items-center">
+                                <div class="col-auto">
+                                    <p class="no-margin all-caps fs-10 light">Tracking Reference</p>
+                                    <p class="no-margin text-success bold">{{data.transport ? data.transport.tracking_number : 'n/a'}}</p>
+                                </div>
+                                <div class="col-auto">
+                                    <p class="no-margin all-caps fs-10 light">Description</p>
+                                    <p class="no-margin text-success bold">{{data.packages ? data.packages[0].description: 'n/a'}}</p>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col" v-if="$store.getters.isSuperAdmin">
+                                    <button type="button" class="btn btn-block b-rad-none btn-primary fs-11 requestModal" data-type="claimPackingList">Claim</button>
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="claimPackingList">
                                         <claim-packinglist-form-component :data="data.id"></claim-packinglist-form-component>
                                     </modal-component>

From 2bb6816794ffedfd2959b39161031cb9ffcf9b45 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 22 Jul 2022 14:15:26 +0800
Subject: [PATCH 53/62] delete unclaimed packing list button

---
 .../UnclaimedPackinglistComponent.vue         | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
index 52f4ea79..81e33a81 100644
--- a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
+++ b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
@@ -33,8 +33,35 @@
                                     <p class="no-margin text-success bold">{{data.packages ? data.packages[0].description: 'n/a'}}</p>
                                 </div>
                             </div>
-                            <div class="row">
-                                <div class="col" v-if="$store.getters.isSuperAdmin">
+                            <div class="row" v-if="$store.getters.isSuperAdmin">
+                                <div class="col-auto">
+                                    <button type="button" class="btn btn-block b-rad-none btn-danger fs-11 requestModal" data-type="deletePackingList">Delete</button>
+                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deletePackingList">
+                                        <div class="row">
+                                            <div class="col">
+                                                <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+                                                <div class="row justify-content-center" v-show="!isLoading">
+                                                    <div class="col">
+                                                        <div class="row m-b-20">
+                                                            <div class="col">
+                                                                <h3 class="all-caps">Are you sure you want to delete this packing list?</h3>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row">
+                                                            <div class="col p-r-5">
+                                                                <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                                                            </div>
+                                                            <div class="col p-l-5">
+                                                                <div class="btn btn-sm btn-danger btn-block b-rad-none" data-dismiss="modal" @click="submit(route('api.packing_list.delete', item.id), 'delete', 'unclaimedPackingListSection', true, true)">Confirm</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </modal-component>
+                                </div>
+                                <div class="col">
                                     <button type="button" class="btn btn-block b-rad-none btn-primary fs-11 requestModal" data-type="claimPackingList">Claim</button>
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="claimPackingList">
                                         <claim-packinglist-form-component :data="data.id"></claim-packinglist-form-component>

From f727389add804b449cc601fc3a7cec798e67f3b0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 22 Jul 2022 14:18:18 +0800
Subject: [PATCH 54/62] delete unclaimed packing list button

---
 .../orders/elements/UnclaimedPackinglistComponent.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
index 81e33a81..6ffcb969 100644
--- a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
+++ b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
@@ -35,7 +35,7 @@
                             </div>
                             <div class="row" v-if="$store.getters.isSuperAdmin">
                                 <div class="col-auto">
-                                    <button type="button" class="btn btn-block b-rad-none btn-danger fs-11 requestModal" data-type="deletePackingList">Delete</button>
+                                    <button type="button" class="btn btn-block b-rad-none btn-danger fs-11 requestModal" data-type="deletePackingList"><i class="fa fa-times"></i></button>
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deletePackingList">
                                         <div class="row">
                                             <div class="col">

From 039a048150c8bea9c1d6b91faa135ce446a78a5f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 22 Jul 2022 14:18:54 +0800
Subject: [PATCH 55/62] delete unclaimed packing list button

---
 .../orders/elements/UnclaimedPackinglistComponent.vue     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
index 6ffcb969..fd156c6c 100644
--- a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
+++ b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
@@ -4,14 +4,6 @@
             <div class="row">
                 <div class="col">
                     <div class="row align-items-center p-t-5 p-b-5">
-                        <div class="col-auto p-r-0">
-                            <div class="padding-5 lh-25 btn-rounded bg-white" v-if="data.type === 0">
-                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="30" height="30" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M21.5,21.5v129h129v-129zM25.8,25.8h45.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15h21.5c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15h45.15v120.4h-45.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15c-1.18418,0 -2.15,0.96582 -2.15,2.15h-21.5c0,-1.18418 -0.96582,-2.15 -2.15,-2.15c-1.18418,0 -2.15,0.96582 -2.15,2.15h-45.15zM73.1,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM79.55,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM92.45,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM72.025,49.45c-1.15898,-0.0168 -2.24238,0.59629 -2.83027,1.5957c-0.58789,1.00781 -0.58789,2.25078 0,3.25859c0.58789,0.99941 1.67129,1.6125 2.83027,1.5957h27.95c1.15899,0.0168 2.24238,-0.59629 2.83027,-1.5957c0.58789,-1.00781 0.58789,-2.25078 0,-3.25859c-0.58789,-0.99941 -1.67129,-1.6125 -2.83027,-1.5957zM73.1,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM79.55,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM92.45,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
-                            </div>
-                            <div class="icon-thumbnail padding-5 lh-25 btn-rounded bg-master-lightest m-r-0" v-if="data.type === 1">
-                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="30" height="30" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M60.2252,36.52061c-0.12239,-0.00062 -0.24461,0.00922 -0.36533,0.02939h-25.45986c-0.98721,-0.00039 -1.84785,0.6715 -2.08701,1.6293c-5.73407,22.93414 -11.46597,45.86604 -17.2,68.8c-0.00627,0.03067 -0.01187,0.06147 -0.0168,0.09238c-0.00768,0.03064 -0.01468,0.06144 -0.021,0.09238c-0.00324,0.02514 -0.00604,0.05034 -0.0084,0.07559c-0.00628,0.05441 -0.01049,0.10904 -0.0126,0.16377c-0.00212,0.03216 -0.00352,0.06436 -0.0042,0.09658v27.95c0.00012,1.18736 0.96264,2.14988 2.15,2.15h17.2c0.0056,0.00002 0.0112,0.00002 0.0168,0c0.06595,-0.00117 0.1318,-0.00537 0.19736,-0.0126c0.06192,-0.00572 0.12357,-0.01413 0.18477,-0.0252c0.00981,-0.00133 0.01961,-0.00273 0.02939,-0.0042c0.0056,-0.00138 0.0112,-0.00278 0.0168,-0.0042c0.06372,-0.01392 0.12677,-0.03074 0.18897,-0.05039c0.06684,-0.01919 0.1327,-0.04161 0.19736,-0.06719c0.0014,-0.0014 0.0028,-0.0028 0.0042,-0.0042c0.0014,0 0.0028,0 0.0042,0c0.06454,-0.02906 0.12761,-0.0613 0.18897,-0.09658c0.05014,-0.02743 0.09917,-0.05685 0.14697,-0.08818c0.01267,-0.00687 0.02527,-0.01387 0.03779,-0.021c0.01839,-0.01232 0.03659,-0.02491 0.05459,-0.03779c0.04025,-0.02942 0.07947,-0.06024 0.11758,-0.09238c0.00422,-0.00418 0.00842,-0.00838 0.0126,-0.0126c0.04961,-0.0426 0.09725,-0.08744 0.14277,-0.13438c0.05032,-0.05215 0.09797,-0.10681 0.14277,-0.16377c0.03382,-0.04216 0.06604,-0.08559 0.09658,-0.13018c0.00996,-0.01388 0.01976,-0.02788 0.02939,-0.04199c0.01147,-0.01803 0.02267,-0.03623 0.03359,-0.05459c0.02537,-0.04394 0.04918,-0.08876 0.07139,-0.13438c0.00282,-0.00559 0.00562,-0.01119 0.0084,-0.0168c0.02935,-0.05894 0.05597,-0.11919 0.07979,-0.18057c0.02213,-0.05791 0.04174,-0.11676 0.05879,-0.17637c0.00285,-0.00838 0.00565,-0.01678 0.0084,-0.0252c0.00592,-0.02091 0.01152,-0.04191 0.0168,-0.06299c0.00762,-0.02924 0.01462,-0.05864 0.021,-0.08818l0.0126,-0.05879c0.00001,-0.0028 0.00001,-0.0056 0,-0.0084l2.6707,-13.25693h93.61738l2.6833,13.31572c-0.00001,0.0042 -0.00001,0.0084 0,0.0126c0.02839,0.13961 0.07059,0.27606 0.12598,0.40732c0.05578,0.13254 0.12471,0.25915 0.20576,0.37793c0.0406,0.0581 0.08404,0.11416 0.13018,0.16797c0,0.0014 0,0.0028 0,0.0042c0.09202,0.10932 0.19471,0.2092 0.30654,0.29814c0.0014,0 0.0028,0 0.0042,0c0.11106,0.08859 0.23062,0.16595 0.35693,0.23096c0.0014,0 0.0028,0 0.0042,0c0.0629,0.03256 0.12736,0.06199 0.19316,0.08818c0.0014,0 0.0028,0 0.0042,0c0.06466,0.02557 0.13053,0.048 0.19736,0.06719c0.0014,0 0.0028,0 0.0042,0c0.06772,0.02017 0.13639,0.03698 0.20576,0.05039c0.0014,0 0.0028,0 0.0042,0c0.06953,0.01184 0.1396,0.02025 0.20996,0.0252c0.0014,0 0.0028,0 0.0042,0c0.0028,0.00001 0.0056,0.00001 0.0084,0c0.04753,0.00298 0.09515,0.00438 0.14277,0.0042c0.0196,0.00027 0.03919,0.00027 0.05879,0h17.14121c1.18736,-0.00012 2.14988,-0.96264 2.15,-2.15v-27.95c0.00002,-0.0056 0.00002,-0.0112 0,-0.0168c-0.00117,-0.06595 -0.00537,-0.1318 -0.0126,-0.19736c-0.00479,-0.05624 -0.0118,-0.11228 -0.021,-0.16797c-0.00263,-0.01543 -0.00543,-0.03083 -0.0084,-0.04619c-0.00135,-0.00841 -0.00275,-0.01681 -0.0042,-0.0252c-0.00524,-0.02248 -0.01084,-0.04488 -0.0168,-0.06719c-5.73403,-22.93396 -11.46593,-45.86586 -17.2,-68.8c-0.23916,-0.9578 -1.09981,-1.62969 -2.08701,-1.6293h-25.43887c-0.14971,-0.02579 -0.30173,-0.03564 -0.45352,-0.02939c-0.0873,0.0045 -0.17424,0.01431 -0.26035,0.02939h-25.11553c-0.12072,-0.02018 -0.24294,-0.03001 -0.36533,-0.02939c-0.10416,0.00226 -0.20801,0.01208 -0.31074,0.02939h-25.11133c-0.1055,-0.01772 -0.21218,-0.02755 -0.31914,-0.02939zM36.07969,40.85h21.68057l-0.50811,4.03125l-0.5417,4.3c-0.04143,0.31452 -0.01274,0.6343 0.08399,0.93643l-0.06299,0.34434l1.31855,1.40674l0.74326,0.13437l1.72168,-0.86084l0.07559,-0.42412c0.21105,-0.2952 0.34395,-0.63901 0.38633,-0.99941l0.5417,-4.3l0.57529,-4.56875h21.75615v4.3v4.3c-0.01097,0.77537 0.39641,1.49657 1.06613,1.88746c0.66972,0.39088 1.49803,0.39088 2.16775,0c0.66972,-0.39088 1.07709,-1.11209 1.06613,-1.88746v-4.3v-4.3h21.75615l0.55849,4.41758c0.00381,0.05057 0.00942,0.10099 0.0168,0.15117l0.5417,4.3c0.02311,0.19927 0.074,0.39433 0.15117,0.57949l-0.02939,0.16377l0.37793,0.40732c0.05013,0.05882 0.1034,0.11489 0.15957,0.16797l0.77686,0.83145l0.74746,0.13437l1.72168,-0.86084l0.11338,-0.62988c0.22378,-0.40546 0.31068,-0.87233 0.24776,-1.33115l-0.5417,-4.3l-0.50811,-4.03125h21.68057c5.37556,21.5005 10.74946,42.9994 16.125,64.5h-29.68428l-0.57529,-4.56875c-0.12489,-1.12257 -1.09704,-1.95716 -2.22559,-1.91064c-0.60664,0.02496 -1.17444,0.30523 -1.56321,0.77158c-0.38877,0.46636 -0.56225,1.07534 -0.47761,1.67656l0.50811,4.03125h-29.87744v-4.3c0.00796,-0.58115 -0.21968,-1.14076 -0.63105,-1.55134c-0.41137,-0.41057 -0.97142,-0.63714 -1.55255,-0.62806c-1.18576,0.01854 -2.13264,0.9936 -2.11641,2.17939v4.3h-29.87744l0.50811,-4.03125c0.08573,-0.61255 -0.09647,-1.23235 -0.50006,-1.70106c-0.40359,-0.46871 -0.98946,-0.74092 -1.60795,-0.74709c-1.10305,-0.01106 -2.03555,0.8144 -2.1584,1.91064l-0.57529,4.56875h-29.68428c5.37554,-21.5006 10.74944,-42.9995 16.125,-64.5zM86,55.9l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM57.71826,56.23594l-1.72168,0.86504l-0.34014,1.89385l1.31855,1.40674l0.74326,0.13437l1.72588,-0.86084l0.33594,-1.89805l-1.31436,-1.40674zM114.28174,56.23594l-1.72588,0.86504l-0.33594,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86084l0.34014,-1.89805l-1.31855,-1.40674zM86,64.5l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM56.64746,64.76875l-1.72588,0.86504l-0.33594,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86084l0.34014,-1.89805l-1.31856,-1.40674zM115.35254,64.76875l-1.72168,0.86504l-0.34014,1.89385l1.31856,1.40674l0.74326,0.13437l1.72588,-0.86084l0.33594,-1.89805l-1.31436,-1.40674zM86,73.1l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM55.57246,73.30156l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86084l0.34014,-1.89805l-1.31856,-1.40674zM116.42754,73.30156l-1.72168,0.86504l-0.34014,1.89385l1.31856,1.40674l0.74326,0.13438l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM86,81.7l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM54.49746,81.83437l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM117.50254,81.83437l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM86,90.3l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM53.42246,90.36719l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM118.57754,90.36719l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM19.35,109.65h133.3v23.65h-12.9v-12.9c-0.00012,-1.18736 -0.96264,-2.14988 -2.15,-2.15h-103.2c-1.18736,0.00012 -2.14988,0.96264 -2.15,2.15v12.9h-12.9z"></path></g></g></svg>
-                            </div>
-                        </div>
                         <div class="col">
                             <div class="row align-items-center">
                                 <div class="col-auto">

From b9ddd42f827e5ffe5657a8488cc36602b99fb8dc Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 22 Jul 2022 14:21:43 +0800
Subject: [PATCH 56/62] delete unclaimed packing list button

---
 .../elements/UnclaimedPackinglistComponent.vue       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
index fd156c6c..6c89bb61 100644
--- a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
+++ b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
@@ -8,26 +8,26 @@
                             <div class="row align-items-center">
                                 <div class="col-auto">
                                     <p class="no-margin all-caps fs-10 light">Reference</p>
-                                    <p class="no-margin text-success bold">{{data.reference ? data.reference : 'n/a'}}</p>
+                                    <p class="no-margin bold">{{data.reference ? data.reference : 'n/a'}}</p>
                                 </div>
                                 <div class="col-auto">
                                     <p class="no-margin all-caps fs-10 light">Arrival Date</p>
-                                    <p class="no-margin text-success bold">{{data.transport ? data.transport.drop_date : 'n/a'}}</p>
+                                    <p class="no-margin bold">{{data.transport ? data.transport.drop_date : 'n/a'}}</p>
                                 </div>
                             </div>
                             <div class="row align-items-center">
                                 <div class="col-auto">
                                     <p class="no-margin all-caps fs-10 light">Tracking Reference</p>
-                                    <p class="no-margin text-success bold">{{data.transport ? data.transport.tracking_number : 'n/a'}}</p>
+                                    <p class="no-margin bold">{{data.transport ? data.transport.tracking_number : 'n/a'}}</p>
                                 </div>
                                 <div class="col-auto">
                                     <p class="no-margin all-caps fs-10 light">Description</p>
-                                    <p class="no-margin text-success bold">{{data.packages ? data.packages[0].description: 'n/a'}}</p>
+                                    <p class="no-margin bold">{{data.packages ? data.packages[0].description: 'n/a'}}</p>
                                 </div>
                             </div>
                             <div class="row" v-if="$store.getters.isSuperAdmin">
                                 <div class="col-auto">
-                                    <button type="button" class="btn btn-block b-rad-none btn-danger fs-11 requestModal" data-type="deletePackingList"><i class="fa fa-times"></i></button>
+                                    <button type="button" class="btn btn-sm b-rad-none btn-outline-danger fs-11 requestModal" data-type="deletePackingList"><i class="fa fa-times"></i></button>
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deletePackingList">
                                         <div class="row">
                                             <div class="col">
@@ -54,7 +54,7 @@
                                     </modal-component>
                                 </div>
                                 <div class="col">
-                                    <button type="button" class="btn btn-block b-rad-none btn-primary fs-11 requestModal" data-type="claimPackingList">Claim</button>
+                                    <button type="button" class="btn btn-sm btn-block b-rad-none btn-success fs-11 requestModal" data-type="claimPackingList">Claim</button>
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="claimPackingList">
                                         <claim-packinglist-form-component :data="data.id"></claim-packinglist-form-component>
                                     </modal-component>

From b57dbe77be9a5b07fcdaaa619c595ff9bfa85808 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 22 Jul 2022 14:22:15 +0800
Subject: [PATCH 57/62] delete unclaimed packing list button

---
 .../orders/elements/UnclaimedPackinglistComponent.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
index 6c89bb61..b07fad9e 100644
--- a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
+++ b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="row parentContainer">
+    <div class="row parentContainer m-b-15">
         <div class="col">
             <div class="row">
                 <div class="col">

From 6b641d44f2f981cdf2d5331d24975770f88178b4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 22 Jul 2022 18:56:34 +0800
Subject: [PATCH 58/62] fix exports pending delivery lists

---
 .../Exports/Services/ExportsPendingArrangementDeliveryList.php | 3 ++-
 .../orders/elements/UnclaimedPackinglistComponent.vue          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php b/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
index 65908390..41ec598c 100644
--- a/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
+++ b/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
@@ -57,7 +57,8 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
         $container = $packingList->containers()->first();
         $ContainerTransport = $container->transports()->first();
         $order = $packingList->owner;
-        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+        $inviter = $order->companyModule->inviters()->withPivot('invitee_reference');
+        $marking = $inviter ? $inviter->first()->pivot->invitee_reference : 'Unclaimed';
         $address = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
         $contacts = $address->contacts->first() ? $address->contacts->first(): '';
         $originalPackingList = $packingList->owner instanceof PackingList ? $packingList->owner : $packingList;
diff --git a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
index b07fad9e..42c2a411 100644
--- a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
+++ b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
@@ -44,7 +44,7 @@
                                                                 <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
                                                             </div>
                                                             <div class="col p-l-5">
-                                                                <div class="btn btn-sm btn-danger btn-block b-rad-none" data-dismiss="modal" @click="submit(route('api.packing_list.delete', item.id), 'delete', 'unclaimedPackingListSection', true, true)">Confirm</div>
+                                                                <div class="btn btn-sm btn-danger btn-block b-rad-none" data-dismiss="modal" @click="submit(route('api.packing_list.delete', item.id), 'delete', 'unclaimedPackingList', true, true)">Confirm</div>
                                                             </div>
                                                         </div>
                                                     </div>

From 987418d51aa477f1087ab6161fcb50226e6344ff Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 22 Jul 2022 18:57:44 +0800
Subject: [PATCH 59/62] fix exports pending delivery lists

---
 .../orders/elements/UnclaimedPackinglistComponent.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
index 42c2a411..b07fad9e 100644
--- a/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
+++ b/resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
@@ -44,7 +44,7 @@
                                                                 <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
                                                             </div>
                                                             <div class="col p-l-5">
-                                                                <div class="btn btn-sm btn-danger btn-block b-rad-none" data-dismiss="modal" @click="submit(route('api.packing_list.delete', item.id), 'delete', 'unclaimedPackingList', true, true)">Confirm</div>
+                                                                <div class="btn btn-sm btn-danger btn-block b-rad-none" data-dismiss="modal" @click="submit(route('api.packing_list.delete', item.id), 'delete', 'unclaimedPackingListSection', true, true)">Confirm</div>
                                                             </div>
                                                         </div>
                                                     </div>

From ec70a390d0a18f57ac27ebd44d453c645cdc329a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 22 Jul 2022 19:04:07 +0800
Subject: [PATCH 60/62] fix exports pending delivery lists

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

diff --git a/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php b/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
index 41ec598c..68cfa99f 100644
--- a/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
+++ b/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
@@ -57,8 +57,8 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
         $container = $packingList->containers()->first();
         $ContainerTransport = $container->transports()->first();
         $order = $packingList->owner;
-        $inviter = $order->companyModule->inviters()->withPivot('invitee_reference');
-        $marking = $inviter ? $inviter->first()->pivot->invitee_reference : 'Unclaimed';
+        $inviter = $order->companyModule->inviters()->withPivot('invitee_reference')->first();
+        $marking = $inviter ? $inviter->pivot->invitee_reference : 'Unclaimed';
         $address = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
         $contacts = $address->contacts->first() ? $address->contacts->first(): '';
         $originalPackingList = $packingList->owner instanceof PackingList ? $packingList->owner : $packingList;

From ca669f6f0a965dab1ea83dd46d9a07e3a63051a2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 22 Jul 2022 19:15:38 +0800
Subject: [PATCH 61/62] fix exports pending delivery lists

---
 .../Exports/Services/ExportsPendingArrangementDeliveryList.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php b/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
index 68cfa99f..d7a33554 100644
--- a/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
+++ b/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
@@ -57,7 +57,7 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
         $container = $packingList->containers()->first();
         $ContainerTransport = $container->transports()->first();
         $order = $packingList->owner;
-        $inviter = $order->companyModule->inviters()->withPivot('invitee_reference')->first();
+        $inviter = $order->companyModule ? $order->companyModule->inviters()->withPivot('invitee_reference')->first() : null;
         $marking = $inviter ? $inviter->pivot->invitee_reference : 'Unclaimed';
         $address = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
         $contacts = $address->contacts->first() ? $address->contacts->first(): '';

From 55882aaacbe5971ab37bc76c78558c285049182e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 22 Jul 2022 19:17:18 +0800
Subject: [PATCH 62/62] delete packinglist when deleting warehouselist

---
 .../ControllersLogic/DeletePackingListLogic.php            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/DeletePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/DeletePackingListLogic.php
index 850f196b..09f6453f 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/DeletePackingListLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/DeletePackingListLogic.php
@@ -7,6 +7,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\DeletesPackingList;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanDeletePackingList;
+use App\Classes\ValueObjects\Constants\PackingListType;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -58,9 +59,11 @@ class DeletePackingListLogic extends AbstractControllerLogic
 
             $this->canDeletePackingList->passes();
 
-            $query = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
+            $warehouseList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
+            $packingList = $this->fetchesPackingList->execute(['reference' => $warehouseList->reference, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
 
-            $this->deletesPackingList->execute($query);
+            $this->deletesPackingList->execute($warehouseList);
+            $this->deletesPackingList->execute($packingList);
 
             return $this->response([]);