diff --git a/app/Datatables/Shop/InvoicesDataTable.php b/app/Datatables/Shop/InvoicesDataTable.php
index 6e4d5f84..a5e4a1b9 100644
--- a/app/Datatables/Shop/InvoicesDataTable.php
+++ b/app/Datatables/Shop/InvoicesDataTable.php
@@ -28,7 +28,8 @@ class InvoicesDataTable extends DataTable
                 return $invoice->created_at->toDateTimeString();
             })
             ->editColumn('customer.last_name', function (Invoice $invoice) {
-                return ($invoice->customer ?? false) ? $invoice->customer->last_name.' '.$invoice->customer->first_name : '';
+                $customer = $invoice->customer ?? false;
+                return $customer ? $customer->last_name.' '.$customer->first_name : '';
             })
             ->rawColumns(['action']);
 
diff --git a/app/Http/Controllers/Admin/Core/Auth/RoleController.php b/app/Http/Controllers/Admin/Core/Auth/RoleController.php
index df485de2..c3e729b6 100644
--- a/app/Http/Controllers/Admin/Core/Auth/RoleController.php
+++ b/app/Http/Controllers/Admin/Core/Auth/RoleController.php
@@ -92,7 +92,7 @@ class RoleController extends Controller
 
     public function toggleActive(Request $request)
     {
-        $data = Roles::toggle_active($request->input('id'), ($request->input('active') === 'true') ? 1 : 0);
+        $data = Roles::toggleActive($request->input('id'), $request->input('active') === 'true' ? 1 : 0);
 
         return response()->json(['error' => 0]);
     }
