diff --git a/app/Http/Controllers/admin/AdminController.php b/app/Http/Controllers/admin/AdminController.php index c0bec4b..2d85b21 100644 --- a/app/Http/Controllers/admin/AdminController.php +++ b/app/Http/Controllers/admin/AdminController.php @@ -23,7 +23,7 @@ class AdminController extends Controller public function orders(){ $AdminModel = new AdminModel; $array_payment_details = $AdminModel->selectPaymentDetails('All', null); - + // var_dump($array_payment_details); return view('admin_pages.orders') ->with('array_payment_details', $array_payment_details); } diff --git a/app/Http/routes.php b/app/Http/routes.php index 508b88e..6be1b08 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -53,15 +53,12 @@ Route::group(['middleware' => 'auth'], function () { Route::post('post/remove-store-access', 'admin\AdminController@removeStoreAccess'); Route::post('post/save-new-store-owner', 'admin\AdminController@saveNewStoreOwner'); - - - + // Download Routes ///////////////// Route::get('orders/download/tshirt/{ck}/{id}', 'admin\AdminController@downloadPrintFile_tshirt'); Route::get('orders/download/jersey/{ck}/{id}', 'admin\AdminController@downloadPrintFile_jersey'); // End Download Routes ///////////// }); - }); Route::auth(); diff --git a/app/Models/admin/AdminModel.php b/app/Models/admin/AdminModel.php index 137775c..2c320df 100644 --- a/app/Models/admin/AdminModel.php +++ b/app/Models/admin/AdminModel.php @@ -16,8 +16,13 @@ class AdminModel extends Model ->get(); }else{ - $i = DB::table('payment_details') - ->orderby('Id', 'ASC') + $i = DB::table('payment_details') + ->leftjoin('orders', 'payment_details.CartKey', '=', 'orders.CartKey') + ->leftjoin('teamstores', 'teamstores.Id', '=', 'orders.StoreId') + ->select('payment_details.*', 'orders.StoreId', 'teamstores.StoreName') + ->where("payment_details.CartKey", "!=", null) + ->groupby('orders.CartKey') + ->orderby('payment_details.Id', 'ASC') ->get(); } diff --git a/resources/views/admin/sidebar.blade.php b/resources/views/admin/sidebar.blade.php index c9cf184..60e71e8 100644 --- a/resources/views/admin/sidebar.blade.php +++ b/resources/views/admin/sidebar.blade.php @@ -9,7 +9,7 @@ User Image
-

Frank John Begornia

+

{{ Auth::user()->name }}

Administrator
diff --git a/resources/views/admin_pages/orders.blade.php b/resources/views/admin_pages/orders.blade.php index 540ca32..53d9634 100644 --- a/resources/views/admin_pages/orders.blade.php +++ b/resources/views/admin_pages/orders.blade.php @@ -26,6 +26,7 @@ + @@ -38,6 +39,7 @@ @foreach($array_payment_details as $pd_row) +
Store Invoice # Currency Tax
{{ $pd_row->StoreName }} {{ $pd_row->InvoiceNumber }} {{ $pd_row->Currency }} {{ $pd_row->Tax }}