fixes

app/Datatables/Admin/Shop/CustomerAddressesDataTable.php

@@ -17,9 +17,19 @@ class CustomerAddressesDataTable extends DataTable
 
     public function query(CustomerAddress $model)
     {
+        $model = self::filterByCustomer($model);
+        
         return $this->buildQuery($model);
     }
 
+    public static function filterByCustomer($model, $customerId = false)
+    {
+        $customerId = $customerId ? $customerId : self::isFilteredByField('customer_id');
+
+        return $customerId ? $model->byCustomer($customerId) : $model;
+    }
+
+
     protected function getColumns()
     {
         return [

app/Http/Controllers/Admin/Core/Mail/MailLogController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Core\Mail;
+
+use App\Datatables\Admin\Core\Mail\MailLogsDataTable;
+use App\Repositories\Core\Mail\MailLogs;
+
+class MailLogController extends Controller
+{
+    public function __construct()
+    {
+        // $this->middleware('ability:admin');
+    }
+
+    public function index(MailLogsDataTable $dataTable)
+    {
+        return $dataTable->render('admin.Core.Mail.MailLog.index', $data ?? []);
+    }
+
+    public function show($id)
+    {
+        $data['message'] = MailLogs::getParsed($id);
+
+        return view('admin.Core.Mail.MailLog.modal', $data);
+    }
+}

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

@@ -10,7 +10,7 @@ class CustomerAddressController extends Controller
 {
     public function index(CustomerAddressesDataTable $dataTable)
     {
-        return $dataTable->render('Admin.Shop.Customers.list');
+        return $dataTable->render('Admin.Shop.CustomerAddresses.list');
     }
 
     public function create()

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Shop;
+
+use App\Http\Controllers\Controller;
+use App\Repositories\Shop\Dashboards;
+use Illuminate\Http\Request;
+
+class DashboardController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function index(Request $request)
+    {
+        $data = $request->all();
+        $data = Dashboards::getStats($data);
+        dump($data);
+
+        return view('Admin.Shop.Dashboard.index', $data);
+    }
+}

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

@@ -0,0 +1,75 @@
+<?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);
+    }
+}

app/Http/Controllers/Shop/Auth/RegisterController.php

@@ -3,24 +3,35 @@
 namespace App\Http\Controllers\Shop\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Shop\RegisterCustomer;
 use App\Repositories\Shop\CustomerAddresses;
 use App\Repositories\Shop\Customers;
 use Illuminate\Foundation\Auth\EmailVerificationRequest;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Sebastienheyd\Boilerplate\Rules\Password;
+
 
 class RegisterController extends Controller
 {
     protected $redirectTo;
 
-    public function showRegistrationForm()
+    public function showRegistrationForm(Request $request)
     {
-        return view('Shop.auth.register');
+        return view('Shop.auth.register', ['customer' => $request->old()]);
     }
 
-    public function register(Request $request)
+    public function register(RegisterCustomer $request)
     {
+        $validatedData = $request->validateWithBag('Errors', [
+            'last_name' => 'required|max:255',
+            'first_name' => 'required|max:255',
+            'email' => 'required|email|max:255|unique:shop_customers,email,NULL,id,deleted_at,NULL',
+            'password' => ['required', 'confirmed', new Password()],
+
+        ]);
+    
         $user = $this->create($request->all());
 
         $this->guard()->login($user);
@@ -34,7 +45,7 @@ class RegisterController extends Controller
 
         return $request->wantsJson()
             ? new JsonResponse([], 201)
-            : redirect($this->redirectPath());
+            : redirect('home');
     }
 
     public function emailVerify()

app/Repositories/Core/Auth/Users.php

@@ -10,7 +10,6 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
-use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
 use Laratrust\Traits\LaratrustUserTrait;
 
 class Users
@@ -113,32 +112,6 @@ class Users
         return $user ? $user->hasRole($role) : false;
     }
 
-    public static function hasPermission($permission, $user = false)
-    {
-        if (self::isAdmin()) {
-            return true;
-        }
-        $user = $user ? $user : self::getUser();
-        $permissions = self::getPermissions($user);
-
-        return $user ? self::checkPermission($permissions, $permission) : false;
-    }
-
-    public static function checkPermission($permissions, $permission)
-    {
-        if (! strpos($permission, '*')) {
-            return in_array($permission, $permissions);
-        }
-        $permission = str_replace('*', '', $permission);
-        foreach ($permissions as $item) {
-            if (stripos($item, $permission) !== false) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     public static function getRoles($user = false)
     {
         $user = $user ? $user : self::getUser();
@@ -146,33 +119,6 @@ class Users
         return $user ? $user->roles->pluck('name')->toArray() : false;
     }
 
-    public static function getRolesToEdit()
-    {
-        return Roles::getListByRights();
-    }
-
-    public static function getPermissions($user = false)
-    {
-        $user = $user ? $user : self::getUser();
-
-        return $user ? $user->allPermissions()->pluck('name')->toArray() : false;
-    }
-
-    public static function getByTeam($id)
-    {
-        return User::byTeam($id)->get();
-    }
-
-    public static function getByUniqueTeam($id)
-    {
-        return User::byTeam($id)->byUniqueTeam()->get();
-    }
-
-    public static function destroyByUniqueTeam($id)
-    {
-        return User::byTeam($id)->byUniqueTeam()->delete();
-    }
-
     public static function getAvatar($user_id)
     {
         $avatar = self::get($user_id)->avatar;
@@ -224,11 +170,6 @@ class Users
         return User::find($id)->update(['password' => $password]);
     }
 
-    public static function validate($username, $field = 'current_password')
-    {
-        return PasswordRules::changePassword($username, $field);
-    }
-
     public static function getModel()
     {
         return User::query();