diff --git a/app/Models/user/UserModel.php b/app/Models/user/UserModel.php index 0ae4263..1a40914 100644 --- a/app/Models/user/UserModel.php +++ b/app/Models/user/UserModel.php @@ -161,9 +161,11 @@ class UserModel extends Model { } function selectStoreOrders($store_id){ - $i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*') + $i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*', 'tracking_steps.StepLabel') ->leftjoin('payment_details', 'payment_details.CartKey','=','orders.CartKey') ->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id','=','payment_details.Id') + ->leftjoin('tracking', 'tracking.InvoiceNumber','=','payment_details.InvoiceNumber') + ->leftjoin('tracking_steps', 'tracking_steps.Id','=','tracking.StepId') ->where('orders.StoreId', $store_id) ->orderby('orders.DateCreated', 'DESC') ->get(); diff --git a/resources/views/user-layouts/store-orders.blade.php b/resources/views/user-layouts/store-orders.blade.php index 39fa82d..d148dc2 100644 --- a/resources/views/user-layouts/store-orders.blade.php +++ b/resources/views/user-layouts/store-orders.blade.php @@ -51,6 +51,7 @@
| Status | Invoice No. | Product Name | Name | @@ -77,6 +78,7 @@
|---|---|---|---|
| {{ $item_order->StepLabel }} | {{ $item_order->InvoiceNumber }} | {{ $item_order->ProductName }} | {{ $item_order->Name }} |