From d617001412b93fc333ff385e896b1eb99f79acb4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 27 Mar 2022 11:49:32 +0800
Subject: [PATCH] fix vt YW orders

---
 .../FetchLoadedContainersFromVTPortalProcessor.php        | 8 ++------
 .../FetchWarehouseReceiveListFromVTPortalProcessor.php    | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 98d02888..0c8a2512 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -158,13 +158,9 @@ class FetchLoadedContainersFromVTPortalProcessor
                 }
 
                 foreach($containerDetail->Rows as $packingList){
-                    $marking = explode('/', explode('CIEF/', $packingList[13])[1]);
+                    $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[13]));
 
-                    if(!array_key_exists(1, $marking)){
-                        continue;
-                    }
-
-                    $orderNumber = $marking[1];
+                    $orderNumber = $marking[array_key_last($marking)];
 
                     if(!$packingList[22]){
                         continue;
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index a4b846cf..fc15e580 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -134,13 +134,9 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             foreach ($response->Rows as $parcel){
 
-                $marking = explode('/', explode('CIEF/', $parcel[5])[1]);
+                $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[5]));
 
-                if(!array_key_exists(1, $marking)){
-                    continue;
-                }
-
-                $orderNumber = $marking[1];
+                $orderNumber = $marking[array_key_last($marking)];
 
                 if(!$parcel[9]){
                     continue;