diff --git a/app/Http/Controllers/admin/AdminController.php b/app/Http/Controllers/admin/AdminController.php index d29b6f0..a9bb729 100644 --- a/app/Http/Controllers/admin/AdminController.php +++ b/app/Http/Controllers/admin/AdminController.php @@ -89,11 +89,24 @@ class AdminController extends Controller $client_design_array = $AdminModel->selectClientDesign($dc); $order_item_array = $AdminModel->selectOrderItem('Id', $id); + var_dump($order_item_array); + return view('admin_pages.download_pages.tshirt') ->with('client_design_array', $client_design_array) ->with('order_item_array', $order_item_array); } + public function downloadPrintFile_hoodie($dc, $id) + { + $AdminModel = new AdminModel; + $client_design_array = $AdminModel->selectClientDesign($dc); + $order_item_array = $AdminModel->selectOrderItem('Id', $id); + + return view('admin_pages.download_pages.hoodie') + ->with('client_design_array', $client_design_array) + ->with('order_item_array', $order_item_array); + } + public function downloadPrintFile_jersey($dc, $id) { $AdminModel = new AdminModel; diff --git a/app/Http/routes.php b/app/Http/routes.php index f83117e..41517d5 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/hoodie/{ck}/{id}', 'admin\AdminController@downloadPrintFile_hoodie'); 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/app/Models/admin/AdminModel.php b/app/Models/admin/AdminModel.php index 1df4072..a37cc08 100644 --- a/app/Models/admin/AdminModel.php +++ b/app/Models/admin/AdminModel.php @@ -33,8 +33,15 @@ class AdminModel extends Model function selectOrderItem($field, $ck) { + // $i = DB::table('orders') + // ->where($field, $ck) + // ->get(); + $i = DB::table('orders') - ->where($field, $ck) + ->leftjoin('client_designs', 'client_designs.DesignCode', '=', 'orders.DesignCode') + ->leftjoin('print_pattern_list', 'print_pattern_list.TemplateCode', '=', 'client_designs.TemplateCode') + ->select('orders.*', 'client_designs.TemplateCode', 'print_pattern_list.Type') + ->orderby('clipart_categories.Ordering', 'ASC') ->get(); return $i; } @@ -298,7 +305,8 @@ class AdminModel extends Model return $i; } - function selectStoreOrders($start, $end) { + function selectStoreOrders($start, $end) + { $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') diff --git a/resources/views/admin_pages/download_pages/hoodie.blade.php b/resources/views/admin_pages/download_pages/hoodie.blade.php new file mode 100644 index 0000000..c7a0c4a --- /dev/null +++ b/resources/views/admin_pages/download_pages/hoodie.blade.php @@ -0,0 +1,952 @@ + + + + + + + + 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 56fa215..d539766 100644 --- a/resources/views/admin_pages/order_details.blade.php +++ b/resources/views/admin_pages/order_details.blade.php @@ -209,7 +209,10 @@ {{ $sub_item->Size }} {{ $sub_item->Price }} {{ $sub_item->Quantity }} - Download Print File + @if ($sub_item->Type) + Download Print File + @endif + @elseif($item->FormUsed=="quantity-form")