From 0ae05f05b615dae49452b3c4af981dcbab66d38f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 9 Mar 2022 11:03:57 +0800
Subject: [PATCH 1/4] update qr for yd orders

---
 app/Http/Controllers/Orders/DownloadOrderQrPdfController.php | 4 +++-
 resources/views/pdfs/qr.blade.php                            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
index 5656a1bf..b87012ec 100644
--- a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
+++ b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
@@ -23,9 +23,11 @@ class DownloadOrderQrPdfController
 
         $warehousePrefix = '';
         $deliveryPrefix = '';
+        $customerMarking = '';
 
         if($warehouse->reference === WarehouseReferences::VT_GUANG_ZHOU || $warehouse->reference === WarehouseReferences::VT_YIWU) {
             $remark = '周一 至 周六 , 早上八点到下午六点';
+            $customerMarking = $order->companyModule->connections()->first()->invitee_reference.'/';
             if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') {
                 $deliveryPrefix = 'SB/';
             }
@@ -56,7 +58,7 @@ class DownloadOrderQrPdfController
 
         $data = [
             'order' => $order,
-            'marking' => $warehousePrefix.$deliveryPrefix.'CIEF/'.$order->companyModule->connections()->first()->invitee_reference,
+            'marking' => $warehousePrefix.$deliveryPrefix.'CIEF/'.$customerMarking,
             'delivery_address' => $deliveryAddress,
             'warehouse_address' => $warehouseAddress,
             'warehouse_contacts' => $warehouseContacts,
diff --git a/resources/views/pdfs/qr.blade.php b/resources/views/pdfs/qr.blade.php
index b09d22b5..84bb461d 100644
--- a/resources/views/pdfs/qr.blade.php
+++ b/resources/views/pdfs/qr.blade.php
@@ -32,7 +32,7 @@
                         <tbody>
                         <tr>
                             <td style="border-bottom: solid 2px #000000;">
-                                <h1 style="font-size: 50px; line-height: 70px">{{$marking}}/{{$order->reference}}</h1>
+                                <h1 style="font-size: 50px; line-height: 70px">{{$marking}}{{$order->reference}}</h1>
                             </td>
                         </tr>
                         <tr>

From 603b807225aa383885cddac7ebaf5879e8e5a311 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 9 Mar 2022 11:09:36 +0800
Subject: [PATCH 2/4] fix yd to vt error

---
 .../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 19b842e3..c547de3b 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
@@ -66,7 +66,7 @@ class CreateOrderLogic extends AbstractControllerLogic
 
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-        if(!in_array($company->id, WarehouseReferences::YD_EXEMPT_LIST)){
+        if(in_array($company->id, WarehouseReferences::YD_EXEMPT_LIST)){
             $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::VT_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
         }
 

From 3a9fe2b6afac0b7533c553507ff51dc1ba790a1e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 9 Mar 2022 11:10:27 +0800
Subject: [PATCH 3/4] fix yd to vt error

---
 .../Modules/Orders/ControllersLogic/CreateOrderLogic.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
index c547de3b..a9a0ad17 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
@@ -66,8 +66,8 @@ class CreateOrderLogic extends AbstractControllerLogic
 
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-        if(in_array($company->id, WarehouseReferences::YD_EXEMPT_LIST)){
-            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::VT_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
+        if(!in_array($company->id, WarehouseReferences::YD_EXEMPT_LIST)){
+            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
         }
 
         if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {

From 3b60a90435cdd1ec1b90f9fe385c0e0aa11458a2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 9 Mar 2022 11:14:25 +0800
Subject: [PATCH 4/4] fix yd to vt error

---
 .../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 a9a0ad17..510a2a29 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
@@ -66,7 +66,7 @@ class CreateOrderLogic extends AbstractControllerLogic
 
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-        if(!in_array($company->id, WarehouseReferences::YD_EXEMPT_LIST)){
+        if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){
             $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
         }