diff --git a/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php index df2d1a1e..f46326ca 100644 --- a/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php +++ b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php @@ -31,6 +31,7 @@ class FetchesDataFromYDPortal public function getResponseBody(ResponseInterface $request){ $content = $request->getBody()->getContents(); $content = str_replace("\r",'', $content); + $content = str_replace("\n",'', $content); return json_decode($content); } } \ No newline at end of file diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index c6ae0de8..8bd5b87d 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -137,6 +137,7 @@ class FetchOrderListsFromYdPortalProcessor { try { + $start = $start ? $start : Carbon::now()->subMonths(2); $startLimit = Carbon::parse('01-12-2021'); @@ -165,6 +166,7 @@ class FetchOrderListsFromYdPortalProcessor $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [ 'trakingno' => $row->expressno ]); + $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest); foreach ($rows->data as $trackingRow) {