From 4e71d867a93ea616b216bda1bc6dc0af527ab9ab Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Mon, 7 Oct 2019 15:00:21 +0800
Subject: [PATCH] large commit

---
 app/Classes/Modules/Orders/Services/ListsOrderHistory.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Orders/Services/ListsOrderHistory.php b/app/Classes/Modules/Orders/Services/ListsOrderHistory.php
index 6010502..4aa6c25 100644
--- a/app/Classes/Modules/Orders/Services/ListsOrderHistory.php
+++ b/app/Classes/Modules/Orders/Services/ListsOrderHistory.php
@@ -39,8 +39,9 @@ class ListsOrderHistory
             $completeDate = Carbon::parse($step->complete_date)->format('d-m-Y');
             switch ($step->reference_id){
                 case OrderSteps::ORDER_PROCESSING_STEP:
-                    if($order->warehouse_id){
-                        $this->history->push(['type' => 1, 'date' => $completeDate, 'description' => Warehouse::where('id', $order->warehouse_id)->first()->name.' confirmed as your order\'s warehouse']);
+                    $warehous = OrderWarehouse::where('order_id', $orderId)->first();
+                    if($warehous){
+                        $this->history->push(['type' => 1, 'date' => $completeDate, 'description' => Warehouse::where('id', $warehous->id)->first()->name.' confirmed as your order\'s warehouse']);
                     }
                     break;
                 case OrderSteps::ORDER_NO_WAREHOUSE_PENDING_SUPPLIER: