diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php index bb4046bd..b29dc77b 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php @@ -235,7 +235,7 @@ class FetchLoadedContainersFromVTPortalProcessor $packingListReference = $packingList[3]; $package = $packingList; - $deliveryDate = Carbon::parse($package[1] ? $package[1]:$package[2]); + $deliveryDate = $package[1] ? Carbon::parse($package[1]) : null; try { $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference, 'type' => PackingListType::SHIPPING_PACKING_LIST]); @@ -277,6 +277,8 @@ class FetchLoadedContainersFromVTPortalProcessor $packageObject = new PackageObject(PackageType::CARTON, $package[8], $package[21], $package[22], $package[20], 0, $package[11], ApprovalStatus::APPROVED); $this->createPackageProcessor->execute($packageObject, $packingList); if($containerStatus === 'Unstuffing'){ + $packingList->transports()->delete(); + if($deliveryDate) { // && !$packingList->transports()->exists() $packingList->status = ApprovalStatus::COMPLETED; @@ -286,8 +288,6 @@ class FetchLoadedContainersFromVTPortalProcessor /** @var Transport $transport */ $transport = $this->createsTransport->execute($transportObject, $packingList); $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED)); - } else { - $packingList->transports()->delete(); } }