From 86e6ef7af561deade503bd6badc244fe00b52505 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 1 Aug 2022 02:11:07 +0800
Subject: [PATCH] update yd new delivery api

---
 .../FetchOrderListsFromYdPortalProcessor.php  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 99ebf9c1..9a54fa28 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -35,6 +35,7 @@ use App\Models\PackingList;
 use App\Models\Transport;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 
@@ -170,7 +171,6 @@ class FetchOrderListsFromYdPortalProcessor
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
                 if(!$rows){
-                    Log::debug($row->expressno);
                     continue;
                 }
 
@@ -218,7 +218,6 @@ class FetchOrderListsFromYdPortalProcessor
                         $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
                     }
 
-
                     if ($trackingRow->tracking === '货物已进目的港仓库') {
                         $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
                     }
@@ -228,6 +227,21 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
+                $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
+
+                $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$row->expressno.'&sOrgId=sti');
+                $deliveryTracking = json_decode($request->getBody()->getContents());
+                foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
+                    $trackingDate = Carbon::createFromFormat('d/m/y H:i', $trackingRow->LocalDateTime);
+                    if (Str::contains($trackingRow->PublicDescription, ['accepted/picked'])){
+                        $unstuffingDate = $trackingDate;
+                    }
+
+                    if (Str::contains($trackingRow->PublicDescription, ['delivered'])) {
+                        $deliveryDate = $trackingDate;
+                    }
+                }
+
                 $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
 
                 $orderNumber = $customerno[array_key_last($customerno)];
@@ -433,7 +447,6 @@ class FetchOrderListsFromYdPortalProcessor
 
             }
         } catch (\Exception $exception) {
-            dump($exception);
             Log::debug($exception);
         }