From d8801408ae833af856ca7a75fc099f1bb13ee023 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 26 Jul 2022 10:49:44 +0800 Subject: [PATCH 1/6] debug claim packing list --- .../ControllersLogic/AssignPackingListOrderLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php index f91c637d..53b1e141 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php @@ -110,7 +110,7 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic 'id' => $request->route('id'), 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST ]); - +dd($warehouse_packing_list); $order = $this->fetchesOrder->execute(['reference' => $request->route('reference')]); $warehouse_packing_list = $this->updatesPackingListOwner->execute($warehouse_packing_list, $order); From 24bd8be09d8f3b4a11189caa9d406e72c7a55028 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 26 Jul 2022 10:51:07 +0800 Subject: [PATCH 2/6] debug claim packing list --- .../ControllersLogic/AssignPackingListOrderLogic.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php index 53b1e141..3abfb63f 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php @@ -110,8 +110,9 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic 'id' => $request->route('id'), 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST ]); -dd($warehouse_packing_list); + $order = $this->fetchesOrder->execute(['reference' => $request->route('reference')]); + dd($order); $warehouse_packing_list = $this->updatesPackingListOwner->execute($warehouse_packing_list, $order); From b92a6fe710912574d0d92188f183c8aea7be72ea Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 26 Jul 2022 10:52:04 +0800 Subject: [PATCH 3/6] debug claim packing list --- .../ControllersLogic/AssignPackingListOrderLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php index 3abfb63f..3115a10b 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php @@ -112,7 +112,6 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic ]); $order = $this->fetchesOrder->execute(['reference' => $request->route('reference')]); - dd($order); $warehouse_packing_list = $this->updatesPackingListOwner->execute($warehouse_packing_list, $order); @@ -148,6 +147,7 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id); $this->createsStep->execute($packing_list, $stepObject); } + dd('success'); return $this->resourceResponse(new PackingListResource($warehouse_packing_list)); } From cecc0a1b1b9445f3522666e4baa0f3d8e1a0683a Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 26 Jul 2022 10:55:20 +0800 Subject: [PATCH 4/6] debug claim packing list --- .../AssignPackingListOrderLogic.php | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php index 3115a10b..6fbbb2c7 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php @@ -134,20 +134,24 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations); - $packing_list = $this->fetchesPackingList->execute([ - 'reference' => $warehouse_packing_list->reference, - 'type' => PackingListType::SHIPPING_PACKING_LIST - ]); + try { + $packing_list = $this->fetchesPackingList->execute([ + 'reference' => $warehouse_packing_list->reference, + 'type' => PackingListType::SHIPPING_PACKING_LIST + ]); - $warehouse_packing_list = $this->updatesPackingListOwner->execute($packing_list, $order); - - $this->updatesPackingListContractReference->execute($packing_list, $contractReference); + $warehouse_packing_list = $this->updatesPackingListOwner->execute($packing_list, $order); + + $this->updatesPackingListContractReference->execute($packing_list, $contractReference); + + 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($packing_list, $stepObject); + } + } catch (\Exception $exception) { - 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($packing_list, $stepObject); } - dd('success'); + return $this->resourceResponse(new PackingListResource($warehouse_packing_list)); } From b73ef5a386bbb1c96fa3a71abfe3e93a0e98ea81 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 26 Jul 2022 11:00:36 +0800 Subject: [PATCH 5/6] debug claim packing list --- .../AssignPackingListOrderLogic.php | 3 ++- ...etchLoadedContainersFromVTPortalProcessor.php | 16 +++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php index 6fbbb2c7..cba73aa8 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/AssignPackingListOrderLogic.php @@ -2,6 +2,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic; +use App\Classes\Exceptions\ResourceNotFoundException; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\PackingLists\Services\FetchesPackingList; use App\Classes\Modules\Orders\Services\FetchesOrder; @@ -148,7 +149,7 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id); $this->createsStep->execute($packing_list, $stepObject); } - } catch (\Exception $exception) { + } catch (ResourceNotFoundException $exception) { } diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php index b29dc77b..c0c9d24b 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php @@ -222,17 +222,23 @@ class FetchLoadedContainersFromVTPortalProcessor $allow_contract = true; try { - $order = $this->fetchesOrder->execute(['reference' => $orderNumber]); + $warehousePackingList = $this->fetchesPackingList->execute(['reference' => $packingList[3]]); + $order = $warehousePackingList->owner; } catch (ResourceNotFoundException $exception) { try { - $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]); + $order = $this->fetchesOrder->execute(['reference' => $orderNumber]); } catch (ResourceNotFoundException $exception) { - $order = $this->fetchesCompanyModule->execute(['id' => 1]); - $allow_contract = false; - } + try { + $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]); + } catch (ResourceNotFoundException $exception) { + $order = $this->fetchesCompanyModule->execute(['id' => 1]); + $allow_contract = false; + } + } } + $packingListReference = $packingList[3]; $package = $packingList; $deliveryDate = $package[1] ? Carbon::parse($package[1]) : null; From ee2208c99264be67f2f9b98be5db9c08a90fd425 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 26 Jul 2022 11:05:28 +0800 Subject: [PATCH 6/6] debug claim packing list --- .../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 c0c9d24b..eeaca44c 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php @@ -223,6 +223,7 @@ class FetchLoadedContainersFromVTPortalProcessor try { $warehousePackingList = $this->fetchesPackingList->execute(['reference' => $packingList[3]]); + if(!$warehousePackingList->owner instanceof Order) throw new ResourceNotFoundException; $order = $warehousePackingList->owner; } catch (ResourceNotFoundException $exception) { try {