From c564639ff5527cc3e309099b4c9b3fc0f468bf85 Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Fri, 12 Apr 2019 22:33:14 +0800 Subject: [PATCH] minor 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 569120b..eb2d90f 100644 --- a/app/Classes/Modules/Orders/Services/ListsOrderHistory.php +++ b/app/Classes/Modules/Orders/Services/ListsOrderHistory.php @@ -6,6 +6,7 @@ namespace App\Classes\Modules\Orders\Services; use App\Classes\Constants; use App\Models\CustomIssues; use App\Models\Order; +use App\Models\Warehouse; use Carbon\Carbon; use Illuminate\Support\Facades\DB; use Illuminate\Support\Collection; @@ -34,7 +35,7 @@ class ListsOrderHistory $history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => 'Your Order has been loaded into container']); break; case Constants::ORDER_WAREHOUSE_RECEIVING_STEP: - $history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => 'Arrived at China\'s warehouse on: ['.Carbon::parse($order->receiveNotes()->firstOrFail()->receive_date)->format('d-m-Y').']']); + $history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => 'Arrived at '.Warehouse::where($order->warehouse_id)->get()->name.'warehouse on china on: ['.Carbon::parse($order->receiveNotes()->firstOrFail()->receive_date)->format('d-m-Y').']']); break; case Constants::ORDER_WAREHOUSE_PACKING_STEP: $packages = $order->packingLists()->firstOrFail()->packages()->selectRaw(DB::raw('((width/100) * (height/100) * (length/100)) * quantity as cbm, quantity'))->get();