diff --git a/app/Models/admin/AdminModel.php b/app/Models/admin/AdminModel.php index d7fc29b..5aa7977 100644 --- a/app/Models/admin/AdminModel.php +++ b/app/Models/admin/AdminModel.php @@ -250,7 +250,7 @@ class AdminModel extends Model } function selectStoreOrders(){ - $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.*', 'teamstores.*') + $i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'orders.DateCreated AS date_ordered', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*', 'teamstores.*') ->leftjoin('payment_details', 'payment_details.CartKey','=','orders.CartKey') ->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id','=','payment_details.Id') ->leftjoin('teamstores', 'teamstores.Id','=','orders.StoreId') diff --git a/resources/views/admin_pages/reports.blade.php b/resources/views/admin_pages/reports.blade.php index 60e1956..bf481d0 100644 --- a/resources/views/admin_pages/reports.blade.php +++ b/resources/views/admin_pages/reports.blade.php @@ -91,7 +91,7 @@ {{ $item_order->ShortsSize }} {{ $item_order->Price . ' ' . $item_order->Currency }} {{ $item_order->Quantity }} - {{ date('Y/m/d', strtotime($item_order->DateCreated)) }} + {{ date('Y/m/d', strtotime($item_order->date_ordered)) }} {{ $item_order->Payer_Email }} {{ $item_order->Payer_Firstname . ' ' . $item_order->Payer_Lastname }} {{ $item_order->recipient_name }} @@ -101,7 +101,7 @@ {{ $item_order->state }} {{ $item_order->postal_code }} {{ $item_order->country_code }} - {{ date('F j, Y g:i a', strtotime($item_order->DateCreated)) }} + {{ date('F j, Y g:i a', strtotime($item_order->date_ordered)) }} View Details