From 9753eb3a18efebe60fd8a5c53421aa0215a97453 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 31 Mar 2022 13:56:47 +0800 Subject: [PATCH] fix packages is missing in yd api --- .../FetchOrderListsFromYdPortalProcessor.php | 54 +------------------ 1 file changed, 2 insertions(+), 52 deletions(-) diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index 9999e1e6..f6526ebe 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -167,59 +167,9 @@ class FetchOrderListsFromYdPortalProcessor ]); $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest); -dd($rows); - foreach (array_reverse($rows->data) as $trackingRow) { - if ($trackingRow->tracking === '货物已送达仓库准备入库中') { - $receiveDate = Carbon::parse($trackingRow->trackingtime); - } - if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) { - $tracking = explode(':', $trackingRow->tracking); - $containerReference = explode('预计到港时间', $tracking[1])[0]; - $loadingDate = Carbon::parse($trackingRow->trackingtime); - $etd = Carbon::parse($tracking[2])->subDays(5); - $eta = Carbon::parse($tracking[2]); - } - - $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港'); - $rescheduleETA = strpos($trackingRow->remark, '到港'); - if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) { - preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches); - $dates = collect(); - - foreach($matches[0] as $date){ - try { - $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y'))); - } catch (\Exception $exception) { - continue; - } - - } - - $rescheduleDate = $dates->sortDesc()->first(); - if(!$delayDate || $rescheduleDate > $delayDate){ - /** @var Carbon $delayDate */ - $delayDate = $rescheduleDate; - - if($rescheduleETA === false && $delayDate) { - $delayDate = $delayDate->addDays('5'); - } - } - - } - - if ($trackingRow->tracking === '已开船') { - $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5'); - } - - - if ($trackingRow->tracking === '货物已进目的港仓库') { - $unstuffingDate = Carbon::parse($trackingRow->trackingtime); - } - - if ($trackingRow->tracking === '货物已派送完成') { - $deliveryDate = Carbon::parse($trackingRow->trackingtime); - } + if($rows) { + continue; } $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);