From 168c59f6cf3eebc4b77103fcc43d7c559511c9fb Mon Sep 17 00:00:00 2001 From: franknstayn Date: Fri, 27 Dec 2019 22:34:28 +0800 Subject: [PATCH] update 12_27_2019 --- .../Controllers/admin/AdminController.php | 47 +- app/Http/routes.php | 6 +- app/Models/admin/AdminModel.php | 25 +- resources/views/admin/main.blade.php | 321 +++++++++++- resources/views/admin/sidebar.blade.php | 32 +- .../admin_pages/add_visualizer.blade.php | 467 ++++++++++++++++++ resources/views/admin_pages/orders.blade.php | 14 + 7 files changed, 885 insertions(+), 27 deletions(-) create mode 100644 resources/views/admin_pages/add_visualizer.blade.php diff --git a/app/Http/Controllers/admin/AdminController.php b/app/Http/Controllers/admin/AdminController.php index 5ad60d0..0050feb 100644 --- a/app/Http/Controllers/admin/AdminController.php +++ b/app/Http/Controllers/admin/AdminController.php @@ -411,7 +411,12 @@ class AdminController extends Controller } public function viewReports(){ - return view('admin_pages.reports'); + $AdminModel = new AdminModel; + + $array_store_orders = $AdminModel->selectStoreOrders(); + // var_dump($array_store_orders); + return view('admin_pages.reports') + ->with('array_store_orders', $array_store_orders); } public function addClipart(){ @@ -649,5 +654,45 @@ class AdminController extends Controller ->with('clipart_array', $clipart_array); } + public function visualizerAdd(){ + $AdminModel = new AdminModel; + $sports_array = $AdminModel->selectSports(); + $pattern_array = $AdminModel->selectPattern(); + + return view('admin_pages.add_visualizer') + ->with('sports_array', $sports_array) + ->with('pattern_array', $pattern_array); + } + + + public function selectSportsCategory(Request $request){ + $post = $request->all(); + $AdminModel = new AdminModel; + $sports_category_array = $AdminModel->selectSportsCategory($post['id']); + + return response()->json(array( + 'success' => true, + 'data'=> $sports_category_array + )); + } + + + public function getOverlayPattern(){ + $AdminModel = new AdminModel; + $pattern_array = $AdminModel->selectPattern(); + return response()->json(array( + 'success' => true, + 'data' => $pattern_array + )); + } + + public function saveNewVisualizer(Request $request){ + $post = $request->all(); + $AdminModel = new AdminModel; + + var_dump($post); + } + + } \ No newline at end of file diff --git a/app/Http/routes.php b/app/Http/routes.php index 1999ead..cc1e601 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -52,8 +52,11 @@ Route::group(['middleware' => 'auth'], function () { Route::post('clipart/delete-clipart-category', 'admin\AdminController@deleteClipartCategory'); Route::post('clipart/save-clipart-cat-ordering', 'admin\AdminController@saveClipartCatOrdering'); Route::post('clipart/update-clipart-category', 'admin\AdminController@updateClipartCategory'); - + Route::get('visualizer/add', 'admin\AdminController@visualizerAdd'); + Route::post('visualizer/request/get-sports-category', 'admin\AdminController@selectSportsCategory'); + Route::get('/get-overlay-pattern', 'admin\AdminController@getOverlayPattern'); + Route::post('/add-new-visualizer/save', 'admin\AdminController@saveNewVisualizer'); Route::get('user-list', 'admin\AdminController@userList'); @@ -61,6 +64,7 @@ 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'); diff --git a/app/Models/admin/AdminModel.php b/app/Models/admin/AdminModel.php index 5b3aac3..884ff7e 100644 --- a/app/Models/admin/AdminModel.php +++ b/app/Models/admin/AdminModel.php @@ -232,9 +232,30 @@ class AdminModel extends Model return $i; } + function selectSports(){ - - + $i = DB::table('sports') + ->orderby("SportsName", "ASC") + ->get(); + return $i; + } + function selectSportsCategory($id){ + + $i = DB::table('template_categories') + ->where('TemplateId', $id) + ->orderby("Category", "ASC") + ->get(); + return $i; + } + 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.*') + ->leftjoin('payment_details', 'payment_details.CartKey','=','orders.CartKey') + ->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id','=','payment_details.Id') + // ->where('orders.StoreId', $store_id) + ->orderby('orders.DateCreated', 'DESC') + ->get(); + return $i; + } } diff --git a/resources/views/admin/main.blade.php b/resources/views/admin/main.blade.php index 3467c6a..fb56ea6 100644 --- a/resources/views/admin/main.blade.php +++ b/resources/views/admin/main.blade.php @@ -42,7 +42,9 @@ scratch. This page gets rid of all links and provides the needed markup only. - + + {{-- spectrum --}} + + +
+ +
+

+ Adding of Visualizer + +

+
    +
  1. Dashboard
    2. +
  2. Visualizer Management
    3. +
  3. Add Visualizer
    4. +
+
+ + +
+
+
+
+
+

Visualizer

+
+
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+

Step one

+
+
+
+ {{--
+ +
+ +
+
--}} +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ {{--
+ +
+ +
+
--}} +
+ +
+ {{-- --}} + +
+
+
+ +
+ +
+
+
+ +
+

Preview:

+
+ + + +
+
+
+
+ +
+
    +
    • +
+
+
+ + +
+
+

Step two

+
+
+
+
+ +
+
+ + + + +
+
+
+ +
+ +
+
+ + + + +
+
+
+ +
+ +
+
+ + + + +
+
+
+
+ +
+
+ + + + +
+
+
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+
+ +
+
+


+
+
    +
    • +
    • +
+
+
+ +
+

Complete steps

+

You have successfully completed every steps.

+
    +
    • +
    • +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ +
+ + +@endsection \ No newline at end of file diff --git a/resources/views/admin_pages/orders.blade.php b/resources/views/admin_pages/orders.blade.php index 53d9634..9ee195d 100644 --- a/resources/views/admin_pages/orders.blade.php +++ b/resources/views/admin_pages/orders.blade.php @@ -22,6 +22,20 @@

Order List

+
+
+
+ + +
+
+
+
+ + +
+
+