From fa9b61f79416aa21a4fb36311ff6eb8573c3ee94 Mon Sep 17 00:00:00 2001 From: franknstayn Date: Mon, 10 Aug 2020 00:17:02 -0500 Subject: [PATCH] update --- .../Controllers/admin/AdminController.php | 11 +- app/Http/routes.php | 1 + .../admin_pages/download_pages/mask.blade.php | 179 ++++++++++++++++++ .../views/admin_pages/order_details.blade.php | 5 +- 4 files changed, 194 insertions(+), 2 deletions(-) create mode 100644 resources/views/admin_pages/download_pages/mask.blade.php diff --git a/app/Http/Controllers/admin/AdminController.php b/app/Http/Controllers/admin/AdminController.php index c60cdd6..d5bf055 100644 --- a/app/Http/Controllers/admin/AdminController.php +++ b/app/Http/Controllers/admin/AdminController.php @@ -95,7 +95,16 @@ class AdminController extends Controller ->with('client_design_array', $client_design_array) ->with('order_item_array', $order_item_array); - + } + + public function downloadPrintFile_mask($dc, $id){ + $AdminModel = new AdminModel; + $client_design_array = $AdminModel->selectClientDesign($dc); + $order_item_array = $AdminModel->selectOrderItem('Id', $id); + // var_dump($order_item_array); + return view('admin_pages.download_pages.mask') + ->with('client_design_array', $client_design_array) + ->with('order_item_array', $order_item_array); } diff --git a/app/Http/routes.php b/app/Http/routes.php index 0b19683..1fefcb2 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -84,6 +84,7 @@ Route::group(['middleware' => 'auth'], function () { // Download Routes ///////////////// Route::get('orders/download/tshirt/{ck}/{id}', 'admin\AdminController@downloadPrintFile_tshirt'); Route::get('orders/download/jersey/{ck}/{id}', 'admin\AdminController@downloadPrintFile_jersey'); + Route::get('orders/download/mask/{ck}/{id}', 'admin\AdminController@downloadPrintFile_mask'); // End Download Routes ///////////// }); }); diff --git a/resources/views/admin_pages/download_pages/mask.blade.php b/resources/views/admin_pages/download_pages/mask.blade.php new file mode 100644 index 0000000..db4256f --- /dev/null +++ b/resources/views/admin_pages/download_pages/mask.blade.php @@ -0,0 +1,179 @@ + + + + + + + Customize Uniform + + + + + + + +

Please wait... Click here to go back

+ + + +
+

+ + + + + + + + + + + \ No newline at end of file diff --git a/resources/views/admin_pages/order_details.blade.php b/resources/views/admin_pages/order_details.blade.php index bae4999..56c4341 100644 --- a/resources/views/admin_pages/order_details.blade.php +++ b/resources/views/admin_pages/order_details.blade.php @@ -86,7 +86,6 @@
@foreach($item_goup_array as $item) -
@@ -127,6 +126,7 @@ Price Quantity + @@ -216,6 +216,9 @@ {{ $sub_item->Price }} {{ $sub_item->Quantity }} + + Download Print File + @elseif($item->FormUsed=="name-number-form")