From 4a497dd61ba585acc39e896d4dd134fea3e32557 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:17:14 +0800 Subject: [PATCH 01/34] missing orders --- .../FetchLoadedContainersFromVTPortalProcessor.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php index ac26ac37..288685e8 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php @@ -160,8 +160,12 @@ class FetchLoadedContainersFromVTPortalProcessor $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse); } - dd($containerDetail->Rows); + foreach($containerDetail->Rows as $packingList){ + if($index !== 10){ + continue; + } + $marking = explode('/', explode('CIEF/', $packingList[13])[1]); if(!array_key_exists(1, $marking)){ @@ -169,7 +173,7 @@ class FetchLoadedContainersFromVTPortalProcessor } $orderNumber = $marking[1]; - + dd($orderNumber); if(!$packingList[22]){ continue; } From 899f84aed087883bc8c2d52c294d4a91816fec92 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:18:17 +0800 Subject: [PATCH 02/34] missing orders --- .../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 288685e8..efa9e7d3 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php @@ -159,7 +159,7 @@ class FetchLoadedContainersFromVTPortalProcessor $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]); $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse); } - +dd($container); foreach($containerDetail->Rows as $packingList){ if($index !== 10){ From 388a1024b4c82c954a4f1c3794c66e58ded88cfe Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:19:09 +0800 Subject: [PATCH 03/34] missing orders --- .../FetchLoadedContainersFromVTPortalProcessor.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php index efa9e7d3..fc890f41 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php @@ -159,10 +159,9 @@ class FetchLoadedContainersFromVTPortalProcessor $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]); $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse); } -dd($container); - foreach($containerDetail->Rows as $packingList){ - if($index !== 10){ + foreach($containerDetail->Rows as $key => $packingList){ + if($key !== 10){ continue; } From f7b081eb941903943914519f2fd6d1c589946660 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:20:13 +0800 Subject: [PATCH 04/34] missing orders --- .../Processors/FetchLoadedContainersFromVTPortalProcessor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php index fc890f41..50fda7a4 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php @@ -172,7 +172,7 @@ class FetchLoadedContainersFromVTPortalProcessor } $orderNumber = $marking[1]; - dd($orderNumber); + if(!$packingList[22]){ continue; } @@ -183,7 +183,7 @@ class FetchLoadedContainersFromVTPortalProcessor } catch (ResourceNotFoundException $exception){ continue; } - + dd($order); $packingListReference = $packingList[16]; try{ From 266fd7302b5507c852421a17018d3de9c8f8cd2e Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:20:58 +0800 Subject: [PATCH 05/34] missing orders --- .../Processors/FetchLoadedContainersFromVTPortalProcessor.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php index 50fda7a4..986cae8f 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php @@ -183,12 +183,13 @@ class FetchLoadedContainersFromVTPortalProcessor } catch (ResourceNotFoundException $exception){ continue; } - dd($order); + $packingListReference = $packingList[16]; try{ $this->fetchesPackingList->execute(['reference' => $packingListReference]); } catch (ResourceNotFoundException $exception){ + dd($packingListReference); $contract = $this->unityCreateContract->execute(); $contractReference = $contract->hash_id; $contractObligations = $contract->contract_obligation_list; From 6bfbac6494a147c584222916d153c8e4aaf29b95 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:21:34 +0800 Subject: [PATCH 06/34] missing orders --- .../Processors/FetchLoadedContainersFromVTPortalProcessor.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php index 986cae8f..1a3c9c56 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php @@ -189,7 +189,6 @@ class FetchLoadedContainersFromVTPortalProcessor try{ $this->fetchesPackingList->execute(['reference' => $packingListReference]); } catch (ResourceNotFoundException $exception){ - dd($packingListReference); $contract = $this->unityCreateContract->execute(); $contractReference = $contract->hash_id; $contractObligations = $contract->contract_obligation_list; From 1838e46d1bb81c3481bc8ce9fb9c095181298241 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:23:45 +0800 Subject: [PATCH 07/34] missing orders --- .../FetchLoadedContainersFromVTPortalProcessor.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php index 1a3c9c56..98d02888 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::now()->subDays(10); $startLimit = Carbon::parse('11-08-2021'); @@ -141,10 +141,7 @@ class FetchLoadedContainersFromVTPortalProcessor $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest); - foreach ($containers->Rows as $index => $container){ - if($index !== 2){ - continue; - } + foreach ($containers->Rows as $container){ $filter = '["ContainerID:=%js%'.$container[11].'"]'; $containerDetailRequest = $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.'}}'), ''); @@ -160,11 +157,7 @@ class FetchLoadedContainersFromVTPortalProcessor $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse); } - foreach($containerDetail->Rows as $key => $packingList){ - if($key !== 10){ - continue; - } - + foreach($containerDetail->Rows as $packingList){ $marking = explode('/', explode('CIEF/', $packingList[13])[1]); if(!array_key_exists(1, $marking)){ From e79206a6815bdd9a7450b79874ab8ebd027663cb Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:25:33 +0800 Subject: [PATCH 08/34] missing orders --- .../FetchWarehouseReceiveListFromVTPortalProcessor.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php index f52fac65..e970f47b 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -133,7 +133,10 @@ class FetchWarehouseReceiveListFromVTPortalProcessor $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest); foreach ($response->Rows as $parcel){ - + if($parcel[5] !== 'MS/CIEF/737MCC/86511390'){ + continue; + } +dd($parcel); $marking = explode('/', explode('CIEF/', $parcel[5])[1]); if(!array_key_exists(1, $marking)){ From fe340b12463e5505ccd0676154c5e93f6fd76356 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:25:49 +0800 Subject: [PATCH 09/34] missing orders --- routes/web.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index 54a0f60e..3ee7cec9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -115,7 +115,7 @@ Route::get('/orders/refresh', function(){ Route::get('/containers/refresh', function(){ - (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute(); + (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute(); // FetchLoadedContainersFromVTPortalJob::dispatch(); // FetchContainersStatusUpdateFromVTPortalJob::dispatch(); From 99d7aeac5fbab88b6c0bdfcfaa985c7fdc2c52b0 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:26:54 +0800 Subject: [PATCH 10/34] missing orders --- .../FetchWarehouseReceiveListFromVTPortalProcessor.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php index e970f47b..f52fac65 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php @@ -133,10 +133,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest); foreach ($response->Rows as $parcel){ - if($parcel[5] !== 'MS/CIEF/737MCC/86511390'){ - continue; - } -dd($parcel); + $marking = explode('/', explode('CIEF/', $parcel[5])[1]); if(!array_key_exists(1, $marking)){ From a97faa0024b64dc97a38550de209264aba778c55 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:28:35 +0800 Subject: [PATCH 11/34] missing orders --- .../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 f52fac65..a4b846cf 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()->subMonths(2); + $start = $start ? $start : Carbon::now()->subMonth(); $startLimit = Carbon::parse('11-08-2021'); From 49042f5507e7158a034cd5d1fcbe3834c18722a6 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:29:33 +0800 Subject: [PATCH 12/34] missing orders --- routes/web.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index 3ee7cec9..405697ba 100644 --- a/routes/web.php +++ b/routes/web.php @@ -115,7 +115,7 @@ Route::get('/orders/refresh', function(){ Route::get('/containers/refresh', function(){ - (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute(); + (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor::class))->execute(); // FetchLoadedContainersFromVTPortalJob::dispatch(); // FetchContainersStatusUpdateFromVTPortalJob::dispatch(); From dd78be57fe48cdf6d3c517857eddbfbc1705dc85 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:34:19 +0800 Subject: [PATCH 13/34] missing orders --- .../Processors/FetchPackingListFromVTPortalProcessor.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php index 2f977222..4268e4a8 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -51,7 +51,10 @@ class FetchPackingListFromVTPortalProcessor })->get(); foreach($packingLists as $packingList){ - + if($packingList->reference !== 'PO046717'){ + continue; + } + dd($packingList); try { DB::beginTransaction(); From b16eddf13a1729aefb8f40b5eeedcca52e0f817f Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:37:43 +0800 Subject: [PATCH 14/34] missing orders --- .../Processors/FetchPackingListFromVTPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php index 4268e4a8..ba2da185 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -49,7 +49,7 @@ 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(); - +dd($packingLists); foreach($packingLists as $packingList){ if($packingList->reference !== 'PO046717'){ continue; From fdfae861c6306df92ecaf49d187a717aac1ef6bf Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:38:31 +0800 Subject: [PATCH 15/34] missing orders --- .../Processors/FetchPackingListFromVTPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php index ba2da185..ad966601 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -48,7 +48,7 @@ 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(); + })->where('reference', 'PO046717')->get(); dd($packingLists); foreach($packingLists as $packingList){ if($packingList->reference !== 'PO046717'){ From f3688385eb3e2a54662407fcb54d70d5cb313504 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:44:04 +0800 Subject: [PATCH 16/34] missing orders --- .../Processors/FetchPackingListFromVTPortalProcessor.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php index ad966601..19337c63 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -46,9 +46,7 @@ class FetchPackingListFromVTPortalProcessor */ public function execute(){ - $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){ - $query->where('status', '=', ApprovalStatus::COMPLETED); - })->where('reference', 'PO046717')->get(); + $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->where('reference', 'PO046717')->get(); dd($packingLists); foreach($packingLists as $packingList){ if($packingList->reference !== 'PO046717'){ From 2e41499fd1051249579aa4c3a154e4e6cb71577a Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:44:57 +0800 Subject: [PATCH 17/34] missing orders --- .../Processors/FetchPackingListFromVTPortalProcessor.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php index 19337c63..98758be6 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -46,13 +46,15 @@ class FetchPackingListFromVTPortalProcessor */ public function execute(){ - $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->where('reference', 'PO046717')->get(); -dd($packingLists); + $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(); + foreach($packingLists as $packingList){ if($packingList->reference !== 'PO046717'){ continue; } - dd($packingList); + try { DB::beginTransaction(); From 585e4705a47b5dcb2839b8c0149ce487a5f2e8d3 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:47:41 +0800 Subject: [PATCH 18/34] missing orders --- .../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 98758be6..b3726577 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -48,8 +48,8 @@ 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(); - + })->where('id', 538)->get(); +dd($packingLists); foreach($packingLists as $packingList){ if($packingList->reference !== 'PO046717'){ continue; From 1560bdfcf839058e0da4a0081afad31790b00e1c Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:48:47 +0800 Subject: [PATCH 19/34] missing orders --- .../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 b3726577..8f11977d 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -45,11 +45,11 @@ class FetchPackingListFromVTPortalProcessor * @throws \App\Classes\Exceptions\RequestValidationException */ public function execute(){ - + dd($packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->where('id', 538)->first()->containers); $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){ $query->where('status', '=', ApprovalStatus::COMPLETED); })->where('id', 538)->get(); -dd($packingLists); + foreach($packingLists as $packingList){ if($packingList->reference !== 'PO046717'){ continue; From a28a5a0c295f5a08b5e2782a30b6c91308d72240 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:53:56 +0800 Subject: [PATCH 20/34] missing orders --- .../Processors/FetchPackingListFromVTPortalProcessor.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php index 8f11977d..01e55481 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -45,16 +45,16 @@ class FetchPackingListFromVTPortalProcessor * @throws \App\Classes\Exceptions\RequestValidationException */ public function execute(){ - dd($packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->where('id', 538)->first()->containers); + $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){ $query->where('status', '=', ApprovalStatus::COMPLETED); - })->where('id', 538)->get(); + })->get(); foreach($packingLists as $packingList){ - if($packingList->reference !== 'PO046717'){ + if($packingList->reference !== 'PO058432'){ continue; } - + dd($packingList); try { DB::beginTransaction(); From df0b67d9b90116633c79b6d78c4f77be703d4f37 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 15:55:35 +0800 Subject: [PATCH 21/34] missing orders --- .../Processors/FetchPackingListFromVTPortalProcessor.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php index 01e55481..2f977222 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -51,10 +51,7 @@ class FetchPackingListFromVTPortalProcessor })->get(); foreach($packingLists as $packingList){ - if($packingList->reference !== 'PO058432'){ - continue; - } - dd($packingList); + try { DB::beginTransaction(); From e2df3af9cd56f8b9c0ed541e1f39941db0053854 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:00:10 +0800 Subject: [PATCH 22/34] missing orders --- .../Processors/FetchPackingListFromVTPortalProcessor.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php index 2f977222..01e55481 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -51,7 +51,10 @@ class FetchPackingListFromVTPortalProcessor })->get(); foreach($packingLists as $packingList){ - + if($packingList->reference !== 'PO058432'){ + continue; + } + dd($packingList); try { DB::beginTransaction(); From 48dbe00744acb5b1f7ebb64f7e607dd8cdbeafd4 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:00:58 +0800 Subject: [PATCH 23/34] missing orders --- .../Processors/FetchPackingListFromVTPortalProcessor.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php index 01e55481..93246463 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -54,16 +54,16 @@ class FetchPackingListFromVTPortalProcessor if($packingList->reference !== 'PO058432'){ continue; } - dd($packingList); + try { - DB::beginTransaction(); +// DB::beginTransaction(); $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.'}}'), ''); $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest); - + dd($shippingPackingLists->Rows); if(count($shippingPackingLists->Rows)) { $packingList->packages()->delete(); From 5ca53c2124883f4696cd8b5d12862f228be788ac Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:02:02 +0800 Subject: [PATCH 24/34] missing orders --- .../Processors/FetchPackingListFromVTPortalProcessor.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php index 93246463..c16f6ce9 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -56,16 +56,14 @@ class FetchPackingListFromVTPortalProcessor } try { -// DB::beginTransaction(); + DB::beginTransaction(); $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.'}}'), ''); $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest); - dd($shippingPackingLists->Rows); if(count($shippingPackingLists->Rows)) { - $packingList->packages()->delete(); $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first(); From f1432388d8de5ee0e61818e6689ef0c1254d1a4d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:07:06 +0800 Subject: [PATCH 25/34] missing orders --- .../Processors/FetchPackingListFromVTPortalProcessor.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php index c16f6ce9..5ddc64ab 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php @@ -51,10 +51,6 @@ class FetchPackingListFromVTPortalProcessor })->get(); foreach($packingLists as $packingList){ - if($packingList->reference !== 'PO058432'){ - continue; - } - try { DB::beginTransaction(); From 715d26c9d2fe1d108847efa7a01d798d862f2e7b Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:18:32 +0800 Subject: [PATCH 26/34] missing orders --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 6086ce13..5011872d 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -154,6 +154,12 @@ class FetchOrderListsFromYdPortalProcessor foreach($rows->data as $row){ + if($row->expressno !== 'M202202271025545'){ + continue; + } + + dd($row); + $containerReference = null; $loadingDate = null; $unstuffingDate = null; From de26957532a16bd03468315b5d774c678105617d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:22:54 +0800 Subject: [PATCH 27/34] missing orders --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 5011872d..1403c6f7 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -158,8 +158,6 @@ class FetchOrderListsFromYdPortalProcessor continue; } - dd($row); - $containerReference = null; $loadingDate = null; $unstuffingDate = null; @@ -205,6 +203,7 @@ class FetchOrderListsFromYdPortalProcessor $deliveryDate = Carbon::parse($trackingRow->trackingtime); } } + dd($containerReference); $customerno = preg_split('(-|\(|\)|\/)', $row->customerno); From ea381e0bf526fad8f6f486a25a5d5e8b76a1c34f Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:23:32 +0800 Subject: [PATCH 28/34] missing orders --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 1403c6f7..5d284c46 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -203,7 +203,6 @@ class FetchOrderListsFromYdPortalProcessor $deliveryDate = Carbon::parse($trackingRow->trackingtime); } } - dd($containerReference); $customerno = preg_split('(-|\(|\)|\/)', $row->customerno); @@ -315,6 +314,7 @@ class FetchOrderListsFromYdPortalProcessor if($containerReference) { try { $container = $this->fetchesContainer->execute(['reference' => $containerReference]); + dd($container); $container->packingLists()->syncWithoutDetaching([$packingList->id]); } catch (ResourceNotFoundException $exception){ From 1978cf017b6e5e37e6800bd46b6a5d0fc583e2e7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:24:04 +0800 Subject: [PATCH 29/34] missing orders --- .../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 5d284c46..2ce611d9 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -331,8 +331,8 @@ class FetchOrderListsFromYdPortalProcessor /** @var Container $container */ $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse); - $container->packingLists()->detach($packingList); - $container->packingLists()->attach($packingList); + $container->packingLists()->detach($packingList); + $container->packingLists()->attach($packingList); $transport = $container->transports()->first(); From d217cf0ef2d2519c507f9c21a0f63438b1167433 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:24:39 +0800 Subject: [PATCH 30/34] missing orders --- .../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 2ce611d9..5dfd6f5d 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -314,8 +314,8 @@ class FetchOrderListsFromYdPortalProcessor if($containerReference) { try { $container = $this->fetchesContainer->execute(['reference' => $containerReference]); - dd($container); - $container->packingLists()->syncWithoutDetaching([$packingList->id]); + $container->packingLists()->detach($packingList); + $container->packingLists()->attach($packingList); } catch (ResourceNotFoundException $exception){ if (!$allow_contract) { From a54aefcf9fc54cf0db41ef5410b61b20b12bc982 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:25:20 +0800 Subject: [PATCH 31/34] missing orders --- .../Processors/FetchOrderListsFromYdPortalProcessor.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 5dfd6f5d..49338623 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -154,10 +154,6 @@ class FetchOrderListsFromYdPortalProcessor foreach($rows->data as $row){ - if($row->expressno !== 'M202202271025545'){ - continue; - } - $containerReference = null; $loadingDate = null; $unstuffingDate = null; From 9e95da84c4ce396fe46f18d5260df1dd9d889b86 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:34:41 +0800 Subject: [PATCH 32/34] group container packing lists by customer --- app/Http/Resources/ContainerResource.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php index 28b4786e..ef62364e 100644 --- a/app/Http/Resources/ContainerResource.php +++ b/app/Http/Resources/ContainerResource.php @@ -30,7 +30,9 @@ 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(); + return $this->packingLists()->whereHas('packages')->get()->groupBy(function ($package) { + return $package->packingList->owner->company_module_id; + }); }))) ]; } From 5fab8224c6a1cf004f1962d562d7f150008006d4 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:36:03 +0800 Subject: [PATCH 33/34] group container packing lists by customer --- app/Http/Resources/ContainerResource.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php index ef62364e..e112e8d9 100644 --- a/app/Http/Resources/ContainerResource.php +++ b/app/Http/Resources/ContainerResource.php @@ -30,8 +30,8 @@ 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()->groupBy(function ($package) { - return $package->packingList->owner->company_module_id; + return $this->packingLists()->whereHas('packages')->get()->groupBy(function ($packingList) { + return $packingList->owner->company_module_id; }); }))) ]; From 686ef83f3194a7c8649edcb40237a7628c55ba74 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Sat, 5 Mar 2022 16:38:12 +0800 Subject: [PATCH 34/34] group container packing lists by customer --- 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 e112e8d9..42cc5fbb 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()->groupBy(function ($packingList) { + return $this->packingLists()->whereHas('packages')->get()->sortBy(function ($packingList) { return $packingList->owner->company_module_id; }); })))