[WIP] Refactor architecture, models

app/Http/Controllers/Shop/Admin/CategoryController.php

@@ -6,7 +6,7 @@ use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
 use App\Repositories\Shop\Categories;
-use App\DataTables\CategoriesDataTable; 
+use App\DataTables\Shop\CategoriesDataTable; 
 
 class CategoryController extends Controller
 {
@@ -40,7 +40,7 @@ class CategoryController extends Controller
      */
     public function store(Request $request)
     {
-        $ret = Categories::store($request);
+        $ret = Categories::store($request->all());
         return redirect()->route('Shop.Admin.Categories.index');
     }
 

app/Http/Controllers/Shop/CategoryController.php

@@ -5,40 +5,26 @@ namespace App\Http\Controllers\Shop;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
-use App\Repositories\Shop\Categorys;
+use App\Repositories\Shop\Categories;
+use App\DataTables\Shop\CategoriesDataTable; 
 
 class CategoryController extends Controller
 {
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
+
+    public function index(CategoriesDataTable $dataTable)
     {
-        if ($request->ajax()) {
-            return self::getDatatable($request);
-        } else {
-            $data = [];
-            return view('Shop.Categories.list', $data);
-        }
-    }
+        return $dataTable->render('Shop.Categories.list');
+    } 
 
     public function getDatatable(Request $request)
     {
         return Categories::getDatatable($request->all());
     }
 
-    /**
-     * Display the specified resource.
-     *
-     * @param  \App\Customer  $customer
-     * @return \Illuminate\Http\Response
-     */
     public function show($id)
     {
         $data = Categories::get($id);
-        return view('Shop.Admin.Categories.view', $data);
+        return view('Shop.Categories.view', $data);
     }
 
 }