diff --git a/app/Http/Controllers/Admin/Core/Auth/UserController.php b/app/Http/Controllers/Admin/Core/Auth/UserController.php
index 0e58268e..0685bd18 100644
--- a/app/Http/Controllers/Admin/Core/Auth/UserController.php
+++ b/app/Http/Controllers/Admin/Core/Auth/UserController.php
@@ -59,7 +59,7 @@ class UserController extends Controller
     public function store(Request $request)
     {
         $input = $request->all();
-        if (empty($input['password'])) {
+        if ($input['password'] ?? false) {
             unset($input['password']);
         }
         $user = Users::store($input);
@@ -174,7 +174,7 @@ class UserController extends Controller
 
     public function toggleActive(Request $request)
     {
-        $data = Users::toggle_active($request->input('id'), ($request->input('active') === 'true') ? 1 : 0);
+        $data = Users::toggleActive($request->input('id'), $request->input('active') === 'true' ? 1 : 0);
 
         return response()->json(['error' => 0]);
     }
diff --git a/app/Http/Controllers/Admin/Shop/ArticleController.php b/app/Http/Controllers/Admin/Shop/ArticleController.php
index bb50e79b..a6564364 100644
--- a/app/Http/Controllers/Admin/Shop/ArticleController.php
+++ b/app/Http/Controllers/Admin/Shop/ArticleController.php
@@ -117,14 +117,14 @@ class ArticleController extends Controller
 
     public function toggleVisible(Request $request)
     {
-        $data = Articles::toggleVisible($request->input('id'), ($request->input('visible') === 'true') ? 1 : 0);
+        $data = Articles::toggleVisible($request->input('id'), $request->input('visible') === 'true' ? 1 : 0);
 
         return response()->json(['error' => 0]);
     }
 
     public function toggleHomepage(Request $request)
     {
-        $data = Articles::toggleHomepage($request->input('id'), ($request->input('homepage') === 'true') ? 1 : 0);
+        $data = Articles::toggleHomepage($request->input('id'), $request->input('homepage') === 'true' ? 1 : 0);
 
         return response()->json(['error' => 0]);
     }
diff --git a/app/Http/Controllers/Admin/Shop/CategoryController.php b/app/Http/Controllers/Admin/Shop/CategoryController.php
index de070cf8..67cadb9b 100644
--- a/app/Http/Controllers/Admin/Shop/CategoryController.php
+++ b/app/Http/Controllers/Admin/Shop/CategoryController.php
@@ -80,14 +80,14 @@ class CategoryController extends Controller
 
     public function toggleVisible(Request $request)
     {
-        $data = Categories::toggleVisible($request->input('id'), ($request->input('visible') === 'true') ? 1 : 0);
+        $data = Categories::toggleVisible($request->input('id'), $request->input('visible') === 'true' ? 1 : 0);
 
         return response()->json(['error' => 0]);
     }
 
     public function toggleHomepage(Request $request)
     {
-        $data = Categories::toggleHomepage($request->input('id'), ($request->input('homepage') === 'true') ? 1 : 0);
+        $data = Categories::toggleHomepage($request->input('id'), $request->input('homepage') === 'true' ? 1 : 0);
 
         return response()->json(['error' => 0]);
     }
diff --git a/app/Http/Controllers/Admin/Shop/ContentController.php b/app/Http/Controllers/Admin/Shop/ContentController.php
index 7cbef727..40b97051 100644
--- a/app/Http/Controllers/Admin/Shop/ContentController.php
+++ b/app/Http/Controllers/Admin/Shop/ContentController.php
@@ -10,12 +10,12 @@ class ContentController extends Controller
 {
     public function index(ContentsDataTable $dataTable)
     {
-        return $dataTable->render('Admin.Shop.Contents.list', $data ?? []);
+        return $dataTable->render('Admin.Shop.Contents.list');
     }
 
     public function create()
     {
-        return view('Admin.Shop.Contents.create', $data ?? []);
+        return view('Admin.Shop.Contents.create');
     }
 
     public function store(Request $request)
@@ -25,14 +25,11 @@ class ContentController extends Controller
         return redirect()->route('Admin.Shop.Contents.index');
     }
 
-    public function show($id)
-    {
-        return view('Admin.Shop.Contents.view', $data ?? []);
-    }
-
     public function edit($id)
     {
-        $data['homepage'] = Contents::get($id);
+        $data = [
+            'homepage' => Contents::get($id),
+        ];
 
         return view('Admin.Shop.Contents.edit', $data);
     }
diff --git a/app/Http/Controllers/Admin/Shop/DeliveryController.php b/app/Http/Controllers/Admin/Shop/DeliveryController.php
index 66c9c8c9..3207f285 100644
--- a/app/Http/Controllers/Admin/Shop/DeliveryController.php
+++ b/app/Http/Controllers/Admin/Shop/DeliveryController.php
@@ -32,7 +32,7 @@ class DeliveryController extends Controller
     public function show($id)
     {
         $data = [
-            'delivery' => Deliveries::get($id),
+            'delivery' => Deliveries::getArray($id),
         ];
 
         return view('Admin.Shop.Deliveries.view', $data);
@@ -53,7 +53,7 @@ class DeliveryController extends Controller
 
     public function toggleActive(Request $request)
     {
-        $data = Deliveries::toggle_active($request->input('id'), ($request->input('active') === 'true') ? 1 : 0);
+        $data = Deliveries::toggleActive($request->input('id'), $request->input('active') === 'true' ? 1 : 0);
 
         return response()->json(['error' => 0]);
     }
diff --git a/app/Http/Controllers/Admin/Shop/DeliveryTypeController.php b/app/Http/Controllers/Admin/Shop/DeliveryTypeController.php
index 8cbc5f57..2b61ac62 100644
--- a/app/Http/Controllers/Admin/Shop/DeliveryTypeController.php
+++ b/app/Http/Controllers/Admin/Shop/DeliveryTypeController.php
@@ -27,6 +27,7 @@ class DeliveryTypeController extends Controller
 
     public function edit($id)
     {
+        $data =  [];
         $data['delivery'] = DeliveryTypes::get($id)->toArray();
 
         return view('Admin.Shop.DeliveryTypes.edit', $data);
diff --git a/app/Http/Controllers/Admin/Shop/InvoiceController.php b/app/Http/Controllers/Admin/Shop/InvoiceController.php
index 3aae0231..c17c6fa1 100644
--- a/app/Http/Controllers/Admin/Shop/InvoiceController.php
+++ b/app/Http/Controllers/Admin/Shop/InvoiceController.php
@@ -29,6 +29,7 @@ class InvoiceController extends Controller
 
     public function show($id)
     {
+        $data = [];
         $data['invoice'] = Invoices::getFull($id)->toArray();
 
         return view('Admin.Shop.Invoices.view', $data);
diff --git a/app/Http/Controllers/Admin/Shop/InvoicePaymentController.php b/app/Http/Controllers/Admin/Shop/InvoicePaymentController.php
index 3a1faf20..e5d91a76 100644
--- a/app/Http/Controllers/Admin/Shop/InvoicePaymentController.php
+++ b/app/Http/Controllers/Admin/Shop/InvoicePaymentController.php
@@ -30,6 +30,7 @@ class InvoicePaymentController extends Controller
 
     public function show($id)
     {
+        $data = [];
         $data['invoice_payment'] = InvoicePayments::getArray($id);
 
         return view('Admin.Shop.InvoicePayments.view', $data);
diff --git a/app/Http/Controllers/Admin/Shop/MerchandiseController.php b/app/Http/Controllers/Admin/Shop/MerchandiseController.php
index 7d8a6278..69c00db8 100644
--- a/app/Http/Controllers/Admin/Shop/MerchandiseController.php
+++ b/app/Http/Controllers/Admin/Shop/MerchandiseController.php
@@ -52,8 +52,10 @@ class MerchandiseController extends Controller
     public function getImages(Request $request, $id = false, $can_edit = true)
     {
         $id = $id ? $id : $request->input('id');
-        $data['images'] = Merchandises::getImages($id);
-        $data['can_edit'] = $can_edit;
+        $data = [
+            'images' => Merchandises::getImages($id),
+            'can_edit' => $can_edit,
+        ];
 
         return view('components.uploader.mini-gallery-items', $data);
     }
diff --git a/app/Http/Controllers/Admin/Shop/OfferController.php b/app/Http/Controllers/Admin/Shop/OfferController.php
index 3a343290..727a2dd8 100644
--- a/app/Http/Controllers/Admin/Shop/OfferController.php
+++ b/app/Http/Controllers/Admin/Shop/OfferController.php
@@ -50,7 +50,9 @@ class OfferController extends Controller
 
     public function show($id)
     {
-        $data['offer'] = Offers::getArray($id);
+        $data = [
+            'offer' => Offers::getArray($id),
+        ];
 
         return view('Admin.Shop.Offers.view', $data);
     }
@@ -62,28 +64,34 @@ class OfferController extends Controller
 
     public function previewArticle($id)
     {
-        $data['article'] = Articles::getArticle($id);
+        $data = [
+            'article' => Articles::getArticle($id),
+        ];
 
         return view('Admin.Shop.Offers.partials.article', $data);
     }
 
     public function previewVariation($id)
     {
-        $data['variation'] = Variations::getArray($id);
+        $data = [
+            'variation' => Variations::getArray($id),
+        ];
 
         return view('Admin.Shop.Offers.partials.variation', $data);
     }
 
     public function previewTariff($id)
     {
-        $data['tariff'] = Tariffs::getPrices($id);
+        $data = [
+            'tariff' => Tariffs::getPrices($id),
+        ];
 
         return view('Admin.Shop.Offers.partials.tariff', $data);
     }
 
     public function toggleActive(Request $request)
     {
-        $data = Offers::toggle_active($request->input('id'), ($request->input('status_id') === 'true') ? 1 : 0);
+        $data = Offers::toggleActive($request->input('id'), $request->input('status_id') === 'true' ? 1 : 0);
 
         return response()->json(['error' => 0]);
     }
diff --git a/app/Http/Controllers/Admin/Shop/PackageController.php b/app/Http/Controllers/Admin/Shop/PackageController.php
index ab4ab911..46488f8b 100644
--- a/app/Http/Controllers/Admin/Shop/PackageController.php
+++ b/app/Http/Controllers/Admin/Shop/PackageController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Admin\Shop;
 
 use App\Datatables\Admin\Shop\PackagesDataTable;
 use App\Http\Controllers\Controller;
-use App\Repositories\Shop\ArticleNatures;
 use App\Repositories\Shop\Packages;
 use Illuminate\Http\Request;
 
@@ -12,7 +11,7 @@ class PackageController extends Controller
 {
     public function index(PackagesDataTable $dataTable)
     {
-        $data['families'] = ArticleNatures::getOptions();
+        $data = Packages::init();
 
         return $dataTable->render('Admin.Shop.Packages.list', $data);
     }
@@ -26,7 +25,7 @@ class PackageController extends Controller
 
     public function create()
     {
-        $data['families'] = ArticleNatures::getOptions();
+        $data = Packages::init();
 
         return view('Admin.Shop.Packages.create', $data);
     }
@@ -47,8 +46,8 @@ class PackageController extends Controller
 
     public function edit($id)
     {
+        $data = Packages::init();
         $data['package'] = Packages::get($id);
-        $data['families'] = ArticleNatures::getOptions();
 
         return view('Admin.Shop.Packages.edit', $data);
     }
diff --git a/app/Http/Controllers/Admin/Shop/PriceGenericCategoryController.php b/app/Http/Controllers/Admin/Shop/PriceGenericCategoryController.php
deleted file mode 100644
index 862bce95..00000000
--- a/app/Http/Controllers/Admin/Shop/PriceGenericCategoryController.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin\Shop;
-
-use App\Datatables\Admin\Shop\PriceGenericCategoriesDataTable;
-use App\Http\Controllers\Controller;
-use App\Repositories\Shop\ArticleNatures;
-use App\Repositories\Shop\PriceGenericCategories;
-use Illuminate\Http\Request;
-
-class PriceGenericCategoryController extends Controller
-{
-    public function index(PriceGenericCategoriesDataTable $dataTable)
-    {
-        return $dataTable->render('Admin.Shop.PriceGenericCategories.list');
-    }
-
-    public function create()
-    {
-        $data['families'] = ArticleNatures::getOptions();
-
-        return view('Admin.Shop.PriceGenericCategories.create', $data);
-    }
-
-    public function edit($id)
-    {
-        $data['families'] = ArticleNatures::getOptions();
-        $data['generic_category'] = PriceGenericCategories::get($id)->toArray();
-
-        return view('Admin.Shop.PriceGenericCategories.edit', $data);
-    }
-
-    public function store(Request $request)
-    {
-        $ret = PriceGenericCategories::store($request->all());
-
-        return redirect()->route('Admin.Shop.PriceGenericCategories.index');
-    }
-
-    public function show($id)
-    {
-        $data = PriceGenericCategories::get($id);
-
-        return view('Admin.Shop.PriceGenericCategories.view', $data);
-    }
-
-    public function destroy($id)
-    {
-        return PriceGenericCategories::destroy($id);
-    }
-}
diff --git a/app/Http/Controllers/Admin/Shop/PriceListController.php b/app/Http/Controllers/Admin/Shop/PriceListController.php
index 1c596271..b7daba78 100644
--- a/app/Http/Controllers/Admin/Shop/PriceListController.php
+++ b/app/Http/Controllers/Admin/Shop/PriceListController.php
@@ -58,7 +58,9 @@ class PriceListController extends Controller
 
     public function getPrice($id)
     {
-        $data['generic'] = PriceLists::getFull($id);
+        $data = [
+            'generic' => PriceLists::getFull($id),
+        ];
 
         return view('Admin.Shop.PriceLists.partials.table-prices', $data);
     }
diff --git a/app/Http/Controllers/Admin/Shop/PriceListValueController.php b/app/Http/Controllers/Admin/Shop/PriceListValueController.php
deleted file mode 100644
index 966b04a7..00000000
--- a/app/Http/Controllers/Admin/Shop/PriceListValueController.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin\Shop;
-
-use App\Datatables\Shop\PriceListValuesDataTable;
-use App\Http\Controllers\Controller;
-use App\Repositories\Shop\Packages;
-use App\Repositories\Shop\PriceListValueCategories;
-use App\Repositories\Shop\PriceListValues;
-use App\Repositories\Shop\Taxes;
-use App\Repositories\Shop\Unities;
-use Illuminate\Http\Request;
-
-class PriceListValueController extends Controller
-{
-    public function index(PriceListValuesDataTable $dataTable)
-    {
-        $data['categories'] = PriceListValueCategories::getOptions();
-
-        return $dataTable->render('Admin.Shop.PriceListValues.list', $data);
-    }
-
-    public function create()
-    {
-        $data['unities'] = Unities::getOptions();
-        $data['taxes_options'] = Taxes::getOptions();
-        $data['categories'] = PriceListValueCategories::getOptions();
-
-        return view('Admin.Shop.PriceListValues.create', $data);
-    }
-
-    public function edit($id)
-    {
-        $data['generic'] = PriceListValues::getFull($id)->toArray();
-        $data['packages'] = Packages::getSelectByFamily($data['generic']['category']['article_family_id']);
-        $data['unities'] = ($data['packages']['id'] ?? false) ? Unities::getSelectByPackage($data['packages']['id']) : [];
-        $data['taxes_options'] = Taxes::getOptions();
-        $data['categories'] = PriceListValueCategories::getOptions();
-
-        return view('Admin.Shop.PriceListValues.edit', $data);
-    }
-
-    public function store(Request $request)
-    {
-        $ret = PriceListValues::store($request->all());
-
-        return redirect()->route('Admin.Shop.PriceListValues.index');
-    }
-
-    public function show($id)
-    {
-        $data = PriceListValues::get($id);
-
-        return view('Admin.Shop.PriceListValues.view', $data);
-    }
-
-    public function destroy($id)
-    {
-        return PriceListValues::destroy($id);
-    }
-
-    public function getPrice($id)
-    {
-        $data['generic'] = PriceListValues::getFull($id);
-
-        return view('Admin.Shop.PriceListValues.partials.table-prices', $data);
-    }
-
-    public function addPrice($index)
-    {
-        $data['index'] = $index;
-
-        return view('Admin.Shop.PriceListValues.partials.row_price', $data);
-    }
-}
diff --git a/app/Http/Controllers/Admin/Shop/ProducerController.php b/app/Http/Controllers/Admin/Shop/ProducerController.php
index 5829966f..8fdef2d2 100644
--- a/app/Http/Controllers/Admin/Shop/ProducerController.php
+++ b/app/Http/Controllers/Admin/Shop/ProducerController.php
@@ -51,8 +51,10 @@ class ProducerController extends Controller
     public function getImages(Request $request, $id = false, $can_edit = true)
     {
         $id = $id ? $id : $request->input('id');
-        $data['images'] = Producers::getImages($id);
-        $data['can_edit'] = $can_edit;
+        $data = [
+            'images' => Producers::getImages($id),
+            'can_edit' => $can_edit,
+        ];
 
         return view('components.uploader.mini-gallery-items', $data);
     }
diff --git a/app/Http/Controllers/Admin/Shop/SaleChannelController.php b/app/Http/Controllers/Admin/Shop/SaleChannelController.php
index 1aecc81a..acc34259 100644
--- a/app/Http/Controllers/Admin/Shop/SaleChannelController.php
+++ b/app/Http/Controllers/Admin/Shop/SaleChannelController.php
@@ -28,14 +28,18 @@ class SaleChannelController extends Controller
 
     public function show($id)
     {
-        $data['sale_channel'] = SaleChannels::get($id);
+        $data = [
+            'sale_channel' => SaleChannels::get($id),
+        ];
 
         return view('Admin.Shop.SaleChannels.view', $data);
     }
 
     public function edit($id)
     {
-        $data['sale_channel'] = SaleChannels::get($id);
+        $data = [
+            'sale_channel' => SaleChannels::get($id),
+        ];
 
         return view('Admin.Shop.SaleChannels.edit', $data);
     }
diff --git a/app/Http/Controllers/Admin/Shop/TagGroupController.php b/app/Http/Controllers/Admin/Shop/TagGroupController.php
index 3fabf9e0..798d9d4e 100644
--- a/app/Http/Controllers/Admin/Shop/TagGroupController.php
+++ b/app/Http/Controllers/Admin/Shop/TagGroupController.php
@@ -17,7 +17,9 @@ class TagGroupController extends Controller
 
     public function create()
     {
-        $data['article_families'] = ArticleNatures::getOptions();
+        $data = [
+            'article_families' => ArticleNatures::getOptions(),
+        ];
 
         return view('Admin.Shop.TagGroups.create', $data);
     }
@@ -51,7 +53,7 @@ class TagGroupController extends Controller
 
     public function toggleVisible(Request $request)
     {
-        $data = TagGroups::toggleVisible($request->input('id'), ($request->input('visible') === 'true') ? 1 : 0);
+        $data = TagGroups::toggleVisible($request->input('id'), $request->input('visible') === 'true' ? 1 : 0);
 
         return response()->json(['error' => 0]);
     }
diff --git a/app/Http/Controllers/Admin/Shop/TariffController.php b/app/Http/Controllers/Admin/Shop/TariffController.php
index f9c92c3e..5259c779 100644
--- a/app/Http/Controllers/Admin/Shop/TariffController.php
+++ b/app/Http/Controllers/Admin/Shop/TariffController.php
@@ -29,7 +29,9 @@ class TariffController extends Controller
 
     public function show($id)
     {
-        $data['tariff'] = Tariffs::getArray($id);
+        $data = [
+            'tariff' => Tariffs::getArray($id),
+        ];
 
         return view('Admin.Shop.Tariffs.view', $data);
     }
diff --git a/app/Http/Controllers/Admin/Shop/TariffUnityController.php b/app/Http/Controllers/Admin/Shop/TariffUnityController.php
index 1819c4fb..7204db00 100644
--- a/app/Http/Controllers/Admin/Shop/TariffUnityController.php
+++ b/app/Http/Controllers/Admin/Shop/TariffUnityController.php
@@ -35,7 +35,9 @@ class TariffUnityController extends Controller
 
     public function edit($id)
     {
-        $data['tariff_unity'] = TariffUnities::get($id)->toArray();
+        $data = [
+            'tariff_unity' => TariffUnities::getArray($id),
+        ];
 
         return view('Admin.Shop.TariffUnities.edit', $data);
     }
@@ -44,8 +46,4 @@ class TariffUnityController extends Controller
     {
         return TariffUnities::destroy($id);
     }
-
-    public function update($id)
-    {
-    }
 }
diff --git a/app/Http/Controllers/Admin/Shop/UnityController.php b/app/Http/Controllers/Admin/Shop/UnityController.php
index 363cc070..48915f61 100644
--- a/app/Http/Controllers/Admin/Shop/UnityController.php
+++ b/app/Http/Controllers/Admin/Shop/UnityController.php
@@ -40,7 +40,9 @@ class UnityController extends Controller
 
     public function edit($id)
     {
-        $data['unity'] = Unities::get($id)->toArray();
+        $data = [
+            'unity' => Unities::get($id)->toArray(),
+        ];
 
         return view('Admin.Shop.Unities.edit', $data);
     }
@@ -49,8 +51,4 @@ class UnityController extends Controller
     {
         return Unities::destroy($id);
     }
-
-    public function update($id)
-    {
-    }
 }
diff --git a/app/Http/Controllers/Shop/ArticleController.php b/app/Http/Controllers/Shop/ArticleController.php
index 4a1cc8c1..8fdafd28 100644
--- a/app/Http/Controllers/Shop/ArticleController.php
+++ b/app/Http/Controllers/Shop/ArticleController.php
@@ -9,8 +9,10 @@ class ArticleController extends Controller
 {
     public function show($id)
     {
-        $data['article'] = Articles::getArticleToSell($id);
-        $data['offers2'] = Articles::getSiblings($id)->toArray();
+        $data = [
+            'article' => Articles::getArticleToSell($id),
+            'offers2' => Articles::getSiblings($id)->toArray(),
+        ];
 
         return view('Shop.Articles.show', $data);
     }
diff --git a/app/Http/Controllers/Shop/Auth/LoginController.php b/app/Http/Controllers/Shop/Auth/LoginController.php
index ab1f342c..a96cae22 100644
--- a/app/Http/Controllers/Shop/Auth/LoginController.php
+++ b/app/Http/Controllers/Shop/Auth/LoginController.php
@@ -33,7 +33,7 @@ class LoginController extends Controller
         if ($this->guard()->attempt($credentials, $request->get('remember'))) {
             $request->session()->regenerate();
 
-            return (back()->getTargetUrl() === route('Shop.login')) ? redirect()->intended(route('home')) : back();
+            return back()->getTargetUrl() === route('Shop.login') ? redirect()->intended(route('home')) : back();
         }
 
         return back()->withErrors([
@@ -59,5 +59,4 @@ class LoginController extends Controller
     {
         return Auth::guard('customer');
     }
-
 }
diff --git a/app/Http/Controllers/Shop/Auth/RegisterController.php b/app/Http/Controllers/Shop/Auth/RegisterController.php
index 16a98a31..6ceac947 100644
--- a/app/Http/Controllers/Shop/Auth/RegisterController.php
+++ b/app/Http/Controllers/Shop/Auth/RegisterController.php
@@ -31,8 +31,8 @@ class RegisterController extends Controller
         }
 
         return $request->wantsJson()
-                    ? new JsonResponse([], 201)
-                    : redirect($this->redirectPath());
+            ? new JsonResponse([], 201)
+            : redirect($this->redirectPath());
     }
 
     public function emailVerify()
@@ -75,5 +75,4 @@ class RegisterController extends Controller
     {
         return route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard'));
     }
-
 }
diff --git a/app/Http/Controllers/Shop/BasketController.php b/app/Http/Controllers/Shop/BasketController.php
index 56b42b9c..3f895629 100644
--- a/app/Http/Controllers/Shop/BasketController.php
+++ b/app/Http/Controllers/Shop/BasketController.php
@@ -68,7 +68,9 @@ class BasketController extends Controller
 
     public function getBasketTotal($deliveryId = false, $deliveryTypeId = false)
     {
-        $data['basket'] = Baskets::getBasketTotal($deliveryId, $deliveryTypeId);
+        $data = [
+            'basket' => Baskets::getBasketTotal($deliveryId, $deliveryTypeId),
+        ];
 
         return view('Shop.Baskets.partials.basketTotal', $data);
     }
diff --git a/app/Http/Controllers/Shop/CustomerController.php b/app/Http/Controllers/Shop/CustomerController.php
index 1a248a69..ef568e63 100644
--- a/app/Http/Controllers/Shop/CustomerController.php
+++ b/app/Http/Controllers/Shop/CustomerController.php
@@ -18,7 +18,9 @@ class CustomerController extends Controller
 
     public function modalProfile($id = false)
     {
-        $data['customer'] = Customers::get($id);
+        $data = [
+            'customer' => Customers::get($id),
+        ];
 
         return view('Shop.Customers.partials.registration', $data);
     }
@@ -26,7 +28,9 @@ class CustomerController extends Controller
     public function edit()
     {
         $id = Auth::id();
-        $data['customer'] = Customers::edit($id);
+        $data = [
+            'customer' => Customers::edit($id),
+        ];
 
         return view('Shop.Customers.edit', $data);
     }
@@ -42,8 +46,6 @@ class CustomerController extends Controller
     public function store(Request $request)
     {
         $data = $request->all();
-        dump($data);
-        exit;
         $customer = Customers::storeFull($data);
 
         return response()->json(['error' => 0]);
diff --git a/app/Http/Controllers/Shop/InvoiceController.php b/app/Http/Controllers/Shop/InvoiceController.php
index c43db8ff..f65ff8ff 100644
--- a/app/Http/Controllers/Shop/InvoiceController.php
+++ b/app/Http/Controllers/Shop/InvoiceController.php
@@ -23,7 +23,9 @@ class InvoiceController extends Controller
     public function pdf($uuid)
     {
         \Debugbar::disable();
-        $data['invoice'] = Invoices::getByUUID($uuid);
+        $data = [
+            'invoice' => Invoices::getByUUID($uuid),
+        ];
         $filename = 'invoice-'.$uuid.'.pdf';
 
         return PDF::view('Shop.Invoices.pdf', $data, $filename);
diff --git a/app/Http/Controllers/Shop/OrderController.php b/app/Http/Controllers/Shop/OrderController.php
index c45c2bc6..599d3b0a 100644
--- a/app/Http/Controllers/Shop/OrderController.php
+++ b/app/Http/Controllers/Shop/OrderController.php
@@ -24,7 +24,9 @@ class OrderController extends Controller
 
     public function view($uuid)
     {
-        $data['order'] = Orders::view($uuid);
+        $data = [
+            'order' => Orders::view($uuid),
+        ];
 
         return view('Shop.Orders.view', $data);
     }
diff --git a/app/Repositories/Core/Auth/Roles.php b/app/Repositories/Core/Auth/Roles.php
index 8ce4965f..83f00f79 100644
--- a/app/Repositories/Core/Auth/Roles.php
+++ b/app/Repositories/Core/Auth/Roles.php
@@ -41,7 +41,7 @@ class Roles
         return $role;
     }
 
-    public static function toggle_active($id, $active)
+    public static function toggleActive($id, $active)
     {
         return Role::find($id)->update(['active' => $active]);
     }
diff --git a/app/Repositories/Core/Auth/Teams.php b/app/Repositories/Core/Auth/Teams.php
index faf8a2b9..b8495429 100644
--- a/app/Repositories/Core/Auth/Teams.php
+++ b/app/Repositories/Core/Auth/Teams.php
@@ -5,12 +5,12 @@ namespace App\Repositories\Core\Auth;
 use App\Models\Core\Auth\Team;
 use App\Models\Core\Auth\TeamUser;
 use App\Repositories\Users;
+use App\Traits\Model\Basic;
 use Laratrust\Traits\LaratrustUserTrait;
-use Yajra\DataTables\DataTables;
 
 class Teams
 {
-    use LaratrustUserTrait;
+    use Basic, LaratrustUserTrait;
 
     public static function getTeamsByUser($user_id = false)
     {
@@ -34,48 +34,11 @@ class Teams
         return Team::find($id)->users();
     }
 
-    public static function getOptions()
-    {
-        return Team::orderBy('name', 'asc')->get()->pluck('name', 'id')->toArray();
-    }
-
-    public static function getInfo($id)
-    {
-        return Team::find($id);
-    }
-
-    public static function select_all()
-    {
-        return self::getAll()->toArray();
-    }
-
-    public static function select_by_id($id)
-    {
-        return Team::find($id)->toArray();
-    }
-
-    public static function getAll()
-    {
-        return Team::orderBy('name', 'asc')->get();
-    }
-
     public static function getByName($name)
     {
         return Team::where('name', $name)->first();
     }
 
-    public static function get($id)
-    {
-        return Team::find($id);
-    }
-
-    public static function getTable($id)
-    {
-        $datas = Team::with(['societe'])->withCount(['users']);
-
-        return Datatables::of($datas)->make(true);
-    }
-
     public static function delete($id)
     {
         Users::destroyByUniqueTeam($id);
@@ -91,32 +54,8 @@ class Teams
         }
     }
 
-    public static function store($data)
+    public static function getModel()
     {
-        if (isset($data['id']) && $data['id']) {
-            return self::update($data);
-        }
-
-        return self::create($data);
-    }
-
-    public static function create($data)
-    {
-        return Team::create($data);
-    }
-
-    public static function update($data)
-    {
-        return Team::find($data['id'])->update($data);
-    }
-
-    public static function count()
-    {
-        return Team::count();
-    }
-
-    public static function toggle_active($id, $active)
-    {
-        return Team::find($id)->update(['active' => $active]);
+        return Team::query();
     }
 }
diff --git a/app/Repositories/Core/Auth/Users.php b/app/Repositories/Core/Auth/Users.php
index 4ceea498..c33bbe03 100644
--- a/app/Repositories/Core/Auth/Users.php
+++ b/app/Repositories/Core/Auth/Users.php
@@ -5,6 +5,7 @@ namespace App\Repositories\Core\Auth;
 use App\Models\Core\Auth\RoleUser;
 use App\Models\Core\Auth\User;
 use App\Repositories\Core\Upload;
+use App\Traits\Model\Basic;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
@@ -14,7 +15,7 @@ use Laratrust\Traits\LaratrustUserTrait;
 
 class Users
 {
-    use LaratrustUserTrait;
+    use Basic, LaratrustUserTrait;
 
     public static function isAdmin()
     {
@@ -59,22 +60,6 @@ class Users
         return $user;
     }
 
-    public static function update($data, $id = false)
-    {
-        $id = $id ? $id : $data['id'];
-        $user = self::get($id);
-        $ret = $user->update($data);
-
-        return $user;
-    }
-
-    public static function get($id = false)
-    {
-        $id = $id ? $id : self::getId();
-
-        return User::findOrFail($id);
-    }
-
     public static function getId()
     {
         $user = self::getUser();
@@ -206,32 +191,12 @@ class Users
         return User::select('id', DB::raw("concat(last_name,' ',first_name) as name"));
     }
 
-    public static function count()
-    {
-        return User::count();
-    }
-
-    public static function select_all_by_status_id($status_id)
-    {
-        return User::byStatus($status_id);
-    }
-
-    public static function select_by_id($user_id)
-    {
-        return User::with('status')->find($user_id)->toArray();
-    }
-
-    public static function select_by_name($name)
-    {
-        return self::getByName($name)->toArray();
-    }
-
     public static function getByUsername($username)
     {
         return User::byUsername($username)->withTrashed()->first();
     }
 
-    public static function toggle_active($id, $active)
+    public static function toggleActive($id, $active)
     {
         return self::get($id)->update(['active' => $active]);
     }
@@ -249,12 +214,12 @@ class Users
         ];
     }
 
-    public static function update_avatar($id, $avatar)
+    public static function updateAvatar($id, $avatar)
     {
         return User::find($id)->update(['avatar' => $avatar]);
     }
 
-    public static function update_password($id, $password)
+    public static function updatePassword($id, $password)
     {
         $password = Hash::make($password);
 
@@ -265,4 +230,9 @@ class Users
     {
         return PasswordRules::changePassword($username, $field);
     }
+
+    public static function getModel()
+    {
+        return User::query();
+    }
 }
diff --git a/app/Repositories/Shop/Deliveries.php b/app/Repositories/Shop/Deliveries.php
index 250f680a..49ed10bf 100644
--- a/app/Repositories/Shop/Deliveries.php
+++ b/app/Repositories/Shop/Deliveries.php
@@ -44,7 +44,7 @@ class Deliveries
         return Delivery::orderBy('name', 'asc')->active()->public()->with('sale_channel')->get();
     }
 
-    public static function toggle_active($id, $active)
+    public static function toggleActive($id, $active)
     {
         return self::update(['active' => $active], $id);
     }
diff --git a/app/Repositories/Shop/Offers.php b/app/Repositories/Shop/Offers.php
index f07295aa..85fd15bf 100644
--- a/app/Repositories/Shop/Offers.php
+++ b/app/Repositories/Shop/Offers.php
@@ -141,7 +141,7 @@ class Offers
         return Offer::with(['article.tags'])->byTags($tags)->get();
     }
 
-    public static function toggle_active($id, $status_id)
+    public static function toggleActive($id, $status_id)
     {
         return self::update(['status_id' => $status_id], $id);
     }
diff --git a/app/Repositories/Shop/Packages.php b/app/Repositories/Shop/Packages.php
index 2c493090..26b4d640 100644
--- a/app/Repositories/Shop/Packages.php
+++ b/app/Repositories/Shop/Packages.php
@@ -9,6 +9,13 @@ class Packages
 {
     use Basic;
 
+    public static function init()
+    {
+        return [
+            'families' => ArticleNatures::getOptions(),
+        ];
+    }
+
     public static function getOptions()
     {
         return Package::orderBy('value', 'asc')->pluck('value', 'id')->toArray();
diff --git a/app/Repositories/Shop/PriceListValues.php b/app/Repositories/Shop/PriceListValues.php
index 67c16eda..b96fd450 100644
--- a/app/Repositories/Shop/PriceListValues.php
+++ b/app/Repositories/Shop/PriceListValues.php
@@ -10,6 +10,15 @@ class PriceListValues
 {
     use Basic;
 
+    public static function init()
+    {
+        return [
+            'unities' => Unities::getOptions(),
+            'taxes_options' => Taxes::getOptions(),
+            'categories' => PriceListValueCategories::getOptions(),
+        ];
+    }
+
     public static function getPriceByOffer($offer_id, $quantity = 1, $sale_channel_id = false)
     {
         $prices = self::getPricesByOffer($offer_id, $sale_channel_id);
diff --git a/app/Repositories/Shop/Shelves.php b/app/Repositories/Shop/Shelves.php
index 65792270..0e028208 100644
--- a/app/Repositories/Shop/Shelves.php
+++ b/app/Repositories/Shop/Shelves.php
@@ -6,25 +6,11 @@ class Shelves
 {
     public static function getOffersByCategoryAndNature($categoryId, $articleNatureId = false, $tags = [], $articleNature = false, $displayByRows = false)
     {
-        $productTypes = Articles::getProductTypesWithOffers([
-            'category_id' => $categoryId,
-        ]);
-
-        $articleNatures = Articles::getArticleNaturesWithOffers([
-            'category_id' => $categoryId,
-        ]);
-
-        if ($articleNatureId) {
-            $productType = ArticleNatures::getProductType($articleNatureId);
-        } else {
-            if (! $articleNature) {
-                if (count($articleNatures)) {
-                    $articleNature = $articleNatures[0];
-                }
-            }
-            $productType = ArticleNatures::getProductTypeBySlug($articleNature);
-            $articleNatureId = ArticleNatures::getIdBySlug($articleNature);
-        }
+        $articleNatures = Articles::getArticleNaturesWithOffers(['category_id' => $categoryId]);
+        $productType = self::getProductType($articleNature, $articleNatures);
+        $articleNatureId = $articleNatureId ?
+            $articleNatureId :
+            self::getArticleNatureId($articleNature, $articleNatures);
 
         return [
             'category' => Categories::getFull($categoryId),
@@ -33,7 +19,7 @@ class Shelves
             'product_type' => $productType,
             'article_nature' => $articleNature,
             'article_natures' => $articleNatures ?? [],
-            'product_types' => $productTypes ?? [],
+            'product_types' => Articles::getProductTypesWithOffers(['category_id' => $categoryId]),
             'tags_selected' => $tags,
             'articles' => Articles::getArticlesToSell([
                 'category_id' => $categoryId,
@@ -44,4 +30,27 @@ class Shelves
             'tags' => TagGroups::getWithTagsAndCountOffers($categoryId),
         ];
     }
+
+    public static function getArticleNatureId($articleNature, $articleNatures = [])
+    {
+        if (! $articleNature && count($articleNatures)) {
+            $articleNature = $articleNatures[0];
+        }
+
+        return ArticleNatures::getIdBySlug($articleNature);
+    }
+
+    public static function getProductType($articleNatureId, $articleNature, $articleNatures = [])
+    {
+        if ($articleNatureId) {
+            $productType = ArticleNatures::getProductType($articleNatureId);
+        } else {
+            if (! $articleNature && count($articleNatures)) {
+                $articleNature = $articleNatures[0];
+            }
+            $productType = ArticleNatures::getProductTypeBySlug($articleNature);
+        }
+
+        return $productType;
+    }
 }
diff --git a/routes/Admin/Shop/PriceListValues.php b/routes/Admin/Shop/PriceListValues.php
deleted file mode 100644
index 41f7b9f4..00000000
--- a/routes/Admin/Shop/PriceListValues.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-Route::prefix('PriceListValues')->name('PriceListValues.')->group(function () {
-    Route::get('', 'PriceListValueController@index')->name('index');
-    Route::get('create', 'PriceListValueController@create')->name('create');
-    Route::delete('destroy/{id?}', 'PriceListValueController@destroy')->name('destroy');
-    Route::post('store', 'PriceListValueController@store')->name('store');
-    Route::get('edit/{id}', 'PriceListValueController@edit')->name('edit');
-    Route::get('addPrice/{index?}', 'PriceListValueController@addPrice')->name('addPrice');
-});
diff --git a/routes/Admin/Shop/route.php b/routes/Admin/Shop/route.php
index d02bd05b..e8cb595c 100644
--- a/routes/Admin/Shop/route.php
+++ b/routes/Admin/Shop/route.php
@@ -19,7 +19,6 @@ Route::middleware('auth')->prefix('Shop')->namespace('Shop')->name('Shop.')->gro
     include_once __DIR__.'/Orders.php';
     include_once __DIR__.'/Packages.php';
     include_once __DIR__.'/PriceLists.php';
-    include_once __DIR__.'/PriceListValues.php';
     include_once __DIR__.'/Producers.php';
     include_once __DIR__.'/SaleChannels.php';
     include_once __DIR__.'/Tags.php';