From 7e4b5d852845d52e65f041df36b0ebc5fc660754 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 2 Mar 2022 11:20:07 +0800
Subject: [PATCH 01/11] update yiwu warehouse west malaysia notice

---
 .../Modules/Orders/ControllersLogic/CreateOrderLogic.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
index 70aca682..1cabb5e1 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
@@ -69,7 +69,7 @@ class CreateOrderLogic extends AbstractControllerLogic
         $originWarehouse = $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? $this->fetchesCompanyModule->execute(['reference' => in_array($company->id, [2376]) ? WarehouseReferences::VT_GUANG_ZHOU : WarehouseReferences::YD_GUANG_ZHOU]) : $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_YIWU]);
 
         if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
-            throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment due to the chinese new year\'s holiday. you can select our Guangzhou warehouse as an alternative.');
+            throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment. you can select our Guangzhou warehouse as an alternative.');
         }
 
         $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute());

From 251d44912f408b299239f6b13e8974b384e2d4c3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 2 Mar 2022 20:31:05 +0800
Subject: [PATCH 02/11] show estimated parcel cbm

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

diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 08218b96..6563983f 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -26,7 +26,7 @@
                             <p class="no-margin all-caps fs-10 light">Qty</p>
                             <p class="no-margin bold">{{item.quantity}}</p>
                         </div>
-                        <div class="col-auto" v-if="!$store.getters.isAdmin">
+                        <div class="col-auto">
                             <p class="no-margin all-caps fs-10 light">Est. CBM</p>
                             <p class="no-margin">{{((parseFloat(item.cbm) * 1000) / 1000).toFixed(3)}}</p>
                         </div>

From e83206ceab3f0cdc651960360b7a025c1a7cf190 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 2 Mar 2022 20:35:03 +0800
Subject: [PATCH 03/11] show estimated parcel cbm

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

diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index 4c72ebe0..58e96926 100644
--- a/resources/views/pages/warehouse_list.blade.php
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.base_portal')
 @section('inner_content')
     <div class="row">
-        <div class="col-4">
+        <div class="col-5">
             <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 1, packing_list_status: 2, per_page: 20, order_by: {column: 'arrival_date', DESC: true}, with_arrival_date: true}">
                 <template slot="list" slot-scope="{data}">
                     <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>

From 5356098cc418e8087b72678fa65995c2ff66c481 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 2 Mar 2022 20:37:51 +0800
Subject: [PATCH 04/11] show estimated parcel cbm

---
 .../vue/components/orders/elements/ParcelComponent.vue   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 6563983f..ad9902aa 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -18,6 +18,11 @@
                 </div>
                 <div class="col">
                     <div class="row align-items-center">
+                        <div class="col">
+                            <div class="row">
+
+                            </div>
+                        </div>
                         <div class="col-auto">
                             <p class="no-margin all-caps fs-10 light">Arrival Date</p>
                             <p class="no-margin text-success bold">{{item.transport ? item.transport.drop_date : 'n/a'}}</p>
@@ -30,11 +35,11 @@
                             <p class="no-margin all-caps fs-10 light">Est. CBM</p>
                             <p class="no-margin">{{((parseFloat(item.cbm) * 1000) / 1000).toFixed(3)}}</p>
                         </div>
-                        <div class="col-auto" v-if="$store.getters.isAdmin">
+                        <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>
                         </div>
-                        <div class="col text-right">
+                        <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>
                         </div>
                     </div>

From bc1a7c04db97b17ea594556f94193ab50f0d5b46 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 2 Mar 2022 20:39:02 +0800
Subject: [PATCH 05/11] show estimated parcel cbm

---
 .../vue/components/orders/elements/ParcelComponent.vue       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index ad9902aa..3c4f98b8 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -18,11 +18,6 @@
                 </div>
                 <div class="col">
                     <div class="row align-items-center">
-                        <div class="col">
-                            <div class="row">
-
-                            </div>
-                        </div>
                         <div class="col-auto">
                             <p class="no-margin all-caps fs-10 light">Arrival Date</p>
                             <p class="no-margin text-success bold">{{item.transport ? item.transport.drop_date : 'n/a'}}</p>

From ede42316765a9a400ec802029b4b2e9bd4c113a3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 2 Mar 2022 20:40:09 +0800
Subject: [PATCH 06/11] show estimated parcel cbm

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

diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 3c4f98b8..a2001bd8 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -2,7 +2,7 @@
     <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="col-auto p-r-0 hide">
                     <div class="padding-5 lh-25 btn-rounded bg-white" v-if="item.type === 0">
                         <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
                              width="30" height="30"

From 7426d6dff260788ad57fa32fce6165046f1f5386 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 2 Mar 2022 20:41:51 +0800
Subject: [PATCH 07/11] show estimated parcel cbm

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

diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index a2001bd8..b8ecd436 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -22,7 +22,7 @@
                             <p class="no-margin all-caps fs-10 light">Arrival Date</p>
                             <p class="no-margin text-success bold">{{item.transport ? item.transport.drop_date : 'n/a'}}</p>
                         </div>
-                        <div class="col-auto text-center">
+                        <div class="col-auto p-l-0 p-r-0 text-center">
                             <p class="no-margin all-caps fs-10 light">Qty</p>
                             <p class="no-margin bold">{{item.quantity}}</p>
                         </div>

From 5201874111e56509005d00c215bad1295657ca8b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 2 Mar 2022 20:43:22 +0800
Subject: [PATCH 08/11] show estimated parcel cbm

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

diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index b8ecd436..01299ad1 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -2,7 +2,7 @@
     <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 hide">
+                <div class="col-auto p-r-0" v-if="!$store.getters.isAdmin">
                     <div class="padding-5 lh-25 btn-rounded bg-white" v-if="item.type === 0">
                         <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
                              width="30" height="30"

From 46e49b7e5b234646285d97bb922bd92c3f82e477 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 2 Mar 2022 21:06:43 +0800
Subject: [PATCH 09/11] fix container attach packing list

---
 .../FetchOrderListsFromYdPortalProcessor.php      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index e84da49e..cf6ba735 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -326,7 +326,8 @@ class FetchOrderListsFromYdPortalProcessor
                         /** @var Container $container */
                         $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
 
-                        $container->packingLists()->attach($packingList);
+                    $container->packingLists()->detach($packingList);
+                    $container->packingLists()->attach($packingList);
 
                         $transport = $container->transports()->first();
 
@@ -338,6 +339,18 @@ class FetchOrderListsFromYdPortalProcessor
                         }
                     }
 
+                    if($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($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
                         $container->update(['status' => ApprovalStatus::COMPLETED]);
                         $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);

From 1413b619f65c2bf2929d72eca7b94410b14046d1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 3 Mar 2022 16:48:08 +0800
Subject: [PATCH 10/11] fix claim packing list

---
 .../ControllersLogic/AssignPackingListOrderLogic.php            | 1 +
 .../Processors/FetchOrderListsFromYdPortalProcessor.php         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php
index 45f32ad7..a8fb503c 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php
@@ -106,6 +106,7 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic
 
         $order = $this->fetchesOrder->execute(['reference' => $request->route('reference')]);
 
+        dd($order);
         $warehouse_packing_list = $this->updatesPackingListOwner->execute($warehouse_packing_list, $order);
 
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index cf6ba735..6086ce13 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -269,7 +269,7 @@ class FetchOrderListsFromYdPortalProcessor
                         $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
                     }
 
-                    $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::PENDING_VERIFICATION, !$allow_contract ? null : $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);

From 5b692fa7a55e47c6a8fdc961ef991fb87afbf7bb Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 3 Mar 2022 16:49:43 +0800
Subject: [PATCH 11/11] fix claim packing list

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

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php
index a8fb503c..3ba6d129 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php
@@ -100,13 +100,11 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic
     {
         $warehouse_packing_list = $this->fetchesPackingList->execute([
             'id' => $request->route('id'), 
-            'type' => PackingListType::WAREHOUSE_RECEIVE_LIST,
-            'status' => ApprovalStatus::REJECTED
+            'type' => PackingListType::WAREHOUSE_RECEIVE_LIST
         ]);
 
         $order = $this->fetchesOrder->execute(['reference' => $request->route('reference')]);
 
-        dd($order);
         $warehouse_packing_list = $this->updatesPackingListOwner->execute($warehouse_packing_list, $order);
 
 
@@ -130,8 +128,7 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic
 
         $packing_list = $this->fetchesPackingList->execute([
             'reference' => $warehouse_packing_list->reference, 
-            'type' => PackingListType::SHIPPING_PACKING_LIST,
-            'status' => ApprovalStatus::PENDING_VERIFICATION
+            'type' => PackingListType::SHIPPING_PACKING_LIST
         ]);
 
         $warehouse_packing_list = $this->updatesPackingListOwner->execute($packing_list, $order);