cief/izyim
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/izyim.git synced 2026-08-30 18:03:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

large changes

Browse Source
This commit is contained in:
Omair Saleh
2019-04-12 18:28:30 +08:00
parent a7cb7b5eb6
commit 9d3eb5e8b9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Orders/Services/ListsOrderHistory.php
+11 -3
View File
@@ -47,8 +47,12 @@ class ListsOrderHistory
$shippingSchedules = $shippingArrangment->shippingSchedule()->get();
foreach ($shippingSchedules as $schedule){
if($schedule->status === "2"){
$customeIssue = CustomIssues::where('schedule_id', $schedule->id)->firstOrFail();
$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]);
$customeIssue = CustomIssues::where('schedule_id', $schedule->id)->first();
if($customeIssue){
$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 {
$history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => '[ETD: '.$schedule->ETD.', ETA: '.$schedule->ETA.'] Shipping Schedule failed']);
}
} else {
$history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => '[ETD: '.$schedule->ETD.', ETA: '.$schedule->ETA.'] Your Order has been scheduled for shipping ']);
}
@@ -76,7 +80,11 @@ class ListsOrderHistory
foreach ($shippingSchedules as $schedule){
if($schedule->status === "2"){
$customeIssue = CustomIssues::where('schedule_id', $schedule->id)->firstOrFail();
$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]);
if($customeIssue){
$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 {
$history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => '[ETD: '.$schedule->ETD.', ETA: '.$schedule->ETA.'] Shipping Schedule failed']);
}
} else {
$history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => '[ETD: '.$schedule->ETD.', ETA: '.$schedule->ETA.'] Your Order has been scheduled for shipping ']);
}