From fd2f6f2329dc24b8068d4fb817efe19ffa5fd881 Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Fri, 12 Apr 2019 22:19:26 +0800 Subject: [PATCH] large changes --- app/Classes/Modules/Orders/Services/ListsOrderHistory.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Orders/Services/ListsOrderHistory.php b/app/Classes/Modules/Orders/Services/ListsOrderHistory.php index e3c64bd..cd67a72 100644 --- a/app/Classes/Modules/Orders/Services/ListsOrderHistory.php +++ b/app/Classes/Modules/Orders/Services/ListsOrderHistory.php @@ -48,6 +48,7 @@ class ListsOrderHistory foreach ($shippingSchedules as $schedule){ if($schedule->status === "2"){ $customeIssue = CustomIssues::where('schedule_id', $schedule->id)->first(); + dd($customeIssue); if($customeIssue !== null){ $history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => '[ETD: '.$schedule->ETD.', ETA: '.$schedule->ETA.'] Shipping Schedule failed due to: '.$customeIssue->remark]); } else { @@ -79,7 +80,7 @@ class ListsOrderHistory $shippingSchedules = $shippingArrangment->shippingSchedule()->get(); foreach ($shippingSchedules as $schedule){ if($schedule->status === "2"){ - $customeIssue = CustomIssues::where('schedule_id', $schedule->id)->firstOrFail(); + $customeIssue = CustomIssues::where('schedule_id', $schedule->id)->first(); if($customeIssue !== null){ $history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => '[ETD: '.$schedule->ETD.', ETA: '.$schedule->ETA.'] Shipping Schedule failed due to: '.$customeIssue->remark]); } else {