little refactoring

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

@@ -3,9 +3,8 @@
 namespace App\Http\Controllers\Admin\Shop;
 
 use App\Datatables\Admin\Shop\MerchandisesDataTable;
+use App\Http\Requests\Admin\Shop\StoreMerchandisePost;
 use App\Repositories\Shop\Merchandises;
-use App\Repositories\Shop\Producers;
-use App\Repositories\Shop\TagGroups;
 use Illuminate\Http\Request;
 
 class MerchandiseController extends Controller
@@ -17,13 +16,12 @@ class MerchandiseController extends Controller
 
     public function create()
     {
-        $data['producers_list'] = Producers::getOptions();
-        $data['tags_list'] = TagGroups::getTreeTags();
+        $data = Merchandises::init();
 
         return view('Admin.Shop.Merchandises.create', $data);
     }
 
-    public function store(Request $request)
+    public function store(StoreMerchandisePost $request)
     {
         $data = $request->all();
         Merchandises::storeFull($data);
@@ -33,14 +31,15 @@ class MerchandiseController extends Controller
 
     public function show($id)
     {
-        return view('Admin.Shop.Merchandises.view', Merchandises::get($id));
+        $data = Merchandises::get($id);
+
+        return view('Admin.Shop.Merchandises.view', $data);
     }
 
     public function edit($id)
     {
-        $data['merchandise'] = Merchandises::getFull($id);
-        $data['producers_list'] = Producers::getOptions();
-        $data['tags_list'] = TagGroups::getTreeTags();
+        $data = Merchandises::init();
+        $data['merchandise'] = Merchandises::getArray($id);
 
         return view('Admin.Shop.Merchandises.edit', $data);
     }

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

@@ -69,7 +69,7 @@ class OfferController extends Controller
 
     public function previewVariation($id)
     {
-        $data['variation'] = Variations::get($id)->toArray();
+        $data['variation'] = Variations::getArray($id);
 
         return view('Admin.Shop.Offers.partials.variation', $data);
     }

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

@@ -16,7 +16,7 @@ class ProducerController extends Controller
 
     public function create()
     {
-        $data['tags_list'] = TagGroups::getTreeTags();
+        $data = Producers::init();
 
         return view('Admin.Shop.Producers.create', $data);
     }
@@ -31,13 +31,15 @@ class ProducerController extends Controller
 
     public function show($id)
     {
-        return view('Admin.Shop.Producers.view', Producers::get($id));
+        $data = Producers::get($id);
+
+        return view('Admin.Shop.Producers.view', $data);
     }
 
     public function edit($id)
     {
+        $data = Producers::init();
         $data['producer'] = Producers::getFull($id);
-        $data['tags_list'] = TagGroups::getTreeTags();
 
         return view('Admin.Shop.Producers.edit', $data);
     }

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

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Shop;
 
 use App\Datatables\Admin\Shop\VariationsDataTable;
+use App\Http\Requests\Admin\Shop\StoreVariationPost;
 use App\Repositories\Shop\Packages;
 use App\Repositories\Shop\Unities;
 use App\Repositories\Shop\Variations;
@@ -24,22 +25,20 @@ class VariationController extends Controller
 
     public function create()
     {
-        $data['packages'] = Packages::getOptions();
-        $data['unities'] = Unities::getOptions();
+        $data = Variations::init();
 
         return view('Admin.Shop.Variations.create', $data);
     }
 
     public function edit($id)
     {
+        $data = Variations::init();
         $data['variation'] = Variations::get($id);
-        $data['packages'] = Packages::getOptions();
-        $data['unities'] = Unities::getOptions();
 
         return view('Admin.Shop.Variations.edit', $data);
     }
 
-    public function store(Request $request)
+    public function store(StoreVariationPost $request)
     {
         $ret = Variations::store($request->all());
 

app/Http/Requests/Admin/Shop/StoreArticleNaturePost.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Admin\Shop;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreArticleNaturePost extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'product_type' => 'required',
+            'name' => 'required',
+        ];
+    }
+}

app/Http/Requests/Admin/Shop/StoreMerchandisesPost.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Admin\Shop;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreMerchandisePost extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'name' => 'required',
+            'producer_id' => 'required',
+        ];
+    }
+}

app/Http/Requests/Admin/Shop/StoreProducerPost.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Admin\Shop;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreProducerPost extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'name' => 'required',
+            'alias' => 'required',
+        ];
+    }
+}

app/Http/Requests/Admin/Shop/StoreVariationPost.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests\Admin\Shop;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreVariationPost extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'package_id' => 'required',
+            'quantity' => 'required',
+            'unity_id' => 'required',
+            'weight' => 'required',
+        ];
+    }
+}