diff --git a/app/Http/Controllers/Api/AuthController.php b/app/Http/Controllers/Api/AuthController.php
index 63e8a5d..13d67c6 100755
--- a/app/Http/Controllers/Api/AuthController.php
+++ b/app/Http/Controllers/Api/AuthController.php
@@ -30,8 +30,7 @@ class AuthController extends Controller
                 $response = [
                     "success" => false,
                     "code" => 400,
-                    "msg" =>
-                        "Your account is inactive, please contact the Administrator.",
+                    "msg" => "Your account is inactive, please contact the Administrator.",
                 ];
             }
 
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 9cdf98f..1c7f352 100755
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -51,56 +51,72 @@ class LoginController extends Controller
         return "email";
     }
 
+    // public function login(Request $req)
+    // {
+    //     $this->validateLogin($req);
+
+    //     if (method_exists($this, "hasTooManyLoginAttempts") && $this->hasTooManyLoginAttempts($req)) {
+    //         $this->fireLockoutEvent($req);
+
+    //         return $this->sendLockoutResponse($req);
+    //     }
+
+    //     if ($this->guard()->validate($this->credentials($req))) {
+    //         $user = $this->guard()->getLastAttempted();
+
+    //         if ($user->dlt != null) {
+    //             $this->incrementLoginAttempts($req);
+    //             throw ValidationException::withMessages([
+    //                 $this->username() => [trans("auth.failed")],
+    //             ]);
+    //         }
+    //         if ($user->status != Users::STATUS_ACTIVE) {
+    //             $this->incrementLoginAttempts($req);
+
+    //             throw ValidationException::withMessages([
+    //                 $this->username() => __("Your account not active, please contact admin."),
+    //             ]);
+    //         }
+
+    //         if ($this->attemptLogin($req)) {
+    //             return $this->sendLoginResponse($req);
+    //         }
+    //     }
+
+    //     $this->incrementLoginAttempts($req);
+
+    //     return $this->sendFailedLoginResponse($req);
+    // }
     public function login(Request $req)
     {
         $this->validateLogin($req);
 
-        // If the class is using the ThrottlesLogins trait, we can automatically throttle
-        // the login attempts for this application. We'll key this by the username and
-        // the IP address of the client making these requests into this application.
-        if (
-            method_exists($this, "hasTooManyLoginAttempts") &&
-            $this->hasTooManyLoginAttempts($req)
-        ) {
+        if (method_exists($this, "hasTooManyLoginAttempts") && $this->hasTooManyLoginAttempts($req)) {
             $this->fireLockoutEvent($req);
-
             return $this->sendLockoutResponse($req);
         }
 
-        if ($this->guard()->validate($this->credentials($req))) {
-            $user = $this->guard()->getLastAttempted();
-            if ($user->dlt != null) {
-                $this->incrementLoginAttempts($req);
-                throw ValidationException::withMessages([
-                    $this->username() => [trans("auth.failed")],
-                ]);
-            }
-            if ($user->status != Users::STATUS_ACTIVE) {
-                // Increment the failed login attempts and redirect back to the
-                // login form with an error message.
-                $this->incrementLoginAttempts($req);
-                // return redirect()
-                //     ->back()
-                //     ->withInput($req->only($this->username(), 'remember'))
-                //     ->withErrors(['active' => 'You must be active to login.']);
-                throw ValidationException::withMessages([
-                    $this->username() => __(
-                        "Your account not active, please contact admin."
-                    ),
-                ]);
-            }
+        // Cari user yang belum dihapus (dlt == null)
+        $user = Users::where("email", $req->email)
+            ->whereNull("dlt")
+            ->first();
 
-            if ($this->attemptLogin($req)) {
-                return $this->sendLoginResponse($req);
-            }
+        if (!$user || !\Hash::check($req->password, $user->password)) {
+            $this->incrementLoginAttempts($req);
+            return $this->sendFailedLoginResponse($req);
         }
 
-        // If the login attempt was unsuccessful we will increment the number of attempts
-        // to login and redirect the user back to the login form. Of course, when this
-        // user surpasses their maximum number of attempts they will get locked out.
-        $this->incrementLoginAttempts($req);
+        if ($user->status != Users::STATUS_ACTIVE) {
+            $this->incrementLoginAttempts($req);
+            throw ValidationException::withMessages([
+                $this->username() => __("Your account not active, please contact admin."),
+            ]);
+        }
 
-        return $this->sendFailedLoginResponse($req);
+        // Login manual
+        $this->guard()->login($user);
+
+        return $this->sendLoginResponse($req);
     }
 
     protected function validateLogin(Request $req)
@@ -139,9 +155,7 @@ class LoginController extends Controller
             } elseif ($user->role == Users::ROLE_CHECKER) {
                 return redirect(route("view_user_checker"));
             } elseif ($user->role == Users::ROLE_CLIENT_ADMIN) {
-                return redirect(
-                    route("view_user_client_transaction_add") . "?rdl=1"
-                );
+                return redirect(route("view_user_client_transaction_add") . "?rdl=1");
             } elseif ($user->role == Users::ROLE_SPECIAL_TRACKING) {
                 return redirect(route("view_dashboard"));
             } elseif ($user->role == Users::ROLE_FINANCE) {
@@ -166,9 +180,7 @@ class LoginController extends Controller
             if ($response = $this->loggedOut($req)) {
                 return $response;
             }
-            return $req->wantsJson()
-                ? new JsonResponse([], 204)
-                : redirect(route("login_admin"));
+            return $req->wantsJson() ? new JsonResponse([], 204) : redirect(route("login_admin"));
         } elseif ($user->role == Users::ROLE_FINANCE) {
             $this->guard()->logout();
             $req->session()->invalidate();
@@ -176,9 +188,7 @@ class LoginController extends Controller
             if ($response = $this->loggedOut($req)) {
                 return $response;
             }
-            return $req->wantsJson()
-                ? new JsonResponse([], 204)
-                : redirect(route("login_admin"));
+            return $req->wantsJson() ? new JsonResponse([], 204) : redirect(route("login_admin"));
         } elseif ($user->role == Users::ROLE_VENDOR) {
             $this->guard()->logout();
             $req->session()->invalidate();
@@ -186,9 +196,7 @@ class LoginController extends Controller
             if ($response = $this->loggedOut($req)) {
                 return $response;
             }
-            return $req->wantsJson()
-                ? new JsonResponse([], 204)
-                : redirect(route("login_vendor"));
+            return $req->wantsJson() ? new JsonResponse([], 204) : redirect(route("login_vendor"));
         } elseif ($user->role == Users::ROLE_CHECKER) {
             $this->guard()->logout();
             $req->session()->invalidate();
@@ -196,9 +204,7 @@ class LoginController extends Controller
             if ($response = $this->loggedOut($req)) {
                 return $response;
             }
-            return $req->wantsJson()
-                ? new JsonResponse([], 204)
-                : redirect(route("login_checker"));
+            return $req->wantsJson() ? new JsonResponse([], 204) : redirect(route("login_checker"));
         } elseif ($user->role == Users::ROLE_CLIENT_ADMIN) {
             $this->guard()->logout();
             $req->session()->invalidate();
@@ -206,9 +212,7 @@ class LoginController extends Controller
             if ($response = $this->loggedOut($req)) {
                 return $response;
             }
-            return $req->wantsJson()
-                ? new JsonResponse([], 204)
-                : redirect(route("login_client"));
+            return $req->wantsJson() ? new JsonResponse([], 204) : redirect(route("login_client"));
         } elseif ($user->role == Users::ROLE_SPECIAL_TRACKING) {
             $this->guard()->logout();
             $req->session()->invalidate();
@@ -216,9 +220,7 @@ class LoginController extends Controller
             if ($response = $this->loggedOut($req)) {
                 return $response;
             }
-            return $req->wantsJson()
-                ? new JsonResponse([], 204)
-                : redirect(route("login_admin"));
+            return $req->wantsJson() ? new JsonResponse([], 204) : redirect(route("login_admin"));
         }
     }
 }
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 4c61c6a..eb439a1 100755
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -13,69 +13,69 @@ use App\Models\Users;
 
 class AuthController extends Controller
 {
-	// public function view_login(Request $req)
-	// {
-	// 	return 'Do login';
-	// }
-	public function view_login_admin(Request $req)
-	{
-		return view('auth.loginAdmin');
-	}
-	public function view_login_client(Request $req)
-	{
-		return view('auth.loginClient');
-	}
-	public function view_login_vendor(Request $req)
-	{
-		return view('auth.loginVendor');
-	}
-	public function view_login_checker(Request $req)
-	{
-		return view('auth.loginChecker');
-	}
+    // public function view_login(Request $req)
+    // {
+    // 	return 'Do login';
+    // }
+    public function view_login_admin(Request $req)
+    {
+        return view("auth.loginAdmin");
+    }
+    public function view_login_client(Request $req)
+    {
+        return view("auth.loginClient");
+    }
+    public function view_login_vendor(Request $req)
+    {
+        return view("auth.loginVendor");
+    }
+    public function view_login_checker(Request $req)
+    {
+        return view("auth.loginChecker");
+    }
 
-	public function api_login(Request $req)
-	{
-		try {
-			$now = time();
+    public function api_login(Request $req)
+    {
+        try {
+            $now = time();
 
-			$input = [
-				'password' => $req->password,
-			];
-			$rulesInput = [
-				'password' => 'required|string',
-			];
+            $input = [
+                "password" => $req->password,
+            ];
+            $rulesInput = [
+                "password" => "required|string",
+            ];
 
-			if ($req->email) {
-				$input['email'] = $req->email;
-				$rulesInput['email'] = 'required|email';
-			}
-			if ($req->phone) {
-				$input['phone'] = $req->phone;
-				$rulesInput['phone'] = 'required|integer';
-			}
+            if ($req->email) {
+                $input["email"] = $req->email;
+                $rulesInput["email"] = "required|email";
+            }
+            if ($req->phone) {
+                $input["phone"] = $req->phone;
+                $rulesInput["phone"] = "required|integer";
+            }
 
-			// validasi input
-			$isValidInput = Validator::make($input, $rulesInput);
-			if (!$isValidInput->passes()) {
-				$apiResp = Responses::bad_input($isValidInput->messages()->first());
-				return new Response($apiResp, $apiResp['meta']['code']);
-			}
+            // validasi input
+            $isValidInput = Validator::make($input, $rulesInput);
+            if (!$isValidInput->passes()) {
+                $apiResp = Responses::bad_input($isValidInput->messages()->first());
+                return new Response($apiResp, $apiResp["meta"]["code"]);
+            }
 
-			$getUser = Users::getUserByEmail($req->email);
-			if (count($getUser) < 1) {
-				$getUser = Users::getUserByPhone($req->phone);
-				if (count($getUser) < 1) {
-					$apiResp = Responses::not_found('akun tidak ditemukan');
-					return (new Response($apiResp, $apiResp['meta']['code']));
-				}
-			}
+            $getUser = Users::getUserByEmail($req->email);
+            if (count($getUser) < 1) {
+                $getUser = Users::getUserByPhone($req->phone);
+                if (count($getUser) < 1) {
+                    $apiResp = Responses::not_found("akun tidak ditemukan");
+                    return new Response($apiResp, $apiResp["meta"]["code"]);
+                }
+            }
 
-			$apiResp = Responses::success('sukses login');
-			return (new Response($apiResp, $apiResp['meta']['code']));
-		} catch (\Exception $e) {
-			$apiResp = Responses::error($e->getMessage());
-			return (new Response($apiResp, $apiResp['meta']['code']));
-		}
-	}
+            $apiResp = Responses::success("sukses login");
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        } catch (\Exception $e) {
+            $apiResp = Responses::error($e->getMessage());
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        }
+    }
 }
diff --git a/app/Http/Controllers/RolesController.php b/app/Http/Controllers/RolesController.php
new file mode 100755
index 0000000..8e11a19
--- /dev/null
+++ b/app/Http/Controllers/RolesController.php
@@ -0,0 +1,287 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
+use Validator;
+use App\Responses;
+use App\Helper;
+use App\Models\Users;
+use App\Models\Clients;
+use App\Models\Vehicles;
+use App\Models\Banks;
+use App\Models\UsersMenuPermissions;
+
+class RolesController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function view(Request $req)
+    {
+        $permissions = \Spatie\Permission\Models\Permission::all();
+
+        $data = [
+            "roles" => Users::listRoles($req->auth->role),
+            "pernus" => UsersMenuPermissions::listPermissionsMenus([
+                "is_active" => UsersMenuPermissions::IS_ACTIVE,
+            ]),
+            "vehicles" => Vehicles::getVehicles(),
+            "banks" => Banks::listBanks(["is_active" => Banks::IS_ACTIVE]),
+            "permission" => $permissions->groupBy(function ($perm) {
+                return explode(".", $perm->name)[0]; // ambil modul: user, transaction, dst
+            }),
+        ];
+
+        return view("menu_v1.roles", $data);
+    }
+
+    /**
+     * API
+     */
+
+    public function api_list(Request $req)
+    {
+        try {
+            $list = DB::table("roles")->get();
+            foreach ($list as $key => $row) {
+                $list[$key]->DT_RowIndex = $key + 1;
+                $list[$key]->count_trx = 0;
+                $list[$key]->action = "-";
+            }
+
+            $apiResp = Responses::success("success list users");
+            $apiResp["data"] = $list;
+            $apiResp["count"] = count($list);
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        } catch (\Exception $e) {
+            $apiResp = Responses::error($e->getMessage());
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        }
+    }
+
+    public function api_show(Request $req, $uid)
+    {
+        try {
+            $now = time();
+
+            $input = [
+                "uid" => $uid,
+            ];
+            $rulesInput = [
+                "uid" => "required|integer|not_in:0",
+            ];
+
+            // validasi input
+            $isValidInput = Validator::make($input, $rulesInput);
+            if (!$isValidInput->passes()) {
+                $apiResp = Responses::bad_input($isValidInput->messages()->first());
+                return new Response($apiResp, $apiResp["meta"]["code"]);
+            }
+
+            $role = DB::table("roles")
+                ->where("roles.id", $uid)
+                ->get();
+
+            if (count($role) < 1) {
+                $apiResp = Responses::not_found("role not found");
+                return new Response($apiResp, $apiResp["meta"]["code"]);
+            }
+
+            $permissions = DB::table("role_has_permissions")
+                ->where("role_id", $uid)
+                ->pluck("permission_id") // ambil array [1, 6, ...]
+                ->toArray();
+            $role[0]->permissions = $permissions;
+
+            $apiResp = Responses::success("success get detail role");
+            $apiResp["data"] = $role[0];
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        } catch (\Exception $e) {
+            $apiResp = Responses::error($e->getMessage());
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        }
+    }
+
+    public function api_add(Request $req)
+    {
+        try {
+            DB::beginTransaction();
+            // Users::addUser($data);
+
+            $role_id = DB::table("roles")->insertGetId([
+                "name" => $req->name,
+                "guard_name" => "web",
+                "created_at" => date("Y-m-d H:i:s"),
+                "updated_at" => date("Y-m-d H:i:s"),
+            ]);
+
+            $role_has_permissions = [];
+            foreach ($req->permissions as $_permission) {
+                array_push($role_has_permissions, ["permission_id" => $_permission, "role_id" => $role_id]);
+            }
+
+            DB::table("role_has_permissions")->insert($role_has_permissions);
+
+            $apiResp = Responses::created("success add new role");
+            DB::commit();
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            $apiResp = Responses::error($e->getMessage());
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        }
+    }
+
+    public function api_edit(Request $req)
+    {
+        try {
+            DB::beginTransaction();
+
+            DB::table("roles")
+                ->where("id", $req->uid)
+                ->update([
+                    "name" => $req->name, // ganti sesuai field yang mau diubah
+                    "updated_at" => now(),
+                ]);
+
+            DB::table("role_has_permissions")
+                ->where("role_id", $req->uid)
+                ->delete();
+
+            $role_has_permissions = [];
+            foreach ($req->permissions as $pid) {
+                $role_has_permissions[] = [
+                    "role_id" => $req->uid,
+                    "permission_id" => $pid,
+                ];
+            }
+            DB::table("role_has_permissions")->insert($role_has_permissions);
+
+            $apiResp = Responses::created("success update role");
+
+            DB::commit();
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            $apiResp = Responses::error($e->getMessage());
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        }
+    }
+
+    public function api_del(Request $req)
+    {
+        try {
+            $now = time();
+
+            $input = [
+                "uid" => $req->uid,
+            ];
+            $rulesInput = [
+                "uid" => "required|integer|not_in:0",
+            ];
+            $data = [
+                "id" => $req->uid,
+            ];
+
+            // validasi input
+            $isValidInput = Validator::make($input, $rulesInput);
+            if (!$isValidInput->passes()) {
+                $apiResp = Responses::bad_input($isValidInput->messages()->first());
+                return new Response($apiResp, $apiResp["meta"]["code"]);
+            }
+
+            $role = DB::table("roles")
+                ->where("id", $req->uid)
+                ->get();
+            if (count($role) < 1) {
+                $apiResp = Responses::not_found("user not found");
+                return new Response($apiResp, $apiResp["meta"]["code"]);
+            }
+
+            DB::beginTransaction();
+
+            DB::table("role_has_permissions")
+                ->where("role_id", $req->uid)
+                ->delete();
+
+            DB::table("roles")
+                ->where("id", $req->uid)
+                ->delete();
+
+            $apiResp = Responses::created("success delete role");
+
+            DB::commit();
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            $apiResp = Responses::error($e->getMessage());
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        }
+    }
+
+    public function api_search(Request $req)
+    {
+        try {
+            $now = time();
+            $roles = Users::arrRoles();
+            $statuses = Users::arrStatus();
+
+            $input = [
+                "name" => $req->name,
+                "roles" => $req->roles,
+            ];
+            $rulesInput = [
+                "name" => "required|string|max:125",
+                "roles" => "nullable|integer|not_in:0",
+            ];
+
+            // validasi input
+            $isValidInput = Validator::make($input, $rulesInput);
+            if (!$isValidInput->passes()) {
+                $apiResp = Responses::bad_input($isValidInput->messages()->first());
+                return new Response($apiResp, $apiResp["meta"]["code"]);
+            }
+
+            if ($req->roles) {
+                if (in_array($req->roles, $roles)) {
+                } else {
+                    $apiResp = Responses::bad_request("role not valid");
+                    return new Response($apiResp, $apiResp["meta"]["code"]);
+                }
+                $users = Users::likeName($req->name, $req->roles);
+            } else {
+                $users = Users::likeName($req->name);
+            }
+
+            if (count($users) < 1) {
+                $apiResp = Responses::not_found("user not found");
+                return new Response($apiResp, $apiResp["meta"]["code"]);
+            }
+
+            foreach ($users as $k => $v) {
+                // remove from array but no reindex array
+                // unset($users[$k]);
+                // remove from array and reindex array
+                // array_splice($users, $k, 1);
+                unset($users[$k]->password);
+            }
+
+            $apiResp = Responses::success("success search user by name");
+            $apiResp["data"] = $users;
+
+            DB::commit();
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            $apiResp = Responses::error($e->getMessage());
+            return new Response($apiResp, $apiResp["meta"]["code"]);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index 560f8b8..4904203 100755
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -25,8 +25,16 @@ class UsersController extends Controller
      */
     public function view_users(Request $req)
     {
+        if (
+            !auth()
+                ->user()
+                ->can("user.view")
+        ) {
+            abort(403, "Unauthorized");
+        }
         $data = [
-            "roles" => Users::listRoles($req->auth->role),
+            // "roles" => Users::listRoles($req->auth->role),
+            "roles" => DB::table("roles")->get(),
             "pernus" => UsersMenuPermissions::listPermissionsMenus([
                 "is_active" => UsersMenuPermissions::IS_ACTIVE,
             ]),
@@ -48,7 +56,7 @@ class UsersController extends Controller
     public function view_profile(Request $req)
     {
         $data = [
-            "roles" => Users::listRoles($req->auth->role),
+            "roles" => DB::table("roles")->get(),
             "pernus" => UsersMenuPermissions::listPermissionsMenus([
                 "is_active" => UsersMenuPermissions::IS_ACTIVE,
             ]),
@@ -304,7 +312,15 @@ class UsersController extends Controller
 
             DB::beginTransaction();
 
-            Users::addUser($data);
+            $user_id = Users::addUser($data);
+
+            if ($req->roles) {
+                DB::table("model_has_roles")->insert([
+                    "role_id" => $req->roles,
+                    "model_type" => "App\\User", // atau 'App\User' tergantung struktur kamu
+                    "model_id" => $user_id, // ID user-nya
+                ]);
+            }
 
             $apiResp = Responses::created("success add new user");
 
@@ -529,10 +545,24 @@ class UsersController extends Controller
             $data["updt"] = $now;
             $data["updt_by"] = $req->auth->uid;
 
+            $data["role"] = 2;
+
             DB::beginTransaction();
 
             Users::updateUser($req->uid, $data);
 
+            DB::table("model_has_roles")
+                ->where("model_id", $req->uid)
+                ->delete();
+
+            if ($req->roles) {
+                DB::table("model_has_roles")->insert([
+                    "role_id" => $req->roles,
+                    "model_type" => "App\\User", // atau 'App\User' tergantung struktur kamu
+                    "model_id" => $req->uid, // ID user-nya
+                ]);
+            }
+
             $apiResp = Responses::created("success update user");
 
             DB::commit();
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index c87e22c..f0c380a 100755
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -29,7 +29,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middlewareGroups = [
-        'web' => [
+        "web" => [
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
@@ -39,10 +39,7 @@ class Kernel extends HttpKernel
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
-        'api' => [
-            'throttle:60,1',
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        ],
+        "api" => ["throttle:60,1", \Illuminate\Routing\Middleware\SubstituteBindings::class],
     ];
 
     /**
@@ -53,16 +50,19 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'auth.user' => \App\Http\Middleware\AuthUser::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
-        'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        "auth" => \App\Http\Middleware\Authenticate::class,
+        "auth.basic" => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        "auth.user" => \App\Http\Middleware\AuthUser::class,
+        "bindings" => \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        "cache.headers" => \Illuminate\Http\Middleware\SetCacheHeaders::class,
+        "can" => \Illuminate\Auth\Middleware\Authorize::class,
+        "guest" => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        "password.confirm" => \Illuminate\Auth\Middleware\RequirePassword::class,
+        "signed" => \Illuminate\Routing\Middleware\ValidateSignature::class,
+        "throttle" => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        "verified" => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        "permission" => \Spatie\Permission\Middleware\PermissionMiddleware::class,
+        "role" => \Spatie\Permission\Middleware\RoleMiddleware::class,
+        "role_or_permission" => \Spatie\Permission\Middleware\RoleOrPermissionMiddleware::class,
     ];
-}
+}
\ No newline at end of file
diff --git a/app/Http/Middleware/AuthUser.php b/app/Http/Middleware/AuthUser.php
index 1f49a5a..bae71a1 100755
--- a/app/Http/Middleware/AuthUser.php
+++ b/app/Http/Middleware/AuthUser.php
@@ -22,225 +22,225 @@ class AuthUser
         $request->auth = Auth::user();
         $request->auth->uid = $request->auth->id;
 
-        if ($request->auth->role == Users::ROLE_ADMIN) {
-            // views
-            if ($request->is("home/*")) {
-            } elseif ($request->is("home")) {
-            } elseif ($request->is("dashboard/*")) {
-            } elseif ($request->is("dashboard")) {
-            } elseif ($request->is("drivers/*")) {
-            } elseif ($request->is("drivers")) {
-            } elseif ($request->is("transactions/*")) {
-            } elseif ($request->is("transactions")) {
-            } elseif ($request->is("vehicles/*")) {
-            } elseif ($request->is("vehicles")) {
-            } elseif ($request->is("clients/*")) {
-            } elseif ($request->is("clients")) {
-            } elseif ($request->is("zone/*")) {
-            } elseif ($request->is("zone")) {
-            } elseif ($request->is("users/*")) {
-            } elseif ($request->is("users")) {
-            } elseif ($request->is("profile/*")) {
-            } elseif ($request->is("profile")) {
-            } elseif ($request->is("config/*")) {
-            } elseif ($request->is("config")) {
-            } elseif ($request->is("pocket/*")) {
-            } elseif ($request->is("pocket")) {
-            } elseif ($request->is("lgb_types/*")) {
-            } elseif ($request->is("lgb_types")) {
-            } elseif ($request->is("lgb_masters/*")) {
-            } elseif ($request->is("lgb_masters")) {
-            } elseif ($request->is("insurances/*")) {
-            } elseif ($request->is("static_insurances/*")) {
-            }
-            // api
-            elseif ($request->is("api/conf/*")) {
-            } elseif ($request->is("api/conf")) {
-            } elseif ($request->is("api/osm/*")) {
-            } elseif ($request->is("api/osm")) {
-            } elseif ($request->is("api/region/*")) {
-            } elseif ($request->is("api/region")) {
-            } elseif ($request->is("api/zones/*")) {
-            } elseif ($request->is("api/zones")) {
-            } elseif ($request->is("api/vehicles/*")) {
-            } elseif ($request->is("api/vehicles")) {
-            } elseif ($request->is("api/drivers/*")) {
-            } elseif ($request->is("api/drivers")) {
-            } elseif ($request->is("api/users/*")) {
-            } elseif ($request->is("api/users")) {
-            } elseif ($request->is("api/clients/*")) {
-            } elseif ($request->is("api/clients")) {
-            } elseif ($request->is("api/tracks/*")) {
-            } elseif ($request->is("api/tracks")) {
-            } elseif ($request->is("api/transactions/*")) {
-            } elseif ($request->is("api/transactions")) {
-            } elseif ($request->is("api/transactions_spc/*")) {
-            } elseif ($request->is("api/transactions_spc")) {
-            } elseif ($request->is("api/insurances/*")) {
-            } elseif ($request->is("api/insurances")) {
-            } elseif ($request->is("api/devices/*")) {
-            } elseif ($request->is("api/devices")) {
-            } elseif ($request->is("api/user/clients/*")) {
-            } elseif ($request->is("api/user/clients")) {
-            } elseif ($request->is("api/a_items/*")) {
-            } elseif ($request->is("api/a_items")) {
-            } elseif ($request->is("api/admin/*")) {
-            } elseif ($request->is("api/admin")) {
-            } elseif ($request->is("api/static_insurances/*")) {
-            } elseif ($request->is("api/static_insurances")) {
-            } elseif ($request->is("api/menu_permissions/*")) {
-            } elseif ($request->is("api/menu_permissions")) {
-            } elseif ($request->is("api/pocket/*")) {
-            } elseif ($request->is("api/pocket")) {
-            } elseif ($request->is("api/lgb_types/*")) {
-            } elseif ($request->is("api/lgb_types")) {
-            } elseif ($request->is("api/lgb_keys/*")) {
-            } elseif ($request->is("api/lgb_keys")) {
-            } elseif ($request->is("api/dtypes/*")) {
-            } elseif ($request->is("api/dtypes")) {
-            } elseif ($request->is("api/dana/*")) {
-            } elseif ($request->is("api/dana")) {
-            } elseif ($request->is("api/universal/*")) {
-            } elseif ($request->is("api/universal")) {
-            } else {
-                return abort(403, "Unauthorized action.");
-            }
-        } elseif ($request->auth->role == Users::ROLE_VENDOR) {
-            // views
-            if ($request->is("home/*")) {
-            } elseif ($request->is("home")) {
-            } elseif ($request->is("dashboard/*")) {
-            } elseif ($request->is("dashboard")) {
-            } elseif ($request->is("checklist/*")) {
-            } elseif ($request->is("checklist")) {
-            } elseif ($request->is("zone/*")) {
-            } elseif ($request->is("zone")) {
-            } elseif ($request->is("drivers/*")) {
-            } elseif ($request->is("drivers")) {
-            } elseif ($request->is("vehicles/*")) {
-            } elseif ($request->is("vehicles")) {
-            } elseif ($request->is("profile/*")) {
-            } elseif ($request->is("transactions/*")) {
-            } elseif ($request->is("transactions")) {
-            } elseif ($request->is("profile")) {
-            } elseif ($request->is("user/vendor/*")) {
-            } elseif ($request->is("user/vendor")) {
-            }
-            // api
-            elseif ($request->is("api/conf")) {
-            } elseif ($request->is("api/osm/*")) {
-            } elseif ($request->is("api/osm")) {
-            } elseif ($request->is("api/region/*")) {
-            } elseif ($request->is("api/region")) {
-            } elseif ($request->is("api/tracks/*")) {
-            } elseif ($request->is("api/tracks")) {
-            } elseif ($request->is("api/vehicles/*")) {
-            } elseif ($request->is("api/vehicles")) {
-            } elseif ($request->is("api/drivers/*")) {
-            } elseif ($request->is("api/drivers")) {
-            } elseif ($request->is("api/user/vendor/*")) {
-            } elseif ($request->is("api/user/vendor")) {
-            } elseif ($request->is("api/transactions_spc/*")) {
-            } elseif ($request->is("api/transactions_spc")) {
-            } elseif ($request->is("api/zones/*")) {
-            } elseif ($request->is("api/zones")) {
-            } elseif ($request->is("api/users/*")) {
-            } elseif ($request->is("api/users")) {
-            } elseif ($request->is("api/universal/*")) {
-            } elseif ($request->is("api/universal")) {
-            } else {
-                return abort(403, "Unauthorized action.");
-            }
-        } elseif ($request->auth->role == Users::ROLE_CLIENT_ADMIN) {
-            // views
-            if ($request->is("home/*")) {
-            } elseif ($request->is("home")) {
-            } elseif ($request->is("dashboard/*")) {
-            } elseif ($request->is("dashboard")) {
-            } elseif ($request->is("zone/*")) {
-            } elseif ($request->is("zone")) {
-            } elseif ($request->is("profile/*")) {
-            } elseif ($request->is("profile")) {
-            } elseif ($request->is("user/clients/*")) {
-            } elseif ($request->is("user/clients")) {
-            }
-            // api
-            elseif ($request->is("api/conf")) {
-            } elseif ($request->is("api/osm/*")) {
-            } elseif ($request->is("api/osm")) {
-            } elseif ($request->is("api/region/*")) {
-            } elseif ($request->is("api/region")) {
-            } elseif ($request->is("api/zones/*")) {
-            } elseif ($request->is("api/zones")) {
-            } elseif ($request->is("api/tracks/*")) {
-            } elseif ($request->is("api/tracks")) {
-            } elseif ($request->is("api/user/clients/*")) {
-            } elseif ($request->is("api/user/clients")) {
-            } elseif ($request->is("api/users/*")) {
-            } elseif ($request->is("api/users")) {
-            } elseif ($request->is("api/universal/*")) {
-            } elseif ($request->is("api/universal")) {
-            } else {
-                return abort(403, "Unauthorized action.");
-            }
-        } elseif ($request->auth->role == Users::ROLE_CHECKER) {
-            // views
-            if ($request->is("user/checker/*")) {
-            } elseif ($request->is("user/checker")) {
-            } elseif ($request->is("profile/*")) {
-            } elseif ($request->is("profile")) {
-            }
-            // api
-            elseif ($request->is("api/user/checker/*")) {
-            } elseif ($request->is("api/user/checker")) {
-            } elseif ($request->is("api/users/*")) {
-            } elseif ($request->is("api/users")) {
-            } elseif ($request->is("api/universal/*")) {
-            } elseif ($request->is("api/universal")) {
-            } else {
-                return abort(403, "Unauthorized action.");
-            }
-        } elseif ($request->auth->role == Users::ROLE_FINANCE) {
-            // views
-            if ($request->is("finance/*")) {
-            } elseif ($request->is("profile/*")) {
-            } elseif ($request->is("profile")) {
-            }
-            // api
-            elseif ($request->is("api/finance/*")) {
-            } elseif ($request->is("api/finance")) {
-            } elseif ($request->is("api/a_items/*")) {
-            } elseif ($request->is("api/a_items")) {
-            } elseif ($request->is("api/users/*")) {
-            } elseif ($request->is("api/users")) {
-            } elseif ($request->is("api/dana/*")) {
-            } elseif ($request->is("api/dana")) {
-            } elseif ($request->is("api/universal/*")) {
-            } elseif ($request->is("api/universal")) {
-            } else {
-                return abort(403, "Unauthorized action.");
-            }
-        } elseif ($request->auth->role == Users::ROLE_SPECIAL_TRACKING) {
-            // views
-            if ($request->is("dashboard/*")) {
-            } elseif ($request->is("dashboard")) {
-            }
-            // api
-            elseif ($request->is("api/tracks/*")) {
-            } elseif ($request->is("api/tracks")) {
-            } elseif ($request->is("api/users/*")) {
-            } elseif ($request->is("api/users")) {
-            } elseif ($request->is("profile/*")) {
-            } elseif ($request->is("profile")) {
-            } elseif ($request->is("api/universal/*")) {
-            } elseif ($request->is("api/universal")) {
-            } else {
-                return abort(403, "Unauthorized action.");
-            }
-        } else {
-            return abort(403, "Unauthorized action.");
-        }
+        // dd($request->auth);
+
+        // if ($request->auth->role == Users::ROLE_ADMIN) {
+        //     // views
+        //     if ($request->is("home/*")) {
+        //     } elseif ($request->is("home")) {
+        //     } elseif ($request->is("dashboard/*")) {
+        //     } elseif ($request->is("dashboard")) {
+        //     } elseif ($request->is("drivers/*")) {
+        //     } elseif ($request->is("drivers")) {
+        //     } elseif ($request->is("transactions/*")) {
+        //     } elseif ($request->is("transactions")) {
+        //     } elseif ($request->is("vehicles/*")) {
+        //     } elseif ($request->is("vehicles")) {
+        //     } elseif ($request->is("clients/*")) {
+        //     } elseif ($request->is("clients")) {
+        //     } elseif ($request->is("zone/*")) {
+        //     } elseif ($request->is("zone")) {
+        //     } elseif ($request->is("users/*")) {
+        //     } elseif ($request->is("users")) {
+        //     } elseif ($request->is("profile/*")) {
+        //     } elseif ($request->is("profile")) {
+        //     } elseif ($request->is("config/*")) {
+        //     } elseif ($request->is("config")) {
+        //     } elseif ($request->is("pocket/*")) {
+        //     } elseif ($request->is("pocket")) {
+        //     } elseif ($request->is("lgb_types/*")) {
+        //     } elseif ($request->is("lgb_types")) {
+        //     } elseif ($request->is("lgb_masters/*")) {
+        //     } elseif ($request->is("lgb_masters")) {
+        //     } elseif ($request->is("insurances/*")) {
+        //     } elseif ($request->is("static_insurances/*")) {
+        //     }
+        //     // api
+        //     elseif ($request->is("api/conf/*")) {
+        //     } elseif ($request->is("api/conf")) {
+        //     } elseif ($request->is("api/osm/*")) {
+        //     } elseif ($request->is("api/osm")) {
+        //     } elseif ($request->is("api/region/*")) {
+        //     } elseif ($request->is("api/region")) {
+        //     } elseif ($request->is("api/zones/*")) {
+        //     } elseif ($request->is("api/zones")) {
+        //     } elseif ($request->is("api/vehicles/*")) {
+        //     } elseif ($request->is("api/vehicles")) {
+        //     } elseif ($request->is("api/drivers/*")) {
+        //     } elseif ($request->is("api/drivers")) {
+        //     } elseif ($request->is("api/users/*")) {
+        //     } elseif ($request->is("api/users")) {
+        //     } elseif ($request->is("api/clients/*")) {
+        //     } elseif ($request->is("api/clients")) {
+        //     } elseif ($request->is("api/tracks/*")) {
+        //     } elseif ($request->is("api/tracks")) {
+        //     } elseif ($request->is("api/transactions/*")) {
+        //     } elseif ($request->is("api/transactions")) {
+        //     } elseif ($request->is("api/transactions_spc/*")) {
+        //     } elseif ($request->is("api/transactions_spc")) {
+        //     } elseif ($request->is("api/insurances/*")) {
+        //     } elseif ($request->is("api/insurances")) {
+        //     } elseif ($request->is("api/devices/*")) {
+        //     } elseif ($request->is("api/devices")) {
+        //     } elseif ($request->is("api/user/clients/*")) {
+        //     } elseif ($request->is("api/user/clients")) {
+        //     } elseif ($request->is("api/a_items/*")) {
+        //     } elseif ($request->is("api/a_items")) {
+        //     } elseif ($request->is("api/admin/*")) {
+        //     } elseif ($request->is("api/admin")) {
+        //     } elseif ($request->is("api/static_insurances/*")) {
+        //     } elseif ($request->is("api/static_insurances")) {
+        //     } elseif ($request->is("api/menu_permissions/*")) {
+        //     } elseif ($request->is("api/menu_permissions")) {
+        //     } elseif ($request->is("api/pocket/*")) {
+        //     } elseif ($request->is("api/pocket")) {
+        //     } elseif ($request->is("api/lgb_types/*")) {
+        //     } elseif ($request->is("api/lgb_types")) {
+        //     } elseif ($request->is("api/lgb_keys/*")) {
+        //     } elseif ($request->is("api/lgb_keys")) {
+        //     } elseif ($request->is("api/dtypes/*")) {
+        //     } elseif ($request->is("api/dtypes")) {
+        //     } elseif ($request->is("api/dana/*")) {
+        //     } elseif ($request->is("api/dana")) {
+        //     } elseif ($request->is("api/universal/*")) {
+        //     } elseif ($request->is("api/universal")) {
+        //     } else {
+        //         return abort(403, "Unauthorized action.");
+        //     }
+        // } elseif ($request->auth->role == Users::ROLE_VENDOR) {
+        //     // views
+        //     if ($request->is("home/*")) {
+        //     } elseif ($request->is("home")) {
+        //     } elseif ($request->is("dashboard/*")) {
+        //     } elseif ($request->is("dashboard")) {
+        //     } elseif ($request->is("checklist/*")) {
+        //     } elseif ($request->is("checklist")) {
+        //     } elseif ($request->is("zone/*")) {
+        //     } elseif ($request->is("zone")) {
+        //     } elseif ($request->is("drivers/*")) {
+        //     } elseif ($request->is("drivers")) {
+        //     } elseif ($request->is("vehicles/*")) {
+        //     } elseif ($request->is("vehicles")) {
+        //     } elseif ($request->is("profile/*")) {
+        //     } elseif ($request->is("transactions/*")) {
+        //     } elseif ($request->is("transactions")) {
+        //     } elseif ($request->is("profile")) {
+        //     } elseif ($request->is("user/vendor/*")) {
+        //     } elseif ($request->is("user/vendor")) {
+        //     }
+        //     // api
+        //     elseif ($request->is("api/conf")) {
+        //     } elseif ($request->is("api/osm/*")) {
+        //     } elseif ($request->is("api/osm")) {
+        //     } elseif ($request->is("api/region/*")) {
+        //     } elseif ($request->is("api/region")) {
+        //     } elseif ($request->is("api/tracks/*")) {
+        //     } elseif ($request->is("api/tracks")) {
+        //     } elseif ($request->is("api/vehicles/*")) {
+        //     } elseif ($request->is("api/vehicles")) {
+        //     } elseif ($request->is("api/drivers/*")) {
+        //     } elseif ($request->is("api/drivers")) {
+        //     } elseif ($request->is("api/user/vendor/*")) {
+        //     } elseif ($request->is("api/user/vendor")) {
+        //     } elseif ($request->is("api/transactions_spc/*")) {
+        //     } elseif ($request->is("api/transactions_spc")) {
+        //     } elseif ($request->is("api/zones/*")) {
+        //     } elseif ($request->is("api/zones")) {
+        //     } elseif ($request->is("api/users/*")) {
+        //     } elseif ($request->is("api/users")) {
+        //     } elseif ($request->is("api/universal/*")) {
+        //     } elseif ($request->is("api/universal")) {
+        //     } else {
+        //         return abort(403, "Unauthorized action.");
+        //     }
+        // } elseif ($request->auth->role == Users::ROLE_CLIENT_ADMIN) {
+        //     // views
+        //     if ($request->is("home/*")) {
+        //     } elseif ($request->is("home")) {
+        //     } elseif ($request->is("dashboard/*")) {
+        //     } elseif ($request->is("dashboard")) {
+        //     } elseif ($request->is("zone/*")) {
+        //     } elseif ($request->is("zone")) {
+        //     } elseif ($request->is("profile/*")) {
+        //     } elseif ($request->is("profile")) {
+        //     } elseif ($request->is("user/clients/*")) {
+        //     } elseif ($request->is("user/clients")) {
+        //     }
+        //     // api
+        //     elseif ($request->is("api/conf")) {
+        //     } elseif ($request->is("api/osm/*")) {
+        //     } elseif ($request->is("api/osm")) {
+        //     } elseif ($request->is("api/region/*")) {
+        //     } elseif ($request->is("api/region")) {
+        //     } elseif ($request->is("api/zones/*")) {
+        //     } elseif ($request->is("api/zones")) {
+        //     } elseif ($request->is("api/tracks/*")) {
+        //     } elseif ($request->is("api/tracks")) {
+        //     } elseif ($request->is("api/user/clients/*")) {
+        //     } elseif ($request->is("api/user/clients")) {
+        //     } elseif ($request->is("api/users/*")) {
+        //     } elseif ($request->is("api/users")) {
+        //     } elseif ($request->is("api/universal/*")) {
+        //     } elseif ($request->is("api/universal")) {
+        //     } else {
+        //         return abort(403, "Unauthorized action.");
+        //     }
+        // } elseif ($request->auth->role == Users::ROLE_CHECKER) {
+        //     // views
+        //     if ($request->is("user/checker/*")) {
+        //     } elseif ($request->is("user/checker")) {
+        //     } elseif ($request->is("profile/*")) {
+        //     } elseif ($request->is("profile")) {
+        //     }
+        //     // api
+        //     elseif ($request->is("api/user/checker/*")) {
+        //     } elseif ($request->is("api/user/checker")) {
+        //     } elseif ($request->is("api/users/*")) {
+        //     } elseif ($request->is("api/users")) {
+        //     } elseif ($request->is("api/universal/*")) {
+        //     } elseif ($request->is("api/universal")) {
+        //     } else {
+        //         return abort(403, "Unauthorized action.");
+        //     }
+        // } elseif ($request->auth->role == Users::ROLE_FINANCE) {
+        //     // views
+        //     if ($request->is("finance/*")) {
+        //     } elseif ($request->is("profile/*")) {
+        //     } elseif ($request->is("profile")) {
+        //     }
+        //     // api
+        //     elseif ($request->is("api/finance/*")) {
+        //     } elseif ($request->is("api/finance")) {
+        //     } elseif ($request->is("api/a_items/*")) {
+        //     } elseif ($request->is("api/a_items")) {
+        //     } elseif ($request->is("api/users/*")) {
+        //     } elseif ($request->is("api/users")) {
+        //     } elseif ($request->is("api/dana/*")) {
+        //     } elseif ($request->is("api/dana")) {
+        //     } elseif ($request->is("api/universal/*")) {
+        //     } elseif ($request->is("api/universal")) {
+        //     } else {
+        //         return abort(403, "Unauthorized action.");
+        //     }
+        // } elseif ($request->auth->role == Users::ROLE_SPECIAL_TRACKING) {
+        //     // views
+        //     if ($request->is("dashboard/*")) {
+        //     } elseif ($request->is("dashboard")) {
+        //     }
+        //     // api
+        //     elseif ($request->is("api/tracks/*")) {
+        //     } elseif ($request->is("api/tracks")) {
+        //     } elseif ($request->is("api/users/*")) {
+        //     } elseif ($request->is("api/users")) {
+        //     } elseif ($request->is("api/universal/*")) {
+        //     } elseif ($request->is("api/universal")) {
+        //     } else {
+        //         return abort(403, "Unauthorized action.");
+        //     }
+        // } else {
+        //     return abort(403, "Unauthorized action.");
+        // }
 
         return $next($request);
     }
-}
+}
\ No newline at end of file
diff --git a/app/Models/Users.php b/app/Models/Users.php
index e8238bb..afd708f 100755
--- a/app/Models/Users.php
+++ b/app/Models/Users.php
@@ -4,9 +4,11 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Foundation\Auth\User as Authenticatable;
 
-class Users extends Model
+class Users extends Authenticatable
 {
+    protected $table = "t_users";
     const ROLE_SU = 1; // unused
     const ROLE_SUPERADMIN = 7;
     const ROLE_ADMIN = 2;
@@ -40,9 +42,12 @@ class Users extends Model
     const DEFAULT_PHONE_CODE = 62;
 
     const defaultSelected = "
-    u.*
-    ,c.c_name AS client_group_name,c.id AS client_group_id
-    ,r.name AS role_name
+        u.*
+        ,c.c_name AS client_group_name
+        ,c.id AS client_group_id
+        -- ,r.name as role_name
+        ,rl.id AS role_id
+        ,rl.name AS role_name
     ";
 
     public static function listUsers($filter = [])
@@ -77,19 +82,20 @@ class Users extends Model
         }
 
         return DB::select(
-            "SELECT
-        " .
+            " SELECT " .
                 Users::defaultSelected .
                 "
-        $select_select
-        FROM t_users AS u
-        LEFT JOIN t_clients AS c ON u.client_group_id = c.id
-        LEFT JOIN t_users_roles AS r ON u.role = r.id
-        $join_join
-        WHERE u.dlt is null
-        $where_where
-        $other_other
-        ;",
+                $select_select
+                FROM t_users AS u
+                LEFT JOIN t_clients AS c ON u.client_group_id = c.id
+                -- LEFT JOIN t_users_roles AS r ON u.role = r.id
+                LEFT JOIN model_has_roles AS mhr ON mhr.model_id = u.id
+                LEFT JOIN roles as rl ON rl.id = mhr.role_id
+                $join_join
+                WHERE u.dlt is null
+                $where_where
+                $other_other
+            ;",
             $params
         );
     }
@@ -137,7 +143,9 @@ class Users extends Model
                 "
         FROM t_users AS u
         LEFT JOIN t_clients AS c ON u.client_group_id = c.id
-        LEFT JOIN t_users_roles AS r ON u.role = r.id
+        -- LEFT JOIN t_users_roles AS r ON u.role = r.id
+        LEFT JOIN model_has_roles AS mhr ON mhr.model_id = u.id
+        LEFT JOIN roles as rl ON rl.id = mhr.role_id
         WHERE u.dlt is null
         AND u.id = ?
         LIMIT 1;",
diff --git a/app/User.php b/app/User.php
index 8d9063c..ebbe87e 100755
--- a/app/User.php
+++ b/app/User.php
@@ -5,30 +5,28 @@ namespace App;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
+use Spatie\Permission\Traits\HasRoles;
 
 class User extends Authenticatable
 {
     use Notifiable;
+    use HasRoles;
 
-    protected $table = 't_users';
+    protected $table = "t_users";
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = [
-        'first_name', 'last_name', 'email', 'phone', 'password',
-    ];
+    protected $fillable = ["first_name", "last_name", "email", "phone", "password"];
 
     /**
      * The attributes that should be hidden for arrays.
      *
      * @var array
      */
-    protected $hidden = [
-        'password', 'remember_token',
-    ];
+    protected $hidden = ["password", "remember_token"];
 
     /**
      * The attributes that should be cast to native types.
@@ -36,6 +34,6 @@ class User extends Authenticatable
      * @var array
      */
     protected $casts = [
-        'email_verified_at' => 'datetime',
+        "email_verified_at" => "datetime",
     ];
-}
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 85c4b33..439a070 100755
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,7 @@
         "laravel/framework": "^9.0.0",
         "laravel/tinker": "^2.5",
         "laravel/ui": "^4.0",
+        "spatie/laravel-permission": "^6.20",
         "yajra/laravel-datatables": "^9.0"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index b163bfa..b6a6db4 100755
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f12f1aa4bd9db1e1402035c18249d8ae",
+    "content-hash": "1d471cd31c444b2d18a5d42b8df9a0ca",
     "packages": [
         {
             "name": "asm89/stack-cors",
-            "version": "v2.2.0",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/asm89/stack-cors.git",
-                "reference": "50f57105bad3d97a43ec4a485eb57daf347eafea"
+                "reference": "acf3142e6c5eafa378dc8ef3c069ab4558993f70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/asm89/stack-cors/zipball/50f57105bad3d97a43ec4a485eb57daf347eafea",
-                "reference": "50f57105bad3d97a43ec4a485eb57daf347eafea",
+                "url": "https://api.github.com/repos/asm89/stack-cors/zipball/acf3142e6c5eafa378dc8ef3c069ab4558993f70",
+                "reference": "acf3142e6c5eafa378dc8ef3c069ab4558993f70",
                 "shasum": ""
             },
             "require": {
@@ -58,9 +58,9 @@
             ],
             "support": {
                 "issues": "https://github.com/asm89/stack-cors/issues",
-                "source": "https://github.com/asm89/stack-cors/tree/v2.2.0"
+                "source": "https://github.com/asm89/stack-cors/tree/v2.3.0"
             },
-            "time": "2023-11-14T13:51:46+00:00"
+            "time": "2025-03-13T08:50:04+00:00"
         },
         {
             "name": "barryvdh/laravel-dompdf",
@@ -89,16 +89,16 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                },
                 "laravel": {
-                    "providers": [
-                        "Barryvdh\\DomPDF\\ServiceProvider"
-                    ],
                     "aliases": {
                         "PDF": "Barryvdh\\DomPDF\\Facade\\Pdf"
-                    }
+                    },
+                    "providers": [
+                        "Barryvdh\\DomPDF\\ServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -264,16 +264,16 @@
         },
         {
             "name": "dflydev/dot-access-data",
-            "version": "v3.0.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
-                "reference": "f41715465d65213d644d3141a6a93081be5d3549"
+                "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549",
-                "reference": "f41715465d65213d644d3141a6a93081be5d3549",
+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/a23a2bf4f31d3518f3ecb38660c95715dfead60f",
+                "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f",
                 "shasum": ""
             },
             "require": {
@@ -333,9 +333,9 @@
             ],
             "support": {
                 "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues",
-                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2"
+                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.3"
             },
-            "time": "2022-10-27T11:44:00+00:00"
+            "time": "2024-07-08T12:26:09+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -576,16 +576,16 @@
         },
         {
             "name": "dragonmantank/cron-expression",
-            "version": "v3.3.3",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a"
+                "reference": "8c784d071debd117328803d86b2097615b457500"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
-                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500",
+                "reference": "8c784d071debd117328803d86b2097615b457500",
                 "shasum": ""
             },
             "require": {
@@ -598,10 +598,14 @@
             "require-dev": {
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-webmozart-assert": "^1.0",
                 "phpunit/phpunit": "^7.0|^8.0|^9.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Cron\\": "src/Cron/"
@@ -625,7 +629,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -633,20 +637,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-10T19:36:49+00:00"
+            "time": "2024-10-09T13:47:03+00:00"
         },
         {
             "name": "egulias/email-validator",
-            "version": "4.0.2",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e"
+                "reference": "d42c8731f0624ad6bdc8d3e5e9a4524f68801cfa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e",
-                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/d42c8731f0624ad6bdc8d3e5e9a4524f68801cfa",
+                "reference": "d42c8731f0624ad6bdc8d3e5e9a4524f68801cfa",
                 "shasum": ""
             },
             "require": {
@@ -692,7 +696,7 @@
             ],
             "support": {
                 "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/4.0.2"
+                "source": "https://github.com/egulias/EmailValidator/tree/4.0.4"
             },
             "funding": [
                 {
@@ -700,7 +704,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-10-06T06:47:41+00:00"
+            "time": "2025-03-06T22:45:56+00:00"
         },
         {
             "name": "fruitcake/laravel-cors",
@@ -855,24 +859,24 @@
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.1.2",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945",
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2"
+                "phpoption/phpoption": "^1.9.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "autoload": {
@@ -901,7 +905,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3"
             },
             "funding": [
                 {
@@ -913,26 +917,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T22:16:48+00:00"
+            "time": "2024-07-20T21:45:45+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.8.1",
+            "version": "7.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
+                "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
+                "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
-                "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+                "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+                "guzzlehttp/psr7": "^2.7.0",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -943,9 +947,9 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+                "guzzle/client-integration-tests": "3.0.2",
                 "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -1023,7 +1027,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.9.3"
             },
             "funding": [
                 {
@@ -1039,20 +1043,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:35:24+00:00"
+            "time": "2025-03-27T13:37:11+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.0.2",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
+                "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c",
+                "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c",
                 "shasum": ""
             },
             "require": {
@@ -1060,7 +1064,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "type": "library",
             "extra": {
@@ -1106,7 +1110,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.2"
+                "source": "https://github.com/guzzle/promises/tree/2.2.0"
             },
             "funding": [
                 {
@@ -1122,20 +1126,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:19:20+00:00"
+            "time": "2025-03-27T13:27:01+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.6.2",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
+                "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16",
+                "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16",
                 "shasum": ""
             },
             "require": {
@@ -1150,8 +1154,8 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "http-interop/http-factory-tests": "0.9.0",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -1222,7 +1226,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.6.2"
+                "source": "https://github.com/guzzle/psr7/tree/2.7.1"
             },
             "funding": [
                 {
@@ -1238,20 +1242,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:05:35+00:00"
+            "time": "2025-03-27T12:30:47+00:00"
         },
         {
             "name": "guzzlehttp/uri-template",
-            "version": "v1.0.3",
+            "version": "v1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/uri-template.git",
-                "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c"
+                "reference": "30e286560c137526eccd4ce21b2de477ab0676d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/ecea8feef63bd4fef1f037ecb288386999ecc11c",
-                "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c",
+                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/30e286560c137526eccd4ce21b2de477ab0676d2",
+                "reference": "30e286560c137526eccd4ce21b2de477ab0676d2",
                 "shasum": ""
             },
             "require": {
@@ -1308,7 +1312,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/uri-template/issues",
-                "source": "https://github.com/guzzle/uri-template/tree/v1.0.3"
+                "source": "https://github.com/guzzle/uri-template/tree/v1.0.4"
             },
             "funding": [
                 {
@@ -1324,7 +1328,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T19:50:20+00:00"
+            "time": "2025-02-03T10:55:03+00:00"
         },
         {
             "name": "hidehalo/nanoid-php",
@@ -1434,16 +1438,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v9.52.16",
+            "version": "v9.52.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "082345d76fc6a55b649572efe10b11b03e279d24"
+                "reference": "2bb6835af73fcf0d1d0bfb84af71cef236cb8609"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/082345d76fc6a55b649572efe10b11b03e279d24",
-                "reference": "082345d76fc6a55b649572efe10b11b03e279d24",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/2bb6835af73fcf0d1d0bfb84af71cef236cb8609",
+                "reference": "2bb6835af73fcf0d1d0bfb84af71cef236cb8609",
                 "shasum": ""
             },
             "require": {
@@ -1628,30 +1632,31 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-10-03T13:02:30+00:00"
+            "time": "2025-01-31T10:09:38+00:00"
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v1.3.3",
+            "version": "v1.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754"
+                "reference": "4f48ade902b94323ca3be7646db16209ec76be3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754",
-                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/4f48ade902b94323ca3be7646db16209ec76be3d",
+                "reference": "4f48ade902b94323ca3be7646db16209ec76be3d",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.3|^8.0"
             },
             "require-dev": {
-                "nesbot/carbon": "^2.61",
+                "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
+                "nesbot/carbon": "^2.61|^3.0",
                 "pestphp/pest": "^1.21.3",
                 "phpstan/phpstan": "^1.8.2",
-                "symfony/var-dumper": "^5.4.11"
+                "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0"
             },
             "type": "library",
             "extra": {
@@ -1688,26 +1693,26 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2023-11-08T14:08:06+00:00"
+            "time": "2024-11-14T18:34:49+00:00"
         },
         {
             "name": "laravel/tinker",
-            "version": "v2.9.0",
+            "version": "v2.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/tinker.git",
-                "reference": "502e0fe3f0415d06d5db1f83a472f0f3b754bafe"
+                "reference": "22177cc71807d38f2810c6204d8f7183d88a57d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/tinker/zipball/502e0fe3f0415d06d5db1f83a472f0f3b754bafe",
-                "reference": "502e0fe3f0415d06d5db1f83a472f0f3b754bafe",
+                "url": "https://api.github.com/repos/laravel/tinker/zipball/22177cc71807d38f2810c6204d8f7183d88a57d3",
+                "reference": "22177cc71807d38f2810c6204d8f7183d88a57d3",
                 "shasum": ""
             },
             "require": {
-                "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
                 "php": "^7.2.5|^8.0",
                 "psy/psysh": "^0.11.1|^0.12.0",
                 "symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0"
@@ -1715,10 +1720,10 @@
             "require-dev": {
                 "mockery/mockery": "~1.3.3|^1.4.2",
                 "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^8.5.8|^9.3.3"
+                "phpunit/phpunit": "^8.5.8|^9.3.3|^10.0"
             },
             "suggest": {
-                "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0)."
+                "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0)."
             },
             "type": "library",
             "extra": {
@@ -1752,45 +1757,45 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/tinker/issues",
-                "source": "https://github.com/laravel/tinker/tree/v2.9.0"
+                "source": "https://github.com/laravel/tinker/tree/v2.10.1"
             },
-            "time": "2024-01-04T16:10:04+00:00"
+            "time": "2025-01-27T14:24:01+00:00"
         },
         {
             "name": "laravel/ui",
-            "version": "v4.5.2",
+            "version": "v4.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/ui.git",
-                "reference": "c75396f63268c95b053c8e4814eb70e0875e9628"
+                "reference": "7d6ffa38d79f19c9b3e70a751a9af845e8f41d88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/ui/zipball/c75396f63268c95b053c8e4814eb70e0875e9628",
-                "reference": "c75396f63268c95b053c8e4814eb70e0875e9628",
+                "url": "https://api.github.com/repos/laravel/ui/zipball/7d6ffa38d79f19c9b3e70a751a9af845e8f41d88",
+                "reference": "7d6ffa38d79f19c9b3e70a751a9af845e8f41d88",
                 "shasum": ""
             },
             "require": {
-                "illuminate/console": "^9.21|^10.0|^11.0",
-                "illuminate/filesystem": "^9.21|^10.0|^11.0",
-                "illuminate/support": "^9.21|^10.0|^11.0",
-                "illuminate/validation": "^9.21|^10.0|^11.0",
+                "illuminate/console": "^9.21|^10.0|^11.0|^12.0",
+                "illuminate/filesystem": "^9.21|^10.0|^11.0|^12.0",
+                "illuminate/support": "^9.21|^10.0|^11.0|^12.0",
+                "illuminate/validation": "^9.21|^10.0|^11.0|^12.0",
                 "php": "^8.0",
                 "symfony/console": "^6.0|^7.0"
             },
             "require-dev": {
-                "orchestra/testbench": "^7.35|^8.15|^9.0",
-                "phpunit/phpunit": "^9.3|^10.4|^11.0"
+                "orchestra/testbench": "^7.35|^8.15|^9.0|^10.0",
+                "phpunit/phpunit": "^9.3|^10.4|^11.5"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Laravel\\Ui\\UiServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
                 }
             },
             "autoload": {
@@ -1815,9 +1820,9 @@
                 "ui"
             ],
             "support": {
-                "source": "https://github.com/laravel/ui/tree/v4.5.2"
+                "source": "https://github.com/laravel/ui/tree/v4.6.1"
             },
-            "time": "2024-05-08T18:07:10+00:00"
+            "time": "2025-01-28T15:15:29+00:00"
         },
         {
             "name": "laravelcollective/html",
@@ -1894,16 +1899,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.4.2",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf"
+                "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf",
-                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6fbb36d44824ed4091adbcf4c7d4a3923cdb3405",
+                "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405",
                 "shasum": ""
             },
             "require": {
@@ -1916,8 +1921,8 @@
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
-                "commonmark/cmark": "0.30.3",
-                "commonmark/commonmark.js": "0.30.0",
+                "commonmark/cmark": "0.31.1",
+                "commonmark/commonmark.js": "0.31.1",
                 "composer/package-versions-deprecated": "^1.8",
                 "embed/embed": "^4.4",
                 "erusev/parsedown": "^1.0",
@@ -1928,8 +1933,9 @@
                 "phpstan/phpstan": "^1.8.2",
                 "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0",
                 "scrutinizer/ocular": "^1.8.1",
-                "symfony/finder": "^5.3 | ^6.0 || ^7.0",
-                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0",
+                "symfony/finder": "^5.3 | ^6.0 | ^7.0",
+                "symfony/process": "^5.4 | ^6.0 | ^7.0",
+                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0",
                 "unleashedtech/php-coding-standard": "^3.1.1",
                 "vimeo/psalm": "^4.24.0 || ^5.0.0"
             },
@@ -1939,7 +1945,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "2.8-dev"
                 }
             },
             "autoload": {
@@ -1996,7 +2002,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-02T11:59:32+00:00"
+            "time": "2025-05-05T12:20:28+00:00"
         },
         {
             "name": "league/config",
@@ -2082,16 +2088,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.28.0",
+            "version": "3.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c"
+                "reference": "2203e3151755d874bb2943649dae1eb8533ac93e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
-                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/2203e3151755d874bb2943649dae1eb8533ac93e",
+                "reference": "2203e3151755d874bb2943649dae1eb8533ac93e",
                 "shasum": ""
             },
             "require": {
@@ -2115,13 +2121,13 @@
                 "composer/semver": "^3.0",
                 "ext-fileinfo": "*",
                 "ext-ftp": "*",
-                "ext-mongodb": "^1.3",
+                "ext-mongodb": "^1.3|^2",
                 "ext-zip": "*",
                 "friendsofphp/php-cs-fixer": "^3.5",
                 "google/cloud-storage": "^1.23",
                 "guzzlehttp/psr7": "^2.6",
                 "microsoft/azure-storage-blob": "^1.1",
-                "mongodb/mongodb": "^1.2",
+                "mongodb/mongodb": "^1.2|^2",
                 "phpseclib/phpseclib": "^3.0.36",
                 "phpstan/phpstan": "^1.10",
                 "phpunit/phpunit": "^9.5.11|^10.0",
@@ -2159,22 +2165,22 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.28.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.30.0"
             },
-            "time": "2024-05-22T10:09:12+00:00"
+            "time": "2025-06-25T13:29:59+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.28.0",
+            "version": "3.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40"
+                "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
-                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/6691915f77c7fb69adfb87dcd550052dc184ee10",
+                "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10",
                 "shasum": ""
             },
             "require": {
@@ -2208,22 +2214,22 @@
                 "local"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.28.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.30.0"
             },
-            "time": "2024-05-06T20:05:52+00:00"
+            "time": "2025-05-21T10:34:19+00:00"
         },
         {
             "name": "league/fractal",
-            "version": "0.20.1",
+            "version": "0.20.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/fractal.git",
-                "reference": "8b9d39b67624db9195c06f9c1ffd0355151eaf62"
+                "reference": "573ca2e0e348a7fe573a3e8fbc29a6588ece8c4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/fractal/zipball/8b9d39b67624db9195c06f9c1ffd0355151eaf62",
-                "reference": "8b9d39b67624db9195c06f9c1ffd0355151eaf62",
+                "url": "https://api.github.com/repos/thephpleague/fractal/zipball/573ca2e0e348a7fe573a3e8fbc29a6588ece8c4e",
+                "reference": "573ca2e0e348a7fe573a3e8fbc29a6588ece8c4e",
                 "shasum": ""
             },
             "require": {
@@ -2232,18 +2238,18 @@
             "require-dev": {
                 "doctrine/orm": "^2.5",
                 "illuminate/contracts": "~5.0",
+                "laminas/laminas-paginator": "~2.12",
                 "mockery/mockery": "^1.3",
-                "pagerfanta/pagerfanta": "~1.0.0",
+                "pagerfanta/pagerfanta": "~1.0.0|~4.0.0",
                 "phpstan/phpstan": "^1.4",
                 "phpunit/phpunit": "^9.5",
                 "squizlabs/php_codesniffer": "~3.4",
-                "vimeo/psalm": "^4.22",
-                "zendframework/zend-paginator": "~2.3"
+                "vimeo/psalm": "^4.30"
             },
             "suggest": {
                 "illuminate/pagination": "The Illuminate Pagination component.",
-                "pagerfanta/pagerfanta": "Pagerfanta Paginator",
-                "zendframework/zend-paginator": "Zend Framework Paginator"
+                "laminas/laminas-paginator": "Laminas Framework Paginator",
+                "pagerfanta/pagerfanta": "Pagerfanta Paginator"
             },
             "type": "library",
             "extra": {
@@ -2278,22 +2284,22 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/fractal/issues",
-                "source": "https://github.com/thephpleague/fractal/tree/0.20.1"
+                "source": "https://github.com/thephpleague/fractal/tree/0.20.2"
             },
-            "time": "2022-04-11T12:47:17+00:00"
+            "time": "2025-02-14T21:33:14+00:00"
         },
         {
             "name": "league/mime-type-detection",
-            "version": "1.15.0",
+            "version": "1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301"
+                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
-                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/2d6702ff215bf922936ccc1ad31007edc76451b9",
+                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9",
                 "shasum": ""
             },
             "require": {
@@ -2324,7 +2330,7 @@
             "description": "Mime-type detection for Flysystem",
             "support": {
                 "issues": "https://github.com/thephpleague/mime-type-detection/issues",
-                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0"
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.16.0"
             },
             "funding": [
                 {
@@ -2336,20 +2342,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-28T23:22:08+00:00"
+            "time": "2024-09-21T08:32:55+00:00"
         },
         {
             "name": "monolog/monolog",
-            "version": "2.9.3",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215"
+                "reference": "5cf826f2991858b54d5c3809bee745560a1042a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a30bfe2e142720dfa990d0a7e573997f5d884215",
-                "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5cf826f2991858b54d5c3809bee745560a1042a7",
+                "reference": "5cf826f2991858b54d5c3809bee745560a1042a7",
                 "shasum": ""
             },
             "require": {
@@ -2426,7 +2432,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.9.3"
+                "source": "https://github.com/Seldaek/monolog/tree/2.10.0"
             },
             "funding": [
                 {
@@ -2438,20 +2444,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-12T20:52:51+00:00"
+            "time": "2024-11-12T12:43:37+00:00"
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.72.5",
+            "version": "2.73.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed"
+                "url": "https://github.com/CarbonPHP/carbon.git",
+                "reference": "9228ce90e1035ff2f0db84b40ec2e023ed802075"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/afd46589c216118ecd48ff2b95d77596af1e57ed",
-                "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/9228ce90e1035ff2f0db84b40ec2e023ed802075",
+                "reference": "9228ce90e1035ff2f0db84b40ec2e023ed802075",
                 "shasum": ""
             },
             "require": {
@@ -2471,7 +2477,7 @@
                 "doctrine/orm": "^2.7 || ^3.0",
                 "friendsofphp/php-cs-fixer": "^3.0",
                 "kylekatarnls/multi-tester": "^2.0",
-                "ondrejmirtes/better-reflection": "*",
+                "ondrejmirtes/better-reflection": "<6",
                 "phpmd/phpmd": "^2.9",
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^0.12.99 || ^1.7.14",
@@ -2484,10 +2490,6 @@
             ],
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev",
-                    "dev-2.x": "2.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Carbon\\Laravel\\ServiceProvider"
@@ -2497,6 +2499,10 @@
                     "includes": [
                         "extension.neon"
                     ]
+                },
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev",
+                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {
@@ -2545,28 +2551,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-03T19:18:41+00:00"
+            "time": "2025-01-08T20:10:23+00:00"
         },
         {
             "name": "nette/schema",
-            "version": "v1.3.0",
+            "version": "v1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/schema.git",
-                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188"
+                "reference": "da801d52f0354f70a638673c4a0f04e16529431d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
-                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
+                "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
+                "reference": "da801d52f0354f70a638673c4a0f04e16529431d",
                 "shasum": ""
             },
             "require": {
                 "nette/utils": "^4.0",
-                "php": "8.1 - 8.3"
+                "php": "8.1 - 8.4"
             },
             "require-dev": {
-                "nette/tester": "^2.4",
+                "nette/tester": "^2.5.2",
                 "phpstan/phpstan-nette": "^1.0",
                 "tracy/tracy": "^2.8"
             },
@@ -2605,26 +2611,26 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.3.0"
+                "source": "https://github.com/nette/schema/tree/v1.3.2"
             },
-            "time": "2023-12-11T11:54:22+00:00"
+            "time": "2024-10-06T23:10:23+00:00"
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.4",
+            "version": "v4.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218"
+                "reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
+                "url": "https://api.github.com/repos/nette/utils/zipball/e67c4061eb40b9c113b218214e42cb5a0dda28f2",
+                "reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0 <8.4"
+                "php": "8.0 - 8.4"
             },
             "conflict": {
                 "nette/finder": "<3",
@@ -2691,22 +2697,22 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.4"
+                "source": "https://github.com/nette/utils/tree/v4.0.7"
             },
-            "time": "2024-01-17T16:50:36+00:00"
+            "time": "2025-06-03T04:55:08+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.1.0",
+            "version": "v5.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1"
+                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1",
-                "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
+                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
                 "shasum": ""
             },
             "require": {
@@ -2749,39 +2755,38 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
             },
-            "time": "2024-07-01T20:03:41+00:00"
+            "time": "2025-05-31T08:24:38+00:00"
         },
         {
             "name": "nunomaduro/termwind",
-            "version": "v1.15.1",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/termwind.git",
-                "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc"
+                "reference": "5369ef84d8142c1d87e4ec278711d4ece3cbf301"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
-                "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/5369ef84d8142c1d87e4ec278711d4ece3cbf301",
+                "reference": "5369ef84d8142c1d87e4ec278711d4ece3cbf301",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": "^8.0",
-                "symfony/console": "^5.3.0|^6.0.0"
+                "php": "^8.1",
+                "symfony/console": "^6.4.15"
             },
             "require-dev": {
-                "ergebnis/phpstan-rules": "^1.0.",
-                "illuminate/console": "^8.0|^9.0",
-                "illuminate/support": "^8.0|^9.0",
-                "laravel/pint": "^1.0.0",
-                "pestphp/pest": "^1.21.0",
-                "pestphp/pest-plugin-mock": "^1.0",
-                "phpstan/phpstan": "^1.4.6",
-                "phpstan/phpstan-strict-rules": "^1.1.0",
-                "symfony/var-dumper": "^5.2.7|^6.0.0",
+                "illuminate/console": "^10.48.24",
+                "illuminate/support": "^10.48.24",
+                "laravel/pint": "^1.18.2",
+                "pestphp/pest": "^2.36.0",
+                "pestphp/pest-plugin-mock": "2.0.0",
+                "phpstan/phpstan": "^1.12.11",
+                "phpstan/phpstan-strict-rules": "^1.6.1",
+                "symfony/var-dumper": "^6.4.15",
                 "thecodingmachine/phpstan-strict-rules": "^1.0.0"
             },
             "type": "library",
@@ -2821,7 +2826,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/termwind/issues",
-                "source": "https://github.com/nunomaduro/termwind/tree/v1.15.1"
+                "source": "https://github.com/nunomaduro/termwind/tree/v1.17.0"
             },
             "funding": [
                 {
@@ -2837,7 +2842,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-08T01:06:31+00:00"
+            "time": "2024-11-21T10:36:35+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -2981,16 +2986,16 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.9.2",
+            "version": "1.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820"
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820",
-                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
                 "shasum": ""
             },
             "require": {
@@ -2998,13 +3003,13 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "1.9-dev"
@@ -3040,7 +3045,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.9.2"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
             },
             "funding": [
                 {
@@ -3052,7 +3057,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T21:59:55+00:00"
+            "time": "2024-07-20T21:41:07+00:00"
         },
         {
             "name": "psr/clock",
@@ -3367,16 +3372,16 @@
         },
         {
             "name": "psr/log",
-            "version": "3.0.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
                 "shasum": ""
             },
             "require": {
@@ -3411,9 +3416,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.0"
+                "source": "https://github.com/php-fig/log/tree/3.0.2"
             },
-            "time": "2021-07-14T16:46:02+00:00"
+            "time": "2024-09-11T13:17:53+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -3468,16 +3473,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.4",
+            "version": "v0.12.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "2fd717afa05341b4f8152547f142cd2f130f6818"
+                "reference": "1b801844becfe648985372cb4b12ad6840245ace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818",
-                "reference": "2fd717afa05341b4f8152547f142cd2f130f6818",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1b801844becfe648985372cb4b12ad6840245ace",
+                "reference": "1b801844becfe648985372cb4b12ad6840245ace",
                 "shasum": ""
             },
             "require": {
@@ -3504,12 +3509,12 @@
             ],
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "0.12.x-dev"
-                },
                 "bamarni-bin": {
                     "bin-links": false,
                     "forward-command": false
+                },
+                "branch-alias": {
+                    "dev-main": "0.12.x-dev"
                 }
             },
             "autoload": {
@@ -3541,9 +3546,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.4"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.9"
             },
-            "time": "2024-06-10T01:18:23+00:00"
+            "time": "2025-06-23T02:35:06+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -3591,16 +3596,16 @@
         },
         {
             "name": "ramsey/collection",
-            "version": "2.0.0",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/collection.git",
-                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
+                "reference": "344572933ad0181accbf4ba763e85a0306a8c5e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
-                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/344572933ad0181accbf4ba763e85a0306a8c5e2",
+                "reference": "344572933ad0181accbf4ba763e85a0306a8c5e2",
                 "shasum": ""
             },
             "require": {
@@ -3608,25 +3613,22 @@
             },
             "require-dev": {
                 "captainhook/plugin-composer": "^5.3",
-                "ergebnis/composer-normalize": "^2.28.3",
-                "fakerphp/faker": "^1.21",
+                "ergebnis/composer-normalize": "^2.45",
+                "fakerphp/faker": "^1.24",
                 "hamcrest/hamcrest-php": "^2.0",
-                "jangregor/phpstan-prophecy": "^1.0",
-                "mockery/mockery": "^1.5",
+                "jangregor/phpstan-prophecy": "^2.1",
+                "mockery/mockery": "^1.6",
                 "php-parallel-lint/php-console-highlighter": "^1.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3",
-                "phpcsstandards/phpcsutils": "^1.0.0-rc1",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpstan/extension-installer": "^1.2",
-                "phpstan/phpstan": "^1.9",
-                "phpstan/phpstan-mockery": "^1.1",
-                "phpstan/phpstan-phpunit": "^1.3",
-                "phpunit/phpunit": "^9.5",
-                "psalm/plugin-mockery": "^1.1",
-                "psalm/plugin-phpunit": "^0.18.4",
-                "ramsey/coding-standard": "^2.0.3",
-                "ramsey/conventional-commits": "^1.3",
-                "vimeo/psalm": "^5.4"
+                "php-parallel-lint/php-parallel-lint": "^1.4",
+                "phpspec/prophecy-phpunit": "^2.3",
+                "phpstan/extension-installer": "^1.4",
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-mockery": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpunit/phpunit": "^10.5",
+                "ramsey/coding-standard": "^2.3",
+                "ramsey/conventional-commits": "^1.6",
+                "roave/security-advisories": "dev-latest"
             },
             "type": "library",
             "extra": {
@@ -3664,37 +3666,26 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/collection/issues",
-                "source": "https://github.com/ramsey/collection/tree/2.0.0"
+                "source": "https://github.com/ramsey/collection/tree/2.1.1"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/ramsey/collection",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-12-31T21:50:55+00:00"
+            "time": "2025-03-22T05:38:12+00:00"
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.7.6",
+            "version": "4.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
+                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
-                "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/4e0e23cc785f0724a0e838279a9eb03f28b092a0",
+                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
-                "ext-json": "*",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
             },
@@ -3702,26 +3693,23 @@
                 "rhumsaa/uuid": "self.version"
             },
             "require-dev": {
-                "captainhook/captainhook": "^5.10",
+                "captainhook/captainhook": "^5.25",
                 "captainhook/plugin-composer": "^5.3",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "doctrine/annotations": "^1.8",
-                "ergebnis/composer-normalize": "^2.15",
-                "mockery/mockery": "^1.3",
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+                "ergebnis/composer-normalize": "^2.47",
+                "mockery/mockery": "^1.6",
                 "paragonie/random-lib": "^2",
-                "php-mock/php-mock": "^2.2",
-                "php-mock/php-mock-mockery": "^1.3",
-                "php-parallel-lint/php-parallel-lint": "^1.1",
-                "phpbench/phpbench": "^1.0",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-mockery": "^1.1",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpunit/phpunit": "^8.5 || ^9",
-                "ramsey/composer-repl": "^1.4",
-                "slevomat/coding-standard": "^8.4",
-                "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "^4.9"
+                "php-mock/php-mock": "^2.6",
+                "php-mock/php-mock-mockery": "^1.5",
+                "php-parallel-lint/php-parallel-lint": "^1.4.0",
+                "phpbench/phpbench": "^1.2.14",
+                "phpstan/extension-installer": "^1.4",
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-mockery": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.6",
+                "slevomat/coding-standard": "^8.18",
+                "squizlabs/php_codesniffer": "^3.13"
             },
             "suggest": {
                 "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.",
@@ -3756,40 +3744,31 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.7.6"
+                "source": "https://github.com/ramsey/uuid/tree/4.9.0"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/ramsey/uuid",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-04-27T21:32:50+00:00"
+            "time": "2025-06-25T14:20:11+00:00"
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "v8.6.0",
+            "version": "v8.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
-                "reference": "d2fb94a9641be84d79c7548c6d39bbebba6e9a70"
+                "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d2fb94a9641be84d79c7548c6d39bbebba6e9a70",
-                "reference": "d2fb94a9641be84d79c7548c6d39bbebba6e9a70",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d8e916507b88e389e26d4ab03c904a082aa66bb9",
+                "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9",
                 "shasum": ""
             },
             "require": {
                 "ext-iconv": "*",
-                "php": ">=5.6.20"
+                "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27"
+                "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41",
+                "rawr/cross-data-providers": "^2.0.0"
             },
             "suggest": {
                 "ext-mbstring": "for parsing UTF-8 CSS"
@@ -3831,9 +3810,9 @@
             ],
             "support": {
                 "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
-                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.6.0"
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.9.0"
             },
-            "time": "2024-07-01T07:33:21+00:00"
+            "time": "2025-07-11T13:20:48+00:00"
         },
         {
             "name": "setasign/fpdf",
@@ -3883,31 +3862,31 @@
         },
         {
             "name": "setasign/fpdi",
-            "version": "v2.6.0",
+            "version": "v2.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Setasign/FPDI.git",
-                "reference": "a6db878129ec6c7e141316ee71872923e7f1b7ad"
+                "reference": "67c31f5e50c93c20579ca9e23035d8c540b51941"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/a6db878129ec6c7e141316ee71872923e7f1b7ad",
-                "reference": "a6db878129ec6c7e141316ee71872923e7f1b7ad",
+                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/67c31f5e50c93c20579ca9e23035d8c540b51941",
+                "reference": "67c31f5e50c93c20579ca9e23035d8c540b51941",
                 "shasum": ""
             },
             "require": {
                 "ext-zlib": "*",
-                "php": "^5.6 || ^7.0 || ^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "conflict": {
                 "setasign/tfpdf": "<1.31"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5.7",
+                "phpunit/phpunit": "^7",
                 "setasign/fpdf": "~1.8.6",
                 "setasign/tfpdf": "~1.33",
                 "squizlabs/php_codesniffer": "^3.5",
-                "tecnickcom/tcpdf": "~6.2"
+                "tecnickcom/tcpdf": "^6.2"
             },
             "suggest": {
                 "setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured."
@@ -3943,7 +3922,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Setasign/FPDI/issues",
-                "source": "https://github.com/Setasign/FPDI/tree/v2.6.0"
+                "source": "https://github.com/Setasign/FPDI/tree/v2.6.3"
             },
             "funding": [
                 {
@@ -3951,20 +3930,103 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-11T16:03:32+00:00"
+            "time": "2025-02-05T13:22:35+00:00"
         },
         {
-            "name": "symfony/console",
-            "version": "v6.4.9",
+            "name": "spatie/laravel-permission",
+            "version": "6.20.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9"
+                "url": "https://github.com/spatie/laravel-permission.git",
+                "reference": "31c05679102c73f3b0d05790d2400182745a5615"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9",
-                "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9",
+                "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/31c05679102c73f3b0d05790d2400182745a5615",
+                "reference": "31c05679102c73f3b0d05790d2400182745a5615",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/auth": "^8.12|^9.0|^10.0|^11.0|^12.0",
+                "illuminate/container": "^8.12|^9.0|^10.0|^11.0|^12.0",
+                "illuminate/contracts": "^8.12|^9.0|^10.0|^11.0|^12.0",
+                "illuminate/database": "^8.12|^9.0|^10.0|^11.0|^12.0",
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "laravel/passport": "^11.0|^12.0",
+                "laravel/pint": "^1.0",
+                "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0|^10.0",
+                "phpunit/phpunit": "^9.4|^10.1|^11.5"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Spatie\\Permission\\PermissionServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-main": "6.x-dev",
+                    "dev-master": "6.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Spatie\\Permission\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Freek Van der Herten",
+                    "email": "freek@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Permission handling for Laravel 8.0 and up",
+            "homepage": "https://github.com/spatie/laravel-permission",
+            "keywords": [
+                "acl",
+                "laravel",
+                "permission",
+                "permissions",
+                "rbac",
+                "roles",
+                "security",
+                "spatie"
+            ],
+            "support": {
+                "issues": "https://github.com/spatie/laravel-permission/issues",
+                "source": "https://github.com/spatie/laravel-permission/tree/6.20.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-06-05T07:33:07+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v6.4.23",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "9056771b8eca08d026cd3280deeec3cfd99c4d93"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9056771b8eca08d026cd3280deeec3cfd99c4d93",
+                "reference": "9056771b8eca08d026cd3280deeec3cfd99c4d93",
                 "shasum": ""
             },
             "require": {
@@ -4029,7 +4091,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.9"
+                "source": "https://github.com/symfony/console/tree/v6.4.23"
             },
             "funding": [
                 {
@@ -4045,20 +4107,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T09:49:33+00:00"
+            "time": "2025-06-27T19:37:22+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v7.1.1",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4"
+                "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/1c7cee86c6f812896af54434f8ce29c8d94f9ff4",
-                "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/601a5ce9aaad7bf10797e3663faefce9e26c24e2",
+                "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2",
                 "shasum": ""
             },
             "require": {
@@ -4094,7 +4156,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v7.1.1"
+                "source": "https://github.com/symfony/css-selector/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -4110,20 +4172,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.5.0",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
                 "shasum": ""
             },
             "require": {
@@ -4131,12 +4193,12 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.5-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -4161,7 +4223,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -4177,20 +4239,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.9",
+            "version": "v6.4.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "c9b7cc075b3ab484239855622ca05cb0b99c13ec"
+                "reference": "b088e0b175c30b4e06d8085200fa465b586f44fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c9b7cc075b3ab484239855622ca05cb0b99c13ec",
-                "reference": "c9b7cc075b3ab484239855622ca05cb0b99c13ec",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/b088e0b175c30b4e06d8085200fa465b586f44fa",
+                "reference": "b088e0b175c30b4e06d8085200fa465b586f44fa",
                 "shasum": ""
             },
             "require": {
@@ -4236,7 +4298,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.9"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.23"
             },
             "funding": [
                 {
@@ -4252,20 +4314,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-21T16:04:15+00:00"
+            "time": "2025-06-13T07:39:48+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.1.1",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7"
+                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
-                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/497f73ac996a598c92409b44ac43b6690c4f666d",
+                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d",
                 "shasum": ""
             },
             "require": {
@@ -4316,7 +4378,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.1"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -4332,20 +4394,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2025-04-22T09:11:45+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.5.0",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50"
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50",
-                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586",
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586",
                 "shasum": ""
             },
             "require": {
@@ -4354,12 +4416,12 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.5-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -4392,7 +4454,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -4408,20 +4470,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.8",
+            "version": "v6.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "3ef977a43883215d560a2cecb82ec8e62131471c"
+                "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c",
-                "reference": "3ef977a43883215d560a2cecb82ec8e62131471c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7",
+                "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7",
                 "shasum": ""
             },
             "require": {
@@ -4456,7 +4518,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.8"
+                "source": "https://github.com/symfony/finder/tree/v6.4.17"
             },
             "funding": [
                 {
@@ -4472,20 +4534,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-12-29T13:51:37+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.8",
+            "version": "v6.4.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "27de8cc95e11db7a50b027e71caaab9024545947"
+                "reference": "452d19f945ee41345fd8a50c18b60783546b7bd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947",
-                "reference": "27de8cc95e11db7a50b027e71caaab9024545947",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/452d19f945ee41345fd8a50c18b60783546b7bd3",
+                "reference": "452d19f945ee41345fd8a50c18b60783546b7bd3",
                 "shasum": ""
             },
             "require": {
@@ -4495,12 +4557,12 @@
                 "symfony/polyfill-php83": "^1.27"
             },
             "conflict": {
-                "symfony/cache": "<6.3"
+                "symfony/cache": "<6.4.12|>=7.0,<7.1.5"
             },
             "require-dev": {
                 "doctrine/dbal": "^2.13.1|^3|^4",
                 "predis/predis": "^1.1|^2.0",
-                "symfony/cache": "^6.3|^7.0",
+                "symfony/cache": "^6.4.12|^7.1.5",
                 "symfony/dependency-injection": "^5.4|^6.0|^7.0",
                 "symfony/expression-language": "^5.4|^6.0|^7.0",
                 "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0",
@@ -4533,7 +4595,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.8"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.23"
             },
             "funding": [
                 {
@@ -4549,20 +4611,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2025-05-26T09:17:58+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.9",
+            "version": "v6.4.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "cc4a9bec6e1bdd2405f40277a68a6ed1bb393005"
+                "reference": "2bb2cba685aabd859f22cf6946554e8e7f3c329a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/cc4a9bec6e1bdd2405f40277a68a6ed1bb393005",
-                "reference": "cc4a9bec6e1bdd2405f40277a68a6ed1bb393005",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2bb2cba685aabd859f22cf6946554e8e7f3c329a",
+                "reference": "2bb2cba685aabd859f22cf6946554e8e7f3c329a",
                 "shasum": ""
             },
             "require": {
@@ -4647,7 +4709,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.9"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.23"
             },
             "funding": [
                 {
@@ -4663,20 +4725,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T11:48:06+00:00"
+            "time": "2025-06-28T08:14:51+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v6.4.9",
+            "version": "v6.4.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "e2d56f180f5b8c5e7c0fbea872bb1f529b6d6d45"
+                "reference": "a480322ddf8e54de262c9bca31fdcbe26b553de5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/e2d56f180f5b8c5e7c0fbea872bb1f529b6d6d45",
-                "reference": "e2d56f180f5b8c5e7c0fbea872bb1f529b6d6d45",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/a480322ddf8e54de262c9bca31fdcbe26b553de5",
+                "reference": "a480322ddf8e54de262c9bca31fdcbe26b553de5",
                 "shasum": ""
             },
             "require": {
@@ -4727,7 +4789,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v6.4.9"
+                "source": "https://github.com/symfony/mailer/tree/v6.4.23"
             },
             "funding": [
                 {
@@ -4743,20 +4805,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T07:59:05+00:00"
+            "time": "2025-06-26T21:24:02+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.9",
+            "version": "v6.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "7d048964877324debdcb4e0549becfa064a20d43"
+                "reference": "fec8aa5231f3904754955fad33c2db50594d22d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/7d048964877324debdcb4e0549becfa064a20d43",
-                "reference": "7d048964877324debdcb4e0549becfa064a20d43",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/fec8aa5231f3904754955fad33c2db50594d22d1",
+                "reference": "fec8aa5231f3904754955fad33c2db50594d22d1",
                 "shasum": ""
             },
             "require": {
@@ -4812,7 +4874,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.9"
+                "source": "https://github.com/symfony/mime/tree/v6.4.21"
             },
             "funding": [
                 {
@@ -4828,24 +4890,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T09:49:33+00:00"
+            "time": "2025-04-27T13:27:38+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.30.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
-                "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -4856,8 +4918,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4891,7 +4953,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -4907,24 +4969,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.30.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a"
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a",
-                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -4932,8 +4994,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4969,7 +5031,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -4985,26 +5047,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.30.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c"
+                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
-                "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/9614ac4d8061dc257ecc64cba1b140873dce8ad3",
+                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php72": "^1.10"
+                "php": ">=7.2",
+                "symfony/polyfill-intl-normalizer": "^1.10"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -5012,8 +5073,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5053,7 +5114,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -5069,24 +5130,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-10T14:38:51+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.30.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb"
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb",
-                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -5094,8 +5155,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5134,7 +5195,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -5150,24 +5211,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.30.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c"
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c",
-                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "ext-iconv": "*",
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-mbstring": "*"
@@ -5178,8 +5240,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5214,7 +5276,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -5230,103 +5292,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-19T12:30:46+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.30.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "10112722600777e02d2745716b70c5db4ca70442"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442",
-                "reference": "10112722600777e02d2745716b70c5db4ca70442",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-06-19T12:30:46+00:00"
+            "time": "2024-12-23T08:48:59+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.30.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433"
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433",
-                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5367,7 +5356,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -5383,30 +5372,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2025-01-02T08:10:11+00:00"
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.30.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9"
+                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
-                "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491",
+                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5443,7 +5432,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -5459,24 +5448,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-19T12:35:24+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.30.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9"
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/2ba1f33797470debcda07fe9dce20a0003df18e9",
-                "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-uuid": "*"
@@ -5487,8 +5476,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5522,7 +5511,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -5538,20 +5527,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v6.4.8",
+            "version": "v6.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5"
+                "reference": "e2a61c16af36c9a07e5c9906498b73e091949a20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5",
-                "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5",
+                "url": "https://api.github.com/repos/symfony/process/zipball/e2a61c16af36c9a07e5c9906498b73e091949a20",
+                "reference": "e2a61c16af36c9a07e5c9906498b73e091949a20",
                 "shasum": ""
             },
             "require": {
@@ -5583,7 +5572,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.8"
+                "source": "https://github.com/symfony/process/tree/v6.4.20"
             },
             "funding": [
                 {
@@ -5599,20 +5588,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2025-03-10T17:11:00+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.8",
+            "version": "v6.4.22",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58"
+                "reference": "1f5234e8457164a3a0038a4c0a4ba27876a9c670"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58",
-                "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/1f5234e8457164a3a0038a4c0a4ba27876a9c670",
+                "reference": "1f5234e8457164a3a0038a4c0a4ba27876a9c670",
                 "shasum": ""
             },
             "require": {
@@ -5666,7 +5655,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.8"
+                "source": "https://github.com/symfony/routing/tree/v6.4.22"
             },
             "funding": [
                 {
@@ -5682,20 +5671,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2025-04-27T16:08:38+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.5.0",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
                 "shasum": ""
             },
             "require": {
@@ -5708,12 +5697,12 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.5-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -5749,7 +5738,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -5765,20 +5754,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2025-04-25T09:37:31+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v7.1.2",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8"
+                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/14221089ac66cf82e3cf3d1c1da65de305587ff8",
-                "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8",
+                "url": "https://api.github.com/repos/symfony/string/zipball/f3570b8c61ca887a9e2938e85cb6458515d2b125",
+                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125",
                 "shasum": ""
             },
             "require": {
@@ -5836,7 +5825,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.2"
+                "source": "https://github.com/symfony/string/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -5852,20 +5841,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T09:27:18+00:00"
+            "time": "2025-04-20T20:19:01+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.4.8",
+            "version": "v6.4.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a"
+                "reference": "de8afa521e04a5220e9e58a1dc99971ab7cac643"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/a002933b13989fc4bd0b58e04bf7eec5210e438a",
-                "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/de8afa521e04a5220e9e58a1dc99971ab7cac643",
+                "reference": "de8afa521e04a5220e9e58a1dc99971ab7cac643",
                 "shasum": ""
             },
             "require": {
@@ -5931,7 +5920,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.8"
+                "source": "https://github.com/symfony/translation/tree/v6.4.23"
             },
             "funding": [
                 {
@@ -5947,20 +5936,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2025-06-26T21:24:02+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.5.0",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a"
+                "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
-                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/df210c7a2573f1913b2d17cc95f90f53a73d8f7d",
+                "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d",
                 "shasum": ""
             },
             "require": {
@@ -5968,12 +5957,12 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.5-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -6009,7 +5998,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -6025,20 +6014,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-27T08:32:26+00:00"
         },
         {
             "name": "symfony/uid",
-            "version": "v6.4.8",
+            "version": "v6.4.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "35904eca37a84bb764c560cbfcac9f0ac2bcdbdf"
+                "reference": "9c8592da78d7ee6af52011eef593350d87e814c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/35904eca37a84bb764c560cbfcac9f0ac2bcdbdf",
-                "reference": "35904eca37a84bb764c560cbfcac9f0ac2bcdbdf",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/9c8592da78d7ee6af52011eef593350d87e814c0",
+                "reference": "9c8592da78d7ee6af52011eef593350d87e814c0",
                 "shasum": ""
             },
             "require": {
@@ -6083,7 +6072,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.4.8"
+                "source": "https://github.com/symfony/uid/tree/v6.4.23"
             },
             "funding": [
                 {
@@ -6099,20 +6088,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2025-06-26T08:06:12+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.9",
+            "version": "v6.4.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "c31566e4ca944271cc8d8ac6887cbf31b8c6a172"
+                "reference": "d55b1834cdbfcc31bc2cd7e095ba5ed9a88f6600"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c31566e4ca944271cc8d8ac6887cbf31b8c6a172",
-                "reference": "c31566e4ca944271cc8d8ac6887cbf31b8c6a172",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d55b1834cdbfcc31bc2cd7e095ba5ed9a88f6600",
+                "reference": "d55b1834cdbfcc31bc2cd7e095ba5ed9a88f6600",
                 "shasum": ""
             },
             "require": {
@@ -6168,7 +6157,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.9"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.23"
             },
             "funding": [
                 {
@@ -6184,35 +6173,37 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-27T13:23:14+00:00"
+            "time": "2025-06-27T15:05:27+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
-            "version": "v2.2.7",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
-                "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb"
+                "reference": "0d72ac1c00084279c1816675284073c5a337c20d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb",
-                "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb",
+                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0d72ac1c00084279c1816675284073c5a337c20d",
+                "reference": "0d72ac1c00084279c1816675284073c5a337c20d",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
-                "php": "^5.5 || ^7.0 || ^8.0",
-                "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
+                "php": "^7.4 || ^8.0",
+                "symfony/css-selector": "^5.4 || ^6.0 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10"
+                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpunit/phpunit": "^8.5.21 || ^9.5.10"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.2.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
@@ -6235,29 +6226,29 @@
             "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
             "support": {
                 "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
-                "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7"
+                "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.3.0"
             },
-            "time": "2023-12-08T13:03:43+00:00"
+            "time": "2024-12-21T16:25:41+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v5.6.0",
+            "version": "v5.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"
+                "reference": "24ac4c74f91ee2c193fa1aaa5c249cb0822809af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
-                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/24ac4c74f91ee2c193fa1aaa5c249cb0822809af",
+                "reference": "24ac4c74f91ee2c193fa1aaa5c249cb0822809af",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.1.2",
+                "graham-campbell/result-type": "^1.1.3",
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2",
+                "phpoption/phpoption": "^1.9.3",
                 "symfony/polyfill-ctype": "^1.24",
                 "symfony/polyfill-mbstring": "^1.24",
                 "symfony/polyfill-php80": "^1.24"
@@ -6274,7 +6265,7 @@
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "5.6-dev"
@@ -6309,7 +6300,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.2"
             },
             "funding": [
                 {
@@ -6321,20 +6312,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T22:43:29+00:00"
+            "time": "2025-04-30T23:37:27+00:00"
         },
         {
             "name": "voku/portable-ascii",
-            "version": "2.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "b56450eed252f6801410d810c8e1727224ae0743"
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743",
-                "reference": "b56450eed252f6801410d810c8e1727224ae0743",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
                 "shasum": ""
             },
             "require": {
@@ -6359,7 +6350,7 @@
             "authors": [
                 {
                     "name": "Lars Moelleken",
-                    "homepage": "http://www.moelleken.org/"
+                    "homepage": "https://www.moelleken.org/"
                 }
             ],
             "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
@@ -6371,7 +6362,7 @@
             ],
             "support": {
                 "issues": "https://github.com/voku/portable-ascii/issues",
-                "source": "https://github.com/voku/portable-ascii/tree/2.0.1"
+                "source": "https://github.com/voku/portable-ascii/tree/2.0.3"
             },
             "funding": [
                 {
@@ -6395,7 +6386,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-08T17:03:00+00:00"
+            "time": "2024-11-21T01:49:47+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -6540,13 +6531,13 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "9.0-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Yajra\\DataTables\\ButtonsServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-master": "9.0-dev"
                 }
             },
             "autoload": {
@@ -6617,13 +6608,13 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Yajra\\DataTables\\EditorServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -6695,13 +6686,13 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "9.0-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Yajra\\DataTables\\FractalServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-master": "9.0-dev"
                 }
             },
             "autoload": {
@@ -6758,13 +6749,13 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "9.0-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Yajra\\DataTables\\HtmlServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-master": "9.0-dev"
                 }
             },
             "autoload": {
@@ -6849,16 +6840,16 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "10.x-dev"
-                },
                 "laravel": {
-                    "providers": [
-                        "Yajra\\DataTables\\DataTablesServiceProvider"
-                    ],
                     "aliases": {
                         "DataTables": "Yajra\\DataTables\\Facades\\DataTables"
-                    }
+                    },
+                    "providers": [
+                        "Yajra\\DataTables\\DataTablesServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "10.x-dev"
                 }
             },
             "autoload": {
@@ -6971,16 +6962,16 @@
         },
         {
             "name": "fakerphp/faker",
-            "version": "v1.23.1",
+            "version": "v1.24.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FakerPHP/Faker.git",
-                "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b"
+                "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b",
-                "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b",
+                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5",
+                "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5",
                 "shasum": ""
             },
             "require": {
@@ -7028,32 +7019,32 @@
             ],
             "support": {
                 "issues": "https://github.com/FakerPHP/Faker/issues",
-                "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1"
+                "source": "https://github.com/FakerPHP/Faker/tree/v1.24.1"
             },
-            "time": "2024-01-02T13:46:09+00:00"
+            "time": "2024-11-21T13:46:39+00:00"
         },
         {
             "name": "filp/whoops",
-            "version": "2.15.4",
+            "version": "2.18.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546"
+                "reference": "59a123a3d459c5a23055802237cb317f609867e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546",
-                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/59a123a3d459c5a23055802237cb317f609867e5",
+                "reference": "59a123a3d459c5a23055802237cb317f609867e5",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9 || ^7.0 || ^8.0",
+                "php": "^7.1 || ^8.0",
                 "psr/log": "^1.0.1 || ^2.0 || ^3.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9 || ^1.0",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3",
-                "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0"
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3",
+                "symfony/var-dumper": "^4.0 || ^5.0"
             },
             "suggest": {
                 "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -7093,7 +7084,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.15.4"
+                "source": "https://github.com/filp/whoops/tree/2.18.3"
             },
             "funding": [
                 {
@@ -7101,24 +7092,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-03T12:00:00+00:00"
+            "time": "2025-06-16T00:02:10+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
-            "version": "v2.0.1",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hamcrest/hamcrest-php.git",
-                "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3"
+                "reference": "f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
-                "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487",
+                "reference": "f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3|^7.0|^8.0"
+                "php": "^7.4|^8.0"
             },
             "replace": {
                 "cordoval/hamcrest-php": "*",
@@ -7126,8 +7117,8 @@
                 "kodova/hamcrest-php": "*"
             },
             "require-dev": {
-                "phpunit/php-file-iterator": "^1.4 || ^2.0",
-                "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0"
+                "phpunit/php-file-iterator": "^1.4 || ^2.0 || ^3.0",
+                "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
@@ -7150,9 +7141,9 @@
             ],
             "support": {
                 "issues": "https://github.com/hamcrest/hamcrest-php/issues",
-                "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1"
+                "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.1.1"
             },
-            "time": "2020-07-09T08:09:16+00:00"
+            "time": "2025-04-30T06:54:44+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -7239,16 +7230,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.12.0",
+            "version": "1.13.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
+                "reference": "faed855a7b5f4d4637717c2b3863e277116beb36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
-                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/faed855a7b5f4d4637717c2b3863e277116beb36",
+                "reference": "faed855a7b5f4d4637717c2b3863e277116beb36",
                 "shasum": ""
             },
             "require": {
@@ -7287,7 +7278,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.3"
             },
             "funding": [
                 {
@@ -7295,7 +7286,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-12T14:39:25+00:00"
+            "time": "2025-07-05T12:25:42+00:00"
         },
         {
             "name": "nunomaduro/collision",
@@ -7328,13 +7319,13 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-develop": "6.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-develop": "6.x-dev"
                 }
             },
             "autoload": {
@@ -7505,35 +7496,35 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.31",
+            "version": "9.2.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965"
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965",
-                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5",
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.18 || ^5.0",
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
                 "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.3",
-                "phpunit/php-text-template": "^2.0.2",
-                "sebastian/code-unit-reverse-lookup": "^2.0.2",
-                "sebastian/complexity": "^2.0",
-                "sebastian/environment": "^5.1.2",
-                "sebastian/lines-of-code": "^1.0.3",
-                "sebastian/version": "^3.0.1",
-                "theseer/tokenizer": "^1.2.0"
+                "phpunit/php-file-iterator": "^3.0.6",
+                "phpunit/php-text-template": "^2.0.4",
+                "sebastian/code-unit-reverse-lookup": "^2.0.3",
+                "sebastian/complexity": "^2.0.3",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/lines-of-code": "^1.0.4",
+                "sebastian/version": "^3.0.2",
+                "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.6"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -7542,7 +7533,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.2-dev"
+                    "dev-main": "9.2.x-dev"
                 }
             },
             "autoload": {
@@ -7571,7 +7562,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32"
             },
             "funding": [
                 {
@@ -7579,7 +7570,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T06:37:42+00:00"
+            "time": "2024-08-22T04:23:01+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -7824,45 +7815,45 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.19",
+            "version": "9.6.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8"
+                "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8",
-                "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/43d2cb18d0675c38bd44982a5d1d88f6d53d8d95",
+                "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1 || ^2",
+                "doctrine/instantiator": "^1.5.0 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.3",
-                "phar-io/version": "^3.0.2",
+                "myclabs/deep-copy": "^1.13.1",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
                 "php": ">=7.3",
-                "phpunit/php-code-coverage": "^9.2.28",
-                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-code-coverage": "^9.2.32",
+                "phpunit/php-file-iterator": "^3.0.6",
                 "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.3",
-                "phpunit/php-timer": "^5.0.2",
-                "sebastian/cli-parser": "^1.0.1",
-                "sebastian/code-unit": "^1.0.6",
+                "phpunit/php-text-template": "^2.0.4",
+                "phpunit/php-timer": "^5.0.3",
+                "sebastian/cli-parser": "^1.0.2",
+                "sebastian/code-unit": "^1.0.8",
                 "sebastian/comparator": "^4.0.8",
-                "sebastian/diff": "^4.0.3",
-                "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.5",
-                "sebastian/global-state": "^5.0.1",
-                "sebastian/object-enumerator": "^4.0.3",
-                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.2",
+                "sebastian/diff": "^4.0.6",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/exporter": "^4.0.6",
+                "sebastian/global-state": "^5.0.7",
+                "sebastian/object-enumerator": "^4.0.4",
+                "sebastian/resource-operations": "^3.0.4",
+                "sebastian/type": "^3.2.1",
                 "sebastian/version": "^3.0.2"
             },
             "suggest": {
@@ -7907,7 +7898,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.23"
             },
             "funding": [
                 {
@@ -7918,12 +7909,20 @@
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-05T04:35:58+00:00"
+            "time": "2025-05-02T06:40:34+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -8890,27 +8889,27 @@
         },
         {
             "name": "spatie/backtrace",
-            "version": "1.6.1",
+            "version": "1.7.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/backtrace.git",
-                "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23"
+                "reference": "cd37a49fce7137359ac30ecc44ef3e16404cccbe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/backtrace/zipball/8373b9d51638292e3bfd736a9c19a654111b4a23",
-                "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23",
+                "url": "https://api.github.com/repos/spatie/backtrace/zipball/cd37a49fce7137359ac30ecc44ef3e16404cccbe",
+                "reference": "cd37a49fce7137359ac30ecc44ef3e16404cccbe",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3|^8.0"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "ext-json": "*",
-                "laravel/serializable-closure": "^1.3",
-                "phpunit/phpunit": "^9.3",
-                "spatie/phpunit-snapshot-assertions": "^4.2",
-                "symfony/var-dumper": "^5.1"
+                "laravel/serializable-closure": "^1.3 || ^2.0",
+                "phpunit/phpunit": "^9.3 || ^11.4.3",
+                "spatie/phpunit-snapshot-assertions": "^4.2 || ^5.1.6",
+                "symfony/var-dumper": "^5.1 || ^6.0 || ^7.0"
             },
             "type": "library",
             "autoload": {
@@ -8937,7 +8936,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/backtrace/tree/1.6.1"
+                "source": "https://github.com/spatie/backtrace/tree/1.7.4"
             },
             "funding": [
                 {
@@ -8949,24 +8948,24 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-04-24T13:22:11+00:00"
+            "time": "2025-05-08T15:41:09+00:00"
         },
         {
             "name": "spatie/flare-client-php",
-            "version": "1.7.0",
+            "version": "1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/flare-client-php.git",
-                "reference": "097040ff51e660e0f6fc863684ac4b02c93fa234"
+                "reference": "bf1716eb98bd689451b071548ae9e70738dce62f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/097040ff51e660e0f6fc863684ac4b02c93fa234",
-                "reference": "097040ff51e660e0f6fc863684ac4b02c93fa234",
+                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/bf1716eb98bd689451b071548ae9e70738dce62f",
+                "reference": "bf1716eb98bd689451b071548ae9e70738dce62f",
                 "shasum": ""
             },
             "require": {
-                "illuminate/pipeline": "^8.0|^9.0|^10.0|^11.0",
+                "illuminate/pipeline": "^8.0|^9.0|^10.0|^11.0|^12.0",
                 "php": "^8.0",
                 "spatie/backtrace": "^1.6.1",
                 "symfony/http-foundation": "^5.2|^6.0|^7.0",
@@ -8980,7 +8979,7 @@
                 "phpstan/extension-installer": "^1.1",
                 "phpstan/phpstan-deprecation-rules": "^1.0",
                 "phpstan/phpstan-phpunit": "^1.0",
-                "spatie/phpunit-snapshot-assertions": "^4.0|^5.0"
+                "spatie/pest-plugin-snapshots": "^1.0|^2.0"
             },
             "type": "library",
             "extra": {
@@ -9010,7 +9009,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/flare-client-php/issues",
-                "source": "https://github.com/spatie/flare-client-php/tree/1.7.0"
+                "source": "https://github.com/spatie/flare-client-php/tree/1.10.1"
             },
             "funding": [
                 {
@@ -9018,7 +9017,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-12T14:39:14+00:00"
+            "time": "2025-02-14T13:42:06+00:00"
         },
         {
             "name": "spatie/ignition",
@@ -9144,12 +9143,12 @@
             "type": "library",
             "extra": {
                 "laravel": {
-                    "providers": [
-                        "Spatie\\LaravelIgnition\\IgnitionServiceProvider"
-                    ],
                     "aliases": {
                         "Flare": "Spatie\\LaravelIgnition\\Facades\\Flare"
-                    }
+                    },
+                    "providers": [
+                        "Spatie\\LaravelIgnition\\IgnitionServiceProvider"
+                    ]
                 }
             },
             "autoload": {
@@ -9246,12 +9245,12 @@
     ],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
         "php": "^8.0.2|^8.2.0"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }
diff --git a/config/auth.php b/config/auth.php
index aaf982b..eabbc4d 100755
--- a/config/auth.php
+++ b/config/auth.php
@@ -1,7 +1,6 @@
 <?php
 
 return [
-
     /*
     |--------------------------------------------------------------------------
     | Authentication Defaults
@@ -13,9 +12,9 @@ return [
     |
     */
 
-    'defaults' => [
-        'guard' => 'web',
-        'passwords' => 'users',
+    "defaults" => [
+        "guard" => "web",
+        "passwords" => "users",
     ],
 
     /*
@@ -35,16 +34,16 @@ return [
     |
     */
 
-    'guards' => [
-        'web' => [
-            'driver' => 'session',
-            'provider' => 'users',
+    "guards" => [
+        "web" => [
+            "driver" => "session",
+            "provider" => "users",
         ],
 
-        'api' => [
-            'driver' => 'token',
-            'provider' => 'users',
-            'hash' => false,
+        "api" => [
+            "driver" => "token",
+            "provider" => "users",
+            "hash" => false,
         ],
     ],
 
@@ -65,10 +64,10 @@ return [
     |
     */
 
-    'providers' => [
-        'users' => [
-            'driver' => 'eloquent',
-            'model' => App\User::class,
+    "providers" => [
+        "users" => [
+            "driver" => "eloquent",
+            "model" => App\User::class,
         ],
 
         // 'users' => [
@@ -92,12 +91,12 @@ return [
     |
     */
 
-    'passwords' => [
-        'users' => [
-            'provider' => 'users',
-            'table' => 'password_resets',
-            'expire' => 60,
-            'throttle' => 60,
+    "passwords" => [
+        "users" => [
+            "provider" => "users",
+            "table" => "password_resets",
+            "expire" => 60,
+            "throttle" => 60,
         ],
     ],
 
@@ -112,6 +111,5 @@ return [
     |
     */
 
-    'password_timeout' => 10800,
-
-];
+    "password_timeout" => 10800,
+];
\ No newline at end of file
diff --git a/config/permission.php b/config/permission.php
new file mode 100644
index 0000000..f39f6b5
--- /dev/null
+++ b/config/permission.php
@@ -0,0 +1,202 @@
+<?php
+
+return [
+
+    'models' => [
+
+        /*
+         * When using the "HasPermissions" trait from this package, we need to know which
+         * Eloquent model should be used to retrieve your permissions. Of course, it
+         * is often just the "Permission" model but you may use whatever you like.
+         *
+         * The model you want to use as a Permission model needs to implement the
+         * `Spatie\Permission\Contracts\Permission` contract.
+         */
+
+        'permission' => Spatie\Permission\Models\Permission::class,
+
+        /*
+         * When using the "HasRoles" trait from this package, we need to know which
+         * Eloquent model should be used to retrieve your roles. Of course, it
+         * is often just the "Role" model but you may use whatever you like.
+         *
+         * The model you want to use as a Role model needs to implement the
+         * `Spatie\Permission\Contracts\Role` contract.
+         */
+
+        'role' => Spatie\Permission\Models\Role::class,
+
+    ],
+
+    'table_names' => [
+
+        /*
+         * When using the "HasRoles" trait from this package, we need to know which
+         * table should be used to retrieve your roles. We have chosen a basic
+         * default value but you may easily change it to any table you like.
+         */
+
+        'roles' => 'roles',
+
+        /*
+         * When using the "HasPermissions" trait from this package, we need to know which
+         * table should be used to retrieve your permissions. We have chosen a basic
+         * default value but you may easily change it to any table you like.
+         */
+
+        'permissions' => 'permissions',
+
+        /*
+         * When using the "HasPermissions" trait from this package, we need to know which
+         * table should be used to retrieve your models permissions. We have chosen a
+         * basic default value but you may easily change it to any table you like.
+         */
+
+        'model_has_permissions' => 'model_has_permissions',
+
+        /*
+         * When using the "HasRoles" trait from this package, we need to know which
+         * table should be used to retrieve your models roles. We have chosen a
+         * basic default value but you may easily change it to any table you like.
+         */
+
+        'model_has_roles' => 'model_has_roles',
+
+        /*
+         * When using the "HasRoles" trait from this package, we need to know which
+         * table should be used to retrieve your roles permissions. We have chosen a
+         * basic default value but you may easily change it to any table you like.
+         */
+
+        'role_has_permissions' => 'role_has_permissions',
+    ],
+
+    'column_names' => [
+        /*
+         * Change this if you want to name the related pivots other than defaults
+         */
+        'role_pivot_key' => null, // default 'role_id',
+        'permission_pivot_key' => null, // default 'permission_id',
+
+        /*
+         * Change this if you want to name the related model primary key other than
+         * `model_id`.
+         *
+         * For example, this would be nice if your primary keys are all UUIDs. In
+         * that case, name this `model_uuid`.
+         */
+
+        'model_morph_key' => 'model_id',
+
+        /*
+         * Change this if you want to use the teams feature and your related model's
+         * foreign key is other than `team_id`.
+         */
+
+        'team_foreign_key' => 'team_id',
+    ],
+
+    /*
+     * When set to true, the method for checking permissions will be registered on the gate.
+     * Set this to false if you want to implement custom logic for checking permissions.
+     */
+
+    'register_permission_check_method' => true,
+
+    /*
+     * When set to true, Laravel\Octane\Events\OperationTerminated event listener will be registered
+     * this will refresh permissions on every TickTerminated, TaskTerminated and RequestTerminated
+     * NOTE: This should not be needed in most cases, but an Octane/Vapor combination benefited from it.
+     */
+    'register_octane_reset_listener' => false,
+
+    /*
+     * Events will fire when a role or permission is assigned/unassigned:
+     * \Spatie\Permission\Events\RoleAttached
+     * \Spatie\Permission\Events\RoleDetached
+     * \Spatie\Permission\Events\PermissionAttached
+     * \Spatie\Permission\Events\PermissionDetached
+     *
+     * To enable, set to true, and then create listeners to watch these events.
+     */
+    'events_enabled' => false,
+
+    /*
+     * Teams Feature.
+     * When set to true the package implements teams using the 'team_foreign_key'.
+     * If you want the migrations to register the 'team_foreign_key', you must
+     * set this to true before doing the migration.
+     * If you already did the migration then you must make a new migration to also
+     * add 'team_foreign_key' to 'roles', 'model_has_roles', and 'model_has_permissions'
+     * (view the latest version of this package's migration file)
+     */
+
+    'teams' => false,
+
+    /*
+     * The class to use to resolve the permissions team id
+     */
+    'team_resolver' => \Spatie\Permission\DefaultTeamResolver::class,
+
+    /*
+     * Passport Client Credentials Grant
+     * When set to true the package will use Passports Client to check permissions
+     */
+
+    'use_passport_client_credentials' => false,
+
+    /*
+     * When set to true, the required permission names are added to exception messages.
+     * This could be considered an information leak in some contexts, so the default
+     * setting is false here for optimum safety.
+     */
+
+    'display_permission_in_exception' => false,
+
+    /*
+     * When set to true, the required role names are added to exception messages.
+     * This could be considered an information leak in some contexts, so the default
+     * setting is false here for optimum safety.
+     */
+
+    'display_role_in_exception' => false,
+
+    /*
+     * By default wildcard permission lookups are disabled.
+     * See documentation to understand supported syntax.
+     */
+
+    'enable_wildcard_permission' => false,
+
+    /*
+     * The class to use for interpreting wildcard permissions.
+     * If you need to modify delimiters, override the class and specify its name here.
+     */
+    // 'wildcard_permission' => Spatie\Permission\WildcardPermission::class,
+
+    /* Cache-specific settings */
+
+    'cache' => [
+
+        /*
+         * By default all permissions are cached for 24 hours to speed up performance.
+         * When permissions or roles are updated the cache is flushed automatically.
+         */
+
+        'expiration_time' => \DateInterval::createFromDateString('24 hours'),
+
+        /*
+         * The cache key used to store all permissions.
+         */
+
+        'key' => 'spatie.permission.cache',
+
+        /*
+         * You may optionally indicate a specific cache driver to use for permission and
+         * role caching using any of the `store` drivers listed in the cache.php config
+         * file. Using 'default' here means to use the `default` set in cache.php.
+         */
+
+        'store' => 'default',
+    ],
+];
diff --git a/database/migrations/2025_07_12_195951_create_permission_tables.php b/database/migrations/2025_07_12_195951_create_permission_tables.php
new file mode 100644
index 0000000..ce4d9d2
--- /dev/null
+++ b/database/migrations/2025_07_12_195951_create_permission_tables.php
@@ -0,0 +1,136 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $teams = config('permission.teams');
+        $tableNames = config('permission.table_names');
+        $columnNames = config('permission.column_names');
+        $pivotRole = $columnNames['role_pivot_key'] ?? 'role_id';
+        $pivotPermission = $columnNames['permission_pivot_key'] ?? 'permission_id';
+
+        throw_if(empty($tableNames), new Exception('Error: config/permission.php not loaded. Run [php artisan config:clear] and try again.'));
+        throw_if($teams && empty($columnNames['team_foreign_key'] ?? null), new Exception('Error: team_foreign_key on config/permission.php not loaded. Run [php artisan config:clear] and try again.'));
+
+        Schema::create($tableNames['permissions'], static function (Blueprint $table) {
+            // $table->engine('InnoDB');
+            $table->bigIncrements('id'); // permission id
+            $table->string('name');       // For MyISAM use string('name', 225); // (or 166 for InnoDB with Redundant/Compact row format)
+            $table->string('guard_name'); // For MyISAM use string('guard_name', 25);
+            $table->timestamps();
+
+            $table->unique(['name', 'guard_name']);
+        });
+
+        Schema::create($tableNames['roles'], static function (Blueprint $table) use ($teams, $columnNames) {
+            // $table->engine('InnoDB');
+            $table->bigIncrements('id'); // role id
+            if ($teams || config('permission.testing')) { // permission.testing is a fix for sqlite testing
+                $table->unsignedBigInteger($columnNames['team_foreign_key'])->nullable();
+                $table->index($columnNames['team_foreign_key'], 'roles_team_foreign_key_index');
+            }
+            $table->string('name');       // For MyISAM use string('name', 225); // (or 166 for InnoDB with Redundant/Compact row format)
+            $table->string('guard_name'); // For MyISAM use string('guard_name', 25);
+            $table->timestamps();
+            if ($teams || config('permission.testing')) {
+                $table->unique([$columnNames['team_foreign_key'], 'name', 'guard_name']);
+            } else {
+                $table->unique(['name', 'guard_name']);
+            }
+        });
+
+        Schema::create($tableNames['model_has_permissions'], static function (Blueprint $table) use ($tableNames, $columnNames, $pivotPermission, $teams) {
+            $table->unsignedBigInteger($pivotPermission);
+
+            $table->string('model_type');
+            $table->unsignedBigInteger($columnNames['model_morph_key']);
+            $table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_permissions_model_id_model_type_index');
+
+            $table->foreign($pivotPermission)
+                ->references('id') // permission id
+                ->on($tableNames['permissions'])
+                ->onDelete('cascade');
+            if ($teams) {
+                $table->unsignedBigInteger($columnNames['team_foreign_key']);
+                $table->index($columnNames['team_foreign_key'], 'model_has_permissions_team_foreign_key_index');
+
+                $table->primary([$columnNames['team_foreign_key'], $pivotPermission, $columnNames['model_morph_key'], 'model_type'],
+                    'model_has_permissions_permission_model_type_primary');
+            } else {
+                $table->primary([$pivotPermission, $columnNames['model_morph_key'], 'model_type'],
+                    'model_has_permissions_permission_model_type_primary');
+            }
+
+        });
+
+        Schema::create($tableNames['model_has_roles'], static function (Blueprint $table) use ($tableNames, $columnNames, $pivotRole, $teams) {
+            $table->unsignedBigInteger($pivotRole);
+
+            $table->string('model_type');
+            $table->unsignedBigInteger($columnNames['model_morph_key']);
+            $table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_roles_model_id_model_type_index');
+
+            $table->foreign($pivotRole)
+                ->references('id') // role id
+                ->on($tableNames['roles'])
+                ->onDelete('cascade');
+            if ($teams) {
+                $table->unsignedBigInteger($columnNames['team_foreign_key']);
+                $table->index($columnNames['team_foreign_key'], 'model_has_roles_team_foreign_key_index');
+
+                $table->primary([$columnNames['team_foreign_key'], $pivotRole, $columnNames['model_morph_key'], 'model_type'],
+                    'model_has_roles_role_model_type_primary');
+            } else {
+                $table->primary([$pivotRole, $columnNames['model_morph_key'], 'model_type'],
+                    'model_has_roles_role_model_type_primary');
+            }
+        });
+
+        Schema::create($tableNames['role_has_permissions'], static function (Blueprint $table) use ($tableNames, $pivotRole, $pivotPermission) {
+            $table->unsignedBigInteger($pivotPermission);
+            $table->unsignedBigInteger($pivotRole);
+
+            $table->foreign($pivotPermission)
+                ->references('id') // permission id
+                ->on($tableNames['permissions'])
+                ->onDelete('cascade');
+
+            $table->foreign($pivotRole)
+                ->references('id') // role id
+                ->on($tableNames['roles'])
+                ->onDelete('cascade');
+
+            $table->primary([$pivotPermission, $pivotRole], 'role_has_permissions_permission_id_role_id_primary');
+        });
+
+        app('cache')
+            ->store(config('permission.cache.store') != 'default' ? config('permission.cache.store') : null)
+            ->forget(config('permission.cache.key'));
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        $tableNames = config('permission.table_names');
+
+        if (empty($tableNames)) {
+            throw new \Exception('Error: config/permission.php not found and defaults could not be merged. Please publish the package configuration before proceeding, or drop the tables manually.');
+        }
+
+        Schema::drop($tableNames['role_has_permissions']);
+        Schema::drop($tableNames['model_has_roles']);
+        Schema::drop($tableNames['model_has_permissions']);
+        Schema::drop($tableNames['roles']);
+        Schema::drop($tableNames['permissions']);
+    }
+};
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
index e5506df..eccc78c 100755
--- a/resources/lang/en/auth.php
+++ b/resources/lang/en/auth.php
@@ -1,7 +1,6 @@
 <?php
 
 return [
-
     /*
     |--------------------------------------------------------------------------
     | Authentication Language Lines
@@ -13,7 +12,6 @@ return [
     |
     */
 
-    'failed' => 'These credentials do not match our records.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
-
+    "failed" => "These credentials do not match our records.",
+    "throttle" => "Too many login attempts. Please try again in :seconds seconds.",
 ];
diff --git a/resources/views/menu_v1/clients.blade.php b/resources/views/menu_v1/clients.blade.php
index ce5f826..688919c 100755
--- a/resources/views/menu_v1/clients.blade.php
+++ b/resources/views/menu_v1/clients.blade.php
@@ -11,8 +11,8 @@
         }
 
         /* .select2-container {
-                                                                                                                                                                                                                                                                                                                z-index: 99999;
-                                                                                                                                                                                                                                                                                                            } */
+                                                                                                                                                                                                                                                                                                                        z-index: 99999;
+                                                                                                                                                                                                                                                                                                                    } */
     </style>
 @endsection
 
@@ -261,7 +261,9 @@
                 <div class="modal-footer">
                     {{-- <button type="button" id="btnDelClient_updt" class="btn btn-sm btn-warning">Delete ?</button> --}}
                     <button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
-                    <button type="button" id="btnSubmitUpdtClient" class="btn btn-sm btn-danger">Update data</button>
+                    @can('client.edit')
+                        <button type="button" id="btnSubmitUpdtClient" class="btn btn-sm btn-danger">Update data</button>
+                    @endcan
                     <div id="edt-btnSubmitUpdtClient" class="d-none">
                         <div class="spinner-border" role="status">
                             <span class="visually-hidden">Loading...</span>
@@ -415,7 +417,7 @@
                                 let action = `
                                     <a href="#" class="text-decoration-none me-1 btnEdtClient" data-bs-toggle="tooltip"
                                         data-bs-placement="bottom" title="Edit">
-                                        <span class="icon ion-edit fz-16"></span>
+                                        <span class="icon ion-eye fz-16"></span>
                                     </a>
 								`;
                                 // <a href="#" class="text-decoration-none text-danger btnDelClient"
diff --git a/resources/views/menu_v1/configs/devices.blade.php b/resources/views/menu_v1/configs/devices.blade.php
index d24f65f..85d5d31 100755
--- a/resources/views/menu_v1/configs/devices.blade.php
+++ b/resources/views/menu_v1/configs/devices.blade.php
@@ -7,8 +7,8 @@
 @section('customcss')
     <style>
         /* .select2-container {
-                                                                                                                                                    z-index: 99999;
-                                                                                                                                                } */
+                                                                                                                                                        z-index: 99999;
+                                                                                                                                                    } */
     </style>
 @endsection
 
@@ -21,9 +21,12 @@
                         <div class="col-3">
                             <p class="card-title text-bold mb-0">Device (<span id="count_devices">0</span>)</p>
                         </div>
-                        <div class="col text-end">
-                            <button id="btnMdlNewDevice" class="btn btn-sm btn-danger">Add New Device</button>
-                        </div>
+                        @can('config_master_device.create')
+                            <div class="col text-end">
+                                <button id="btnMdlNewDevice" class="btn btn-sm btn-danger">Add New Device</button>
+                            </div>
+                        @endcan
+
                         <div class="col-auto text-end ps-0">
                             {{-- <button class="btn btn-sm btn-danger">Upload</button> --}}
                             {{-- <button class="btn btn-sm btn-danger">Download</button> --}}
@@ -227,9 +230,13 @@
                     </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" id="btnDelDevice_updt" class="btn btn-sm btn-warning">Delete ?</button>
+                    @can('config_master_device.delete')
+                        <button type="button" id="btnDelDevice_updt" class="btn btn-sm btn-warning">Delete ?</button>
+                    @endcan
                     <button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
-                    <button id="btnSubmitUpdtDevices" type="button" class="btn btn-sm btn-danger">Update Data</button>
+                    @can('config_master_device.edit')
+                        <button id="btnSubmitUpdtDevices" type="button" class="btn btn-sm btn-danger">Ubah data</button>
+                    @endcan
                 </div>
             </div>
         </div>
@@ -329,13 +336,13 @@
                 });
                 $('#add-available').bind('change', function() {
                     if ($(this).is(':checked'))
-                        $('#add-txtAvailable').html('Available')
+                        $('#add-txtAvailable').html('Tersedia')
                     else
                         $('#add-txtAvailable').html('Not Available')
                 });
                 $('#updt-available').bind('change', function() {
                     if ($(this).is(':checked'))
-                        $('#updt-txtAvailable').html('Available')
+                        $('#updt-txtAvailable').html('Tersedia')
                     else
                         $('#updt-txtAvailable').html('Not Available')
                 });
@@ -396,7 +403,7 @@
                             render: function(data, type, row, meta) {
                                 let action = `
 									<a href="#" class="text-decoration-none me-1 btnUpdtDevice">
-										<span class="icon ion-edit fz-16"></span>
+										<span class="icon ion-eye fz-16"></span>
 									</a>
                                     `;
                                 // <a href="#" class="text-decoration-none text-danger btnDelDevice">
diff --git a/resources/views/menu_v1/configs/truck_types.blade.php b/resources/views/menu_v1/configs/truck_types.blade.php
index 96da8b7..3a7b342 100755
--- a/resources/views/menu_v1/configs/truck_types.blade.php
+++ b/resources/views/menu_v1/configs/truck_types.blade.php
@@ -20,9 +20,12 @@
                             {{-- <p class="card-title text-bold mb-0">Vehicle Types (<span id="count_trucktypes">0</span>)</p> --}}
                             <p class="card-title text-bold mb-0">Vehicle Types</p>
                         </div>
-                        <div class="col text-end">
-                            <button id="btnMdlNewTruckType" class="btn btn-sm btn-danger">Add New Vehicle Type</button>
-                        </div>
+                        @can('config_truck_type.create')
+                            <div class="col text-end">
+                                <button id="btnMdlNewTruckType" class="btn btn-sm btn-danger">Add New Vehicle Type</button>
+                            </div>
+                        @endcan
+
                         <div class="col-auto text-end ps-0">
                             {{-- <button class="btn btn-sm btn-danger">Upload</button> --}}
                             {{-- <button class="btn btn-sm btn-danger">Download</button> --}}
@@ -190,9 +193,13 @@
                     </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" id="btnDelTruckType_updt" class="btn btn-sm btn-warning">Delete ?</button>
+                    @can('config_truck_type.delete')
+                        <button type="button" id="btnDelTruckType_updt" class="btn btn-sm btn-warning">Delete ?</button>
+                    @endcan
                     <button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
-                    <button id="btnSubmitEdtTruckType" type="button" class="btn btn-sm btn-danger">Update data</button>
+                    @can('config_truck_type.edit')
+                        <button id="btnSubmitEdtTruckType" type="button" class="btn btn-sm btn-danger">Update data</button>
+                    @endcan
                 </div>
             </div>
         </div>
@@ -318,7 +325,7 @@
                             render: function(data, type, row, meta) {
                                 let action = `
 									<a href="#" class="text-decoration-none me-1 btnUpdtTruckType">
-										<span class="icon ion-edit fz-16"></span>
+										<span class="icon ion-eye fz-16"></span>
 									</a>
 								`;
                                 // <a href="#" class="text-decoration-none text-danger btnDelTruckType">
diff --git a/resources/views/menu_v1/drivers.blade.php b/resources/views/menu_v1/drivers.blade.php
index 1b265be..e81fb58 100755
--- a/resources/views/menu_v1/drivers.blade.php
+++ b/resources/views/menu_v1/drivers.blade.php
@@ -11,8 +11,8 @@
 @section('customcss')
     <style>
         /* .select2-container {
-                                                                                                                                                                                                                                                                                                                                        z-index: 99999;
-                                                                                                                                                                                                                                                                                                                                    } */
+                                                                                                                                                                                                                                                                                                                                                    z-index: 99999;
+                                                                                                                                                                                                                                                                                                                                                } */
     </style>
 @endsection
 
@@ -27,9 +27,11 @@
                         </div>
                         {{-- @if ($user_role === \App\Models\Users::ROLE_VENDOR) --}}
                         @if ($user_role === \App\Models\Users::ROLE_ADMIN)
-                            <div class="col text-end">
-                                <button id="btnMdlNewDrv" class="btn btn-sm btn-danger">Add New Driver</button>
-                            </div>
+                            @can('driver.create')
+                                <div class="col text-end">
+                                    <button id="btnMdlNewDrv" class="btn btn-sm btn-danger">Add New Driver</button>
+                                </div>
+                            @endcan
                         @endif
                     </div>
                 </div>
@@ -410,8 +412,12 @@
                             <button type="button" id="btnResetLogin_updt" class="btn btn-sm btn-dark text-white">Reset Login ?</button>
                         </div> --}}
                         <div class="col p-0 text-end">
-                            <button type="button" id="btnDelDrv_updt" class="btn btn-sm btn-warning">Delete ?</button>
-                            <button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
+                            @can('driver.delete')
+                                <button type="button" id="btnDelDrv_updt" class="btn btn-sm btn-warning">Delete ?</button>
+                            @endcan
+                            @can('driver.edit')
+                                <button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
+                            @endcan
                             <button id="btnSubmitEdtDrv" type="button" class="btn btn-sm btn-danger">Update data</button>
                         </div>
                     </div>
@@ -545,7 +551,7 @@
                             render: function(data, type, row, meta) {
                                 let action = `
 									<a href="#" class="text-decoration-none me-1 btnEdtDrv">
-										<span class="icon ion-edit fz-16"></span>
+										<span class="icon ion-eye fz-16"></span>
 									</a>
 								`;
                                 // <a href="#" class="text-decoration-none text-danger btnDelDrv">
diff --git a/resources/views/menu_v1/roles.blade.php b/resources/views/menu_v1/roles.blade.php
new file mode 100755
index 0000000..f9da12d
--- /dev/null
+++ b/resources/views/menu_v1/roles.blade.php
@@ -0,0 +1,615 @@
+@extends('app.app')
+
+@section('title')
+    Users
+@endsection
+
+@section('customcss')
+    <style>
+        /* .select2-container {
+                                                                                                                                                                                                                                                                                                                                                                                                                                            z-index: 99999;
+                                                                                                                                                                                                                                                                                                                                                                                                                                        } */
+    </style>
+@endsection
+
+@section('content')
+    <div class="container-fluid">
+        <div class="content">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="card">
+                        <div class="card-header">
+                            <div class="row d-flex align-items-center">
+                                <div class="col">
+                                    <p class="card-title text-bold mb-0">Roles (<span id="count_users">0</span>)</p>
+                                </div>
+                                @can('role.create')
+                                    <div class="col text-end">
+                                        <a href="#" class="btn btn-sm btn-danger" id="btnAddNewUserModal">Add New Role</a>
+                                    </div>
+                                @endcan
+                                <div class="col-auto text-end ps-0">
+                                    {{-- <button class="btn btn-sm btn-danger">Upload</button> --}}
+                                    {{-- <button class="btn btn-sm btn-danger">Download</button> --}}
+                                </div>
+                            </div>
+                        </div>
+                        <div class="card-body">
+                            <div class="table-responsive">
+                                <table id="tUsers" class="table table-hover dataTable w-100">
+                                    <thead>
+                                        <tr class="">
+                                            <th class="">#</th>
+                                            <th class="text-center">Action</th>
+                                            <th class="text-nowrap col-8">Name</th>
+                                            <th class="text-nowrap col-2">Created At</th>
+                                            <th class="text-nowrap col-2">Updated At</th>
+                                        </tr>
+                                    </thead>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-8"></div>
+            </div>
+        </div>
+    </div>
+
+    {{-- MODAL --}}
+    <div class="modal fade" id="addNewUserModal" data-bs-backdrop="static" data-bs-keyboard="false" aria-labelledby="addNewUserModal" aria-hidden="true">
+        <div class="modal-dialog modal-dialog modal-dialog-centered modal-dialog-scrollable modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="addNewUserModal">Add New Role</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body pb-0">
+                    <div class="row">
+                        <h6>Role Infomation</h6>
+                        <div class="mb-3">
+                            <label for="add-first_name" class="form-label">Name</label>
+                            <input type="text" class="form-control form-control-sm" name="add-name" id="add-name">
+                        </div>
+                    </div>
+                    <div>
+                        <h6>Permissions</h6>
+                        @foreach ($permission as $module => $perms)
+                            <div class="mb-3 row">
+                                <label for="add-first_name" class="form-label text-capitalize col-3">
+                                    {{ $module == 'transaction' ? 'job' : ($module == 'client' ? 'company' : ($module == 'config_truck_type' ? 'Config Vehicle Type' : ($module == 'config_master_device' ? 'Config Master Devices' : ($module == 'config_logs_gps' ? 'Config Logs GPS' : $module)))) }}
+                                </label>
+                                <div class="col-9">
+                                    <div class="d-flex flex-wrap align-items-center gap-2">
+                                        @foreach ($perms as $perm)
+                                            @php
+                                                $id = 'perm-' . str_replace('.', '-', $perm->name);
+                                            @endphp
+                                            <div class="form-check form-check-inline">
+                                                <input class="form-check-input" type="checkbox" name="add-permissions[]" value="{{ $perm->id }}" id="{{ $id }}">
+                                                <label class="form-check-label ms-1" for="{{ $id }}">{{ Str::after($perm->name, '.') }}</label>
+                                            </div>
+                                        @endforeach
+                                    </div>
+                                </div>
+
+                            </div>
+                        @endforeach
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
+                    <button type="button" id="btnSubmitNewUser" class="btn btn-sm btn-danger">Submit data</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="modal fade" id="updtUserModal" data-bs-backdrop="static" data-bs-keyboard="false" aria-labelledby="updtUserModal" aria-hidden="true">
+        <div class="modal-dialog modal-dialog modal-dialog-centered modal-dialog-scrollable modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="updtUserModal">Update Role</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body pb-0">
+                    <div class="row">
+                        <h6>Role Infomation</h6>
+                        <div class="mb-3">
+                            <label for="add-first_name" class="form-label">Name</label>
+                            <input type="text" class="form-control form-control-sm" name="updt-name" id="updt-name">
+                        </div>
+                    </div>
+                    <div>
+                        <h6>Permissions</h6>
+                        @foreach ($permission as $module => $perms)
+                            <div class="mb-3 row">
+                                <label for="add-first_name" class="form-label text-capitalize col-3">
+                                    {{ $module == 'transaction' ? 'job' : ($module == 'client' ? 'company' : ($module == 'config_truck_type' ? 'Config Vehicle Type' : ($module == 'config_master_device' ? 'Config Master Devices' : ($module == 'config_logs_gps' ? 'Config Logs GPS' : $module)))) }}
+                                </label>
+                                <div class="col-9">
+                                    <div class="d-flex flex-wrap align-items-center gap-2">
+                                        @foreach ($perms as $perm)
+                                            @php
+                                                $id = 'perm-' . str_replace('.', '-', $perm->name);
+                                            @endphp
+                                            <div class="form-check form-check-inline">
+                                                <input class="form-check-input" type="checkbox" name="updt-permissions[]" value="{{ $perm->id }}" id="{{ $id }}">
+                                                <label class="form-check-label ms-1" for="{{ $id }}">{{ Str::after($perm->name, '.') }}</label>
+                                            </div>
+                                        @endforeach
+                                    </div>
+                                </div>
+
+                            </div>
+                        @endforeach
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    @can('role.delete')
+                        <button type="button" id="btnDelUser_updt" class="btn btn-sm btn-warning">Delete ?</button>
+                    @endcan
+                    <button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
+                    @can('role.edit')
+                        <button type="button" id="btnSubmitUpdtUser" class="btn btn-sm btn-danger">Update data</button>
+                    @endcan
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="modal fade" id="delUserModal" tabindex="-1" data-bs-backdrop="static" data-bs-keyboard="false" aria-labelledby="delUserModal" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered modal-sm">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="delUserModal">Delete Role</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <div class="d-flex justify-content-center">
+                        <p class="mb-0">
+                            Are you sure want to delete this role
+                            <a href="#" class="text-danger">
+                                <span id="del-name"></span>
+                            </a>
+                        </p>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-sm btn-danger" data-bs-dismiss="modal">Close</button>
+                    <button id="btnSubmitDelUser" type="button" class="btn btn-sm btn-secondary">Yes, delete</button>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('customjs')
+    <script>
+        'use strict';
+
+        const Wrapper = {
+            activate: function() {
+                Wrapper.event();
+                DTable.activate();
+                UNew.activate();
+                UUpdate.activate();
+                UDel.activate();
+                Filter.activate();
+            },
+            event: function() {},
+        };
+
+        const DTable = {
+            activate: function() {
+                DTable.reload();
+            },
+            reload: function() {
+                // $('#tUsers').DataTable();
+                // if (User.Table.firstInitDataTable == 1) { loadTableSkeletonLoading() } else { User.Table.firstInitDataTable = 1; }
+                $('#tUsers').DataTable({
+                    processing: true,
+                    serverSide: false,
+                    bLengthChange: true,
+                    deferRender: true,
+                    destroy: true,
+                    ajax: {
+                        url: "{{ route('api_list_roles') }}?cptid=" + AppState.current_company,
+                        type: 'GET',
+                        complete: function(jqXHR, textStatus, c) {
+                            let count = jqXHR.responseJSON.count;
+                            if (typeof count != 'undefined') {
+                                $('#count_users').text(count);
+                            }
+                            // removeTableSkeletonLoading()
+                        },
+                    },
+                    deferRender: true,
+                    columns: [{
+                            data: 'DT_RowIndex',
+                            className: 'text-end',
+                            visible: true,
+                            orderable: true,
+                            searchable: true,
+                        },
+                        {
+                            data: 'action',
+                            className: 'text-center',
+                            visible: true,
+                            orderable: true,
+                            searchable: true,
+                            render: function(data, type, row, meta) {
+                                let action = `
+                                    <a href="#" class="text-decoration-none me-1 btnEdtUser" data-bs-toggle="tooltip"
+                                        data-bs-placement="bottom" title="Edit">
+                                        <span class="icon ion-eye fz-16"></span>
+                                    </a>
+								`;
+                                return action;
+                            }
+                        },
+                        {
+                            data: 'name',
+                            className: 'text-start',
+                            visible: true,
+                            orderable: true,
+                            searchable: true,
+                            createdCell: function(td, cellData, rowData, row, col) {
+                                $(td).attr('data-id', rowData.id);
+                                $(td).attr('data-name', rowData.name);
+                            },
+                        },
+                        {
+                            data: 'created_at',
+                            className: 'text-start text-nowrap',
+                            visible: true,
+                            orderable: true,
+                            searchable: true,
+                            render: function(data, type, row, meta) {
+                                return moment(data, 'YYYY-MM-DD HH:mm:ss').format('DD MMM YYYY HH:mm')
+                            },
+                        },
+                        {
+                            data: 'updated_at',
+                            className: 'text-start text-nowrap',
+                            visible: true,
+                            orderable: true,
+                            searchable: true,
+                            render: function(data, type, row, meta) {
+                                return moment(data, 'YYYY-MM-DD HH:mm:ss').format('DD MMM YYYY HH:mm')
+                            },
+                        },
+                    ],
+                });
+            },
+        };
+
+        const UNew = {
+            activate: function() {
+                UNew.event();
+            },
+            event: function() {
+                // modal
+                $('#btnAddNewUserModal').on('click', function() {
+                    $('#addNewUserModal').modal('show');
+                });
+                $('#addNewUserModal').on('shown.bs.modal', function() {
+                    // initiate select2 if there
+                });
+                $('#btnSubmitNewUser').on('click', function() {
+                    let data = UNew.getData();
+                    UNew.submitData(data);
+                });
+            },
+            getData: function() {
+                let data = {};
+                data.name = $('input[name=add-name]').val();
+                data.permissions = $('input[name="add-permissions[]"]:checked')
+                    .map(function() {
+                        return $(this).val();
+                    })
+                    .get();
+                return data;
+            },
+            submitData: async function(data) {
+                return new Promise((resolve, reject) => {
+                    if (typeof $('#btnSubmitNewUser').attr('disabed') != 'undefined') {
+                        resolve({
+                            type: 'fail'
+                        });
+                        return false;
+                    }
+                    $('#btnSubmitNewUser').attr('disabed', true);
+                    $.ajax({
+                        url: "{{ route('api_add_role') }}",
+                        method: 'POST',
+                        crossDomain: true,
+                        processData: true,
+                        headers: {
+                            'x-api-key': Helper.getCookie('_trtk'),
+                            'x-csrf-token': $('meta[name="csrf-token"]').attr('content'),
+                        },
+                        data: data,
+                        success: (data, textStatus, jqXHR) => {
+                            $('#btnSubmitNewUser').removeAttr('disabed');
+                            if (data.meta.type != 'success') {
+                                resolve({
+                                    type: 'fail'
+                                });
+                                Helper.toast('Warning', 'just now', data.meta.message);
+                                return false;
+                            }
+                            Helper.toast('Success', 'just now', 'success add new role');
+                            $('#addNewUserModal').modal('hide');
+                            DTable.reload();
+                            UNew.clearInput();
+                            resolve({
+                                type: 'success'
+                            });
+                        },
+                        error: (jqXHR, textStatus, error) => {
+                            $('#btnSubmitNewUser').removeAttr('disabed');
+                            if (jqXHR.status >= 500) {
+                                Helper.toast('Error', 'just now', 'please try again');
+                            } else {
+                                Helper.toast('Error', 'just now', jqXHR.responseJSON.meta
+                                    .message);
+                            }
+                            resolve({
+                                type: 'error'
+                            });
+                        }
+                    })
+                })
+            },
+            clearInput: function() {
+                $('#add-chk_type').val('').trigger('change');
+            },
+        }
+
+        const UUpdate = {
+            activate: function() {
+                UUpdate.event();
+            },
+            event: function() {
+                // modal
+                $('#tUsers').on('click', '.btnEdtUser', async function(e) {
+                    let uid = $(e.target).closest('tr').find('td[data-id]').data('id');
+                    UUpdate.clearInput();
+                    let resp = await UUpdate.reqData({
+                        uid
+                    });
+                    if (resp.type != 'success') {
+                        Helper.toast('Role Not Found', 'just now', 'please try again');
+                        return false;
+                    }
+                    UUpdate.passDataToView(resp.data);
+                });
+                $('#updtUserModal').on('shown.bs.modal', function() {
+                    // initiate select2 if there
+                });
+                $('#btnSubmitUpdtUser').on('click', function() {
+                    let data = UUpdate.getData();
+                    UUpdate.submitData(data);
+                });
+            },
+            reqData: function(params) {
+                return new Promise((resolve, reject) => {
+                    $.ajax({
+                        url: "{{ route('api_show_role', '') }}/" + params.uid,
+                        method: 'GET',
+                        crossDomain: true,
+                        processData: true,
+                        headers: {
+                            'x-api-key': Helper.getCookie('_trtk'),
+                        },
+                        data: params,
+                        success: (data, textStatus, jqXHR) => {
+                            if (data.meta.type != 'success') {
+                                resolve({
+                                    type: 'fail'
+                                });
+                                Helper.toast('Warning', 'just now', data.meta.message);
+                                return false;
+                            }
+                            resolve({
+                                type: 'success',
+                                data: data.data
+                            });
+                        },
+                        error: (jqXHR, textStatus, error) => {
+                            if (jqXHR.status >= 500) {
+                                Helper.toast('Error', 'just now', 'please try again');
+                            } else {
+                                Helper.toast('Error', 'just now', jqXHR.responseJSON.meta
+                                    .message);
+                            }
+                            resolve({
+                                type: 'error'
+                            });
+                        }
+                    })
+                });
+            },
+            passDataToView: function(data) {
+                $('input[name=updt-name').val(data.name);
+                $('input[name="updt-permissions[]"]').each(function() {
+                    $(this).prop('checked', false);
+                    let val = parseInt($(this).val());
+                    if (data.permissions.includes(val)) {
+                        $(this).prop('checked', true);
+                    }
+                });
+
+                $('#updtUserModal').data('id', data.id);
+                $('#updtUserModal').modal('show');
+            },
+            getData: function() {
+                let data = {};
+                data.uid = $('#updtUserModal').data('id')
+                data.name = $('input[name=updt-name]').val();
+                data.permissions = $('input[name="updt-permissions[]"]:checked')
+                    .map(function() {
+                        return $(this).val();
+                    })
+                    .get();
+                return data;
+            },
+            submitData: async function(data) {
+                return new Promise((resolve, reject) => {
+                    if (typeof $('#btnSubmitUpdtUser').attr('disabed') != 'undefined') {
+                        resolve({
+                            type: 'fail'
+                        });
+                        return false;
+                    }
+                    $('#btnSubmitUpdtUser').attr('disabed', true);
+                    $.ajax({
+                        url: "{{ route('api_edit_role', '') }}/" + data.uid,
+                        method: 'PUT',
+                        crossDomain: true,
+                        processData: true,
+                        headers: {
+                            'x-csrf-token': $('meta[name="csrf-token"]').attr('content'),
+                            'x-api-key': Helper.getCookie('_trtk'),
+                        },
+                        data: data,
+                        success: (data, textStatus, jqXHR) => {
+                            $('#btnSubmitUpdtUser').removeAttr('disabed');
+                            if (data.meta.type != 'success') {
+                                resolve({
+                                    type: 'fail'
+                                });
+                                Helper.toast('Warning', 'just now', data.meta.message);
+                                return false;
+                            }
+                            Helper.toast('Success', 'just now', 'success update role');
+                            $('#updtUserModal').modal('hide');
+                            DTable.reload();
+                            resolve({
+                                type: 'success'
+                            });
+                        },
+                        error: (jqXHR, textStatus, error) => {
+                            $('#btnSubmitUpdtUser').removeAttr('disabed');
+                            if (jqXHR.status >= 500) {
+                                Helper.toast('Error', 'just now', 'please try again');
+                            } else {
+                                Helper.toast('Error', 'just now', jqXHR.responseJSON.meta
+                                    .message);
+                            }
+                            resolve({
+                                type: 'error'
+                            });
+                        }
+                    })
+                });
+            },
+            clearInput: function() {
+                $('#updt-chk_type').val('').trigger('change');
+            },
+        }
+
+        const UDel = {
+            activate: function() {
+                UDel.event();
+            },
+            event: function() {
+                // on table
+                $('#tUsers').on('click', '.btnDelUser', function(e) {
+                    let row = $(e.target).closest('tr');
+                    let uid = row.find('td[data-id]').data('id');
+                    let name = row.find('td[data-name]').data('name');
+                    UDel.passDataToView({
+                        uid,
+                    });
+                    $('#delUserModal').data('id', uid);
+                    $('#delUserModal').modal('show');
+                });
+                $('#btnSubmitDelUser').on('click', function() {
+                    let data = {
+                        uid: $('#delUserModal').data('id'),
+                    };
+                    UDel.submitData(data);
+                });
+                // on modal update
+                $('#btnDelUser_updt').on('click', function(e) {
+                    let data = UUpdate.getData();
+                    UDel.passDataToView({
+                        uid: data.uid,
+                        name: data.name,
+                    });
+                    $('#delUserModal').data('id', data.uid);
+                    $('#delUserModal').modal('show');
+                });
+            },
+            passDataToView: function(data) {
+                data.phone = '' + data.phone
+                $('#del-name').text(data.fisrt_name);
+            },
+            submitData: async function(data) {
+                return new Promise((resolve, reject) => {
+                    if (typeof $('#btnSubmitDelUser').attr('disabed') != 'undefined') {
+                        resolve({
+                            type: 'fail'
+                        });
+                        return false;
+                    }
+                    $('#btnSubmitDelUser').attr('disabed', true);
+                    $.ajax({
+                        url: "{{ route('api_del_role', '') }}/" + data.uid,
+                        method: 'DELETE',
+                        crossDomain: true,
+                        processData: true,
+                        headers: {
+                            'x-csrf-token': $('meta[name="csrf-token"]').attr('content'),
+                            'x-api-key': Helper.getCookie('_trtk'),
+                        },
+                        data: data,
+                        success: (data, textStatus, jqXHR) => {
+                            $('#btnSubmitDelUser').removeAttr('disabed');
+                            if (data.meta.type != 'success') {
+                                resolve({
+                                    type: 'fail'
+                                });
+                                Helper.toast('Warning', 'just now', data.meta.message);
+                                return false;
+                            }
+                            Helper.toast('Success', 'just now', 'success delete role');
+                            $('#delUserModal').modal('hide');
+                            $('#updtUserModal').modal('hide');
+                            DTable.reload();
+                            resolve({
+                                type: 'success'
+                            });
+                        },
+                        error: (jqXHR, textStatus, error) => {
+                            $('#btnSubmitDelUser').removeAttr('disabed');
+                            if (jqXHR.status >= 500) {
+                                Helper.toast('Error', 'just now', 'please try again');
+                            } else {
+                                Helper.toast('Error', 'just now', jqXHR.responseJSON.meta
+                                    .message);
+                            }
+                            resolve({
+                                type: 'error'
+                            });
+                        }
+                    })
+                })
+            },
+        }
+
+        const Filter = {
+            activate: function() {
+                Filter.event();
+            },
+            event: function() {},
+            triggerFilterCompany: function() {
+                DTable.reload();
+            },
+        }
+
+        Wrapper.activate();
+    </script>
+@endsection
diff --git a/resources/views/menu_v1/transactions.blade.php b/resources/views/menu_v1/transactions.blade.php
index bf61be2..0cff441 100755
--- a/resources/views/menu_v1/transactions.blade.php
+++ b/resources/views/menu_v1/transactions.blade.php
@@ -28,9 +28,11 @@
                                 <div class="col-auto text-end ps-0">
                                     <a href="{{ route('view_transactions_spc_add') }}" class="btn btn-sm btn-warning">Transaksi Khusus</a>
                                 </div> --}}
-                                <div class="col-auto text-end ps-0">
-                                    <a href="{{ route('view_transactions_add') }}" class="btn btn-sm btn-danger">Add New Job</a>
-                                </div>
+                                @can('transaction.create')
+                                    <div class="col-auto text-end ps-0">
+                                        <a href="{{ route('view_transactions_add') }}" class="btn btn-sm btn-danger">Add New Job</a>
+                                    </div>
+                                @endcan
                             </div>
                         </div>
                         <div class="card-body">
@@ -185,7 +187,9 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-sm btn-danger" data-bs-dismiss="modal">Close</button>
-                    <button id="btnSubmitDelOrder" type="button" class="btn btn-sm btn-secondary">Yes, delete</button>
+                    @can('transaction.delete')
+                        <button id="btnSubmitDelOrder" type="button" class="btn btn-sm btn-secondary">Yes, delete</button>
+                    @endcan
                 </div>
             </div>
         </div>
diff --git a/resources/views/menu_v1/users.blade.php b/resources/views/menu_v1/users.blade.php
index f4871a4..6a1ca29 100755
--- a/resources/views/menu_v1/users.blade.php
+++ b/resources/views/menu_v1/users.blade.php
@@ -7,8 +7,8 @@
 @section('customcss')
     <style>
         /* .select2-container {
-                                    z-index: 99999;
-                                } */
+                                                                            z-index: 99999;
+                                                                        } */
     </style>
 @endsection
 
@@ -23,9 +23,11 @@
                                 <div class="col">
                                     <p class="card-title text-bold mb-0">Users (<span id="count_users">0</span>)</p>
                                 </div>
-                                <div class="col text-end">
-                                    <a href="#" class="btn btn-sm btn-danger" id="btnAddNewUserModal">Add New User</a>
-                                </div>
+                                @can('user.create')
+                                    <div class="col text-end">
+                                        <a href="#" class="btn btn-sm btn-danger" id="btnAddNewUserModal">Add New User</a>
+                                    </div>
+                                @endcan
                                 <div class="col-auto text-end ps-0">
                                     {{-- <button class="btn btn-sm btn-danger">Upload</button> --}}
                                     {{-- <button class="btn btn-sm btn-danger">Download</button> --}}
@@ -400,9 +402,13 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" id="btnDelUser_updt" class="btn btn-sm btn-warning">Delete ?</button>
+                    @can('user.delete')
+                        <button type="button" id="btnDelUser_updt" class="btn btn-sm btn-warning">Delete ?</button>
+                    @endcan
                     <button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
-                    <button type="button" id="btnSubmitUpdtUser" class="btn btn-sm btn-danger">Update data</button>
+                    @can('user.edit')
+                        <button type="button" id="btnSubmitUpdtUser" class="btn btn-sm btn-danger">Update data</button>
+                    @endcan
                 </div>
             </div>
         </div>
@@ -631,7 +637,7 @@
                                 let action = `
                                     <a href="#" class="text-decoration-none me-1 btnEdtUser" data-bs-toggle="tooltip"
                                         data-bs-placement="bottom" title="Edit">
-                                        <span class="icon ion-edit fz-16"></span>
+                                        <span class="icon ion-eye fz-16"></span>
                                     </a>
 								`;
                                 // <a href="#" class="text-decoration-none text-danger btnDelUser"
@@ -707,7 +713,7 @@
                             orderable: true,
                             searchable: true,
                             render: function(data, type, row, meta) {
-                                return `<small class="text-muted">${data}</small>`;
+                                return `<small class="text-muted">${data ?? '-'}</small>`;
                             },
                         },
                         {
@@ -936,7 +942,8 @@
                 $('#updt-email').val(data.email);
 
                 $('#updt-clients').val(data.client_group_id).trigger('change');
-                $('#updt-roles').val(data.role).trigger('change');
+                // $('#updt-roles').val(data.role).trigger('change');
+                $('#updt-roles').val(data.role_id).trigger('change');
                 $('#updt-pernu_id').val(data.pernu_id);
                 $('#updt-is_change_pasw').val('no').trigger('change');
 
diff --git a/resources/views/menu_v1/vehicles.blade.php b/resources/views/menu_v1/vehicles.blade.php
index bd787cf..91c0262 100755
--- a/resources/views/menu_v1/vehicles.blade.php
+++ b/resources/views/menu_v1/vehicles.blade.php
@@ -11,18 +11,18 @@
 @section('customcss')
     <style>
         /* .select2-container {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            z-index: 99999;
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        } */
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    z-index: 99999;
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                } */
 
         /* .landscape-photo {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            max-height: max(21vh, 210px);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        } */
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    max-height: max(21vh, 210px);
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                } */
 
         /* .thumb-img-table {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            width: max(4vw, 75px);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            height: max(4vh, 55px);
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            object-fit: cover;
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        } */
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    width: max(4vw, 75px);
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    height: max(4vh, 55px);
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    object-fit: cover;
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                } */
     </style>
 @endsection
 
@@ -36,9 +36,12 @@
                             <p class="card-title text-bold mb-0">Fleet Manager</p>
                         </div>
                         @if ($user_role == \App\Models\Users::ROLE_VENDOR || $user_role == \App\Models\Users::ROLE_ADMIN)
-                            <div class="col text-end">
-                                <button id="btnMdlNewVhc" class="btn btn-sm btn-danger">Add New Vehicle</button>
-                            </div>
+                            @can('vehicle.create')
+                                <div class="col text-end">
+                                    <button id="btnMdlNewVhc" class="btn btn-sm btn-danger">Add New Vehicle</button>
+                                </div>
+                            @endcan
+
                             {{-- <div class="col-auto text-end ps-0">
                                 <button class="btn btn-sm btn-danger">Upload</button>
                             </div> --}}
@@ -146,22 +149,10 @@
                                             @endforeach
                                         </select>
                                     </div>
-                                    <div class="row">
-                                        <div class="col-sm-6">
-                                            <div class="mb-0">
-                                                <label for="add-speedlimit" class="col-form-label">Speed Limit (kph):</label>
-                                                <input type="number" id="add-speedlimit" class="form-control">
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-6">
-                                            <div class="mb-0">
-                                                <label for="add-sum_milleage" class="col-form-label">Current Mileage (km):</label>
-                                                <input type="number" id="add-sum_milleage" class="form-control">
-                                            </div>
-                                        </div>
+                                    <div class="mb-0">
+                                        <label for="add-speedlimit" class="col-form-label">Speed Limit (kph):</label>
+                                        <input type="number" id="add-speedlimit" class="form-control">
                                     </div>
-
-
                                 </div>
                             </div>
                         </div>
@@ -363,19 +354,9 @@
                                             @endforeach
                                         </select>
                                     </div>
-                                    <div class="row">
-                                        <div class="col-sm-6">
-                                            <div class="mb-0">
-                                                <label for="edt-speedlimit" class="col-form-label">Speed Limit (kph):</label>
-                                                <input type="number" id="edt-speedlimit" class="form-control">
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-6">
-                                            <div class="mb-0">
-                                                <label for="edt-sum_milleage" class="col-form-label">Current Mileage (km):</label>
-                                                <input type="number" id="edt-sum_milleage" class="form-control">
-                                            </div>
-                                        </div>
+                                    <div class="mb-0">
+                                        <label for="edt-speedlimit" class="col-form-label">Speed Limit (kph):</label>
+                                        <input type="number" id="edt-speedlimit" class="form-control">
                                     </div>
                                 </div>
                             </div>
@@ -520,9 +501,13 @@
                     </form>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" id="btnDelVhc_updt" class="btn btn-sm btn-warning">Delete ?</button>
+                    @can('vehicle.delete')
+                        <button type="button" id="btnDelVhc_updt" class="btn btn-sm btn-warning">Delete ?</button>
+                    @endcan
                     <button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
-                    <button id="btnSubmitEdtVhc" type="button" class="btn btn-sm btn-danger">Update data</button>
+                    @can('vehicle.edit')
+                        <button id="btnSubmitEdtVhc" type="button" class="btn btn-sm btn-danger">Update data</button>
+                    @endcan
                     <div id="edt-btnSubmitEdtVhc" class="d-none">
                         <div class="spinner-border" role="status">
                             <span class="visually-hidden">Loading...</span>
@@ -671,7 +656,7 @@
                             render: function(data, type, row, meta) {
                                 let action = `
 									<a href="#" class="text-decoration-none me-1 btnEdtVhc">
-										<span class="icon ion-edit fz-16"></span>
+										<span class="icon ion-eye fz-16"></span>
 									</a>
 								`;
                                 // <a href="#" class="text-decoration-none text-danger btnDelVhc">
@@ -1024,7 +1009,6 @@
                 data.append('type_id', safeVal('#add-type'));
                 data.append('model_id', safeVal('#add-model') ?? 0);
                 data.append('speed_limit', safeVal('#add-speedlimit'));
-                data.append('sum_milleage', safeVal('#add-sum_milleage'));
                 data.append('fuel_capacity', safeVal('#add-fuelcapacity') ?? 0);
                 data.append('fuel_drop_treshold', safeVal('#add-fueldroptreshold') ?? 0);
                 data.append('max_pressure', safeVal('#add-maxpressure') ?? 0);
@@ -1240,7 +1224,6 @@
                 $('#edt-model').val(data?.model_id).trigger('change');
 
                 $('#edt-speedlimit').val(data?.speed_limit);
-                $('#edt-sum_milleage').val(data?.sum_milleage);
                 $('#edt-fuelcapacity').val(data?.fuel_capacity);
                 $('#edt-fueldroptreshold').val(data?.fuel_drop_treshold);
                 $('#edt-maxpressure').val(data?.max_pressure);
@@ -1296,7 +1279,6 @@
                 data.model_id = $('#edt-model').val();
 
                 data.speed_limit = $('#edt-speedlimit').val();
-                data.sum_milleage = $('#edt-sum_milleage').val();
                 data.fuel_capacity = $('#edt-fuelcapacity').val();
                 data.fuel_drop_treshold = $('#edt-fueldroptreshold').val();
                 data.max_pressure = $('#edt-maxpressure').val();
diff --git a/resources/views/menu_v1/zone.blade.php b/resources/views/menu_v1/zone.blade.php
index 418d9c8..494605c 100755
--- a/resources/views/menu_v1/zone.blade.php
+++ b/resources/views/menu_v1/zone.blade.php
@@ -32,10 +32,12 @@
                                 </div>
                                 @if ($user_role === \App\Models\Users::ROLE_ADMIN || \App\Models\Users::ROLE_VENDOR)
                                     {{-- @if ($user_role === \App\Models\Users::ROLE_VENDOR) --}}
-                                    <div class="col text-end">
-                                        {{-- <a href="#" class="btn btn-sm btn-danger" data-bs-toggle="modal" data-bs-target="#addNewZoneModal">Add New Zone</a> --}}
-                                        <a href="{{ route('view_zone_add') }}" class="btn btn-sm btn-danger">Add New Zone</a>
-                                    </div>
+                                    @can('zone.create')
+                                        <div class="col text-end">
+                                            {{-- <a href="#" class="btn btn-sm btn-danger" data-bs-toggle="modal" data-bs-target="#addNewZoneModal">Add New Zone</a> --}}
+                                            <a href="{{ route('view_zone_add') }}" class="btn btn-sm btn-danger">Add New Zone</a>
+                                        </div>
+                                    @endcan
                                 @endif
                                 <div class="col-auto text-end ps-0">
                                     {{-- <button class="btn btn-sm btn-danger">Upload</button> --}}
diff --git a/resources/views/template/navbar.blade.php b/resources/views/template/navbar.blade.php
index f48f9a0..0e2c40d 100755
--- a/resources/views/template/navbar.blade.php
+++ b/resources/views/template/navbar.blade.php
@@ -2,13 +2,10 @@
     $user_role = Auth::user()->role;
     $uid = Auth::user()->id;
 @endphp
-@php
-    // dd($user_role);
-@endphp
+
 <nav class="navbar navbar-expand-lg">
     <div class="container-fluid">
         <a class="navbar-brand" href="{{ route('view_dashboard') }}">
-            {{-- <img src="{{ asset('images/logogram-bonceng.png') }}" class="img-fluid" alt="" width="30" height="24"> --}}
             <img src="{{ asset('images/logogram-bonceng.png') }}" class="img-fluid" alt="" height="20" width="70">
         </a>
         <button class="navbar-toggler btn btn-outline-secondary btn-sm" type="button" data-bs-toggle="collapse" data-bs-target="#navbarScroll" aria-controls="navbarScroll" aria-expanded="false" aria-label="Toggle navigation" style="width: 30px; height: 30px;">
@@ -17,195 +14,101 @@
         <div class="collapse navbar-collapse" id="navbarScroll">
             <ul class="navbar-nav navbar-nav-scroll">
                 {{-- all roles --}}
-                @if ($user_role === \App\Models\Users::ROLE_ADMIN || $user_role === \App\Models\Users::ROLE_VENDOR || $user_role === \App\Models\Users::ROLE_CLIENT_ADMIN || $user_role === \App\Models\Users::ROLE_SPECIAL_TRACKING)
+                @can('dashboard.view')
                     <li class="nav-item {{ Request::segment(1) == 'dashboard' ? 'active' : '' }}">
                         <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_dashboard') }}">
                             Dashboard
                         </a>
                     </li>
-                @endif
-                @if ($user_role === \App\Models\Users::ROLE_VENDOR)
-                    {{-- <li class="nav-item {{ Request::path() == 'user/vendor/transactions' || Request::path() == 'user/vendor/transactions/newOrder' ? 'active' : '' }}">
-                        <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ url('user/vendor/transactions/newOrder') }}">
-                            Transaction
-                        </a>
-                    </li> --}}
+                @endcan
+                @can('transaction.view')
                     <li class="nav-item {{ Request::path() == 'user/vendor/transactions' || Request::path() == 'transactions/add/special' ? 'active' : '' }}">
                         <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ url('user/vendor/transactions') }}">
                             Transaction
                         </a>
                     </li>
-                @endif
-                @if ($user_role === \App\Models\Users::ROLE_VENDOR)
+                @endcan
+                @can('zone.view')
                     <li class="nav-item {{ Request::segment(1) == 'zone' ? 'active' : '' }}">
                         <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_zone') }}">
                             Zone
                         </a>
                     </li>
-                @endif
-                @if ($user_role === \App\Models\Users::ROLE_VENDOR)
-                    <li class="nav-item {{ Request::segment(1) == 'checklist' ? 'active' : '' }}">
-                        <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ url('checklist') }}">
-                            Konfigurasi
-                        </a>
-                    </li>
-                @endif
-                {{-- only admin --}}
-                @if ($user_role === \App\Models\Users::ROLE_ADMIN)
+                @endcan
+                @can('transaction.view')
                     <li class="nav-item {{ Request::segment(1) == 'transactions' ? 'active' : '' }}">
                         <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_transactions') }}">
                             Job
                         </a>
                     </li>
+                @endcan
+                @can('client.view')
                     <li class="nav-item {{ Request::segment(1) == 'clients' ? 'active' : '' }}">
                         <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_clients') }}">
                             Company
                         </a>
                     </li>
+                @endcan
+                @can('zone.view')
                     <li class="nav-item {{ Request::segment(1) == 'zone' ? 'active' : '' }}">
                         <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_zone') }}">
                             Zone
                         </a>
                     </li>
+                @endcan
+                @if (auth()->user()->can('config_truck_type.view') || auth()->user()->can('config_master_device.view') || auth()->user()->can('config_logs_gps.view'))
                     <li class="nav-item dropdown {{ Request::segment(1) == 'config' ? 'active' : '' }}">
                         <a class="nav-link dropdown-toggle" href="#" id="dropdownConfig" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                             Configuration
                         </a>
                         <ul class="dropdown-menu" style="right: 0; left: auto;" aria-labelledby="dropdownConfig">
-                            {{-- <li>
-                                <a class="dropdown-item {{ Request::segment(2) == 'rates' ? 'active' : '' }}" href="{{ route('view_config_rates') }}" title="">Harga</a>
-                            </li>
-                            <li>
-                                <a class="dropdown-item {{ Request::segment(2) == 'pockets' ? 'active' : '' }}" href="{{ route('view_config_pockets') }}" title="">Uang Saku</a>
-                            </li> --}}
-                            {{-- <li>
-                                <a class="dropdown-item {{ Request::segment(2) == 'static_insurances' ? 'active' : '' }}" href="{{ route('view_config_static_insurances') }}" title="">Asuransi</a>
-                            </li> --}}
-                            <li>
-                                <a class="dropdown-item {{ Request::segment(2) == 'truck_types' ? 'active' : '' }}" href="{{ route('view_config_truck_types') }}" title="">Vehicle Type</a>
-                            </li>
-                            <li>
-                                <a class="dropdown-item {{ Request::segment(2) == 'devices' ? 'active' : '' }}" href="{{ route('view_config_devices') }}" title="">Master Devices</a>
-                            </li>
-                            <li>
-                                <a class="dropdown-item {{ Request::segment(2) == 'logs_gps' ? 'active' : '' }}" href="{{ route('view_config_logs_gps') }}" title="">Logs Gps</a>
-                            </li>
-                            {{-- <li>
-                                <a class="dropdown-item {{ Request::segment(2) == 'a_items' ? 'active' : '' }}" href="{{ route('view_adm_a_items') }}" title="">additional item</a>
-                            </li> --}}
-                            {{-- <li>
-                                <a class="dropdown-item {{ Request::segment(2) == 'menu_permissions' ? 'active' : '' }}"
-                                    href="{{ route('view_adm_menu_permissions') }}" title="">Menu Permissions</a>
-                            </li> --}}
-                            {{-- <li>
-                                <a class="dropdown-item {{ Request::segment(2) == 'logbook_types' ? 'active' : '' }}" href="{{ route('view_config_lgb_types') }}" title="">Tipe Logbook</a>
-                            </li> --}}
-                            {{-- <li>
-                                <a class="dropdown-item {{ Request::segment(2) == 'logbook_keys' ? 'active' : '' }}" href="{{ route('view_config_lgb_keys') }}" title="">Master Logbook</a>
-                            </li> --}}
+                            @can('config_truck_type.view')
+                                <li>
+                                    <a class="dropdown-item {{ Request::segment(2) == 'truck_types' ? 'active' : '' }}" href="{{ route('view_config_truck_types') }}" title="">Vehicle Type</a>
+                                </li>
+                            @endcan
+                            @can('config_master_device.view')
+                                <li>
+                                    <a class="dropdown-item {{ Request::segment(2) == 'devices' ? 'active' : '' }}" href="{{ route('view_config_devices') }}" title="">Master Devices</a>
+                                </li>
+                            @endcan
+                            @can('config_logs_gps.view')
+                                <li>
+                                    <a class="dropdown-item {{ Request::segment(2) == 'logs_gps' ? 'active' : '' }}" href="{{ route('view_config_logs_gps') }}" title="">Logs Gps</a>
+                                </li>
+                            @endcan
                         </ul>
                     </li>
                 @endif
-                {{-- only admin and vendor --}}
-                @if ($user_role === \App\Models\Users::ROLE_ADMIN || $user_role === \App\Models\Users::ROLE_VENDOR)
-                    {{-- @if ($user_role === \App\Models\Users::ROLE_ADMIN) --}}
+                @can('driver.view')
                     <li class="nav-item {{ Request::segment(1) == 'drivers' ? 'active' : '' }}">
                         <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_drivers') }}">
                             Driver
                         </a>
                     </li>
+                @endcan
+                @can('vehicle.view')
                     <li class="nav-item {{ Request::segment(1) == 'vehicles' ? 'active' : '' }}">
                         <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_vehicles') }}">
                             Vehicle
                         </a>
                     </li>
+                @endcan
+                @can('user.view')
                     <li class="nav-item {{ Request::segment(1) == 'users' ? 'active' : '' }}">
                         <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_users') }}">
                             User
                         </a>
                     </li>
-                @endif
+                @endcan
 
-                {{-- only admin and client --}}
-                {{-- @if ($user_role === \App\Models\Users::ROLE_ADMIN || $user_role === \App\Models\Users::ROLE_CLIENT_ADMIN)
-                    <li class="nav-item {{ Request::segment(1) == 'transactions' ? 'active' : '' }}">
-                        <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page"
-                            href="{{ route('view_transactions') }}">
-                            Transactions
+                @can('role.view')
+                    <li class="nav-item {{ Request::segment(1) == 'roles' ? 'active' : '' }}">
+                        <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_roles') }}">
+                            Role
                         </a>
                     </li>
-                @endif --}}
-                {{-- only client --}}
-                @if ($user_role === \App\Models\Users::ROLE_CLIENT_ADMIN)
-                    <li class="nav-item {{ Request::path() == 'user/clients/transactions' || Request::path() == 'user/clients/transactions/addNew' || Request::path() == 'user/clients/transactions/view' ? 'active' : '' }}">
-                        <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_user_client_transaction') }}">
-                            Transaction
-                        </a>
-                    </li>
-                    {{-- <li class="nav-item {{ Request::segment(1) == 'zone' ? 'active' : '' }}">
-                        <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page"
-                            href="{{ route('view_zone') }}">
-                            Zone
-                        </a>
-                    </li> --}}
-                @endif
-                {{-- only checker --}}
-                @if ($user_role === \App\Models\Users::ROLE_CHECKER)
-                    <li class="nav-item {{ Request::path() == 'user/checker' || Request::path() == 'user/checker/view' ? 'active' : '' }}">
-                        <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_user_checker') }}">
-                            Checker
-                        </a>
-                    </li>
-                @endif
-                {{-- all roles --}}
-                @if ($user_role === \App\Models\Users::ROLE_ADMIN || $user_role === \App\Models\Users::ROLE_VENDOR || $user_role === \App\Models\Users::ROLE_CLIENT_ADMIN)
-                    {{-- <li class="nav-item">
-                            <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page"
-                                href="javascrript:void(0);">
-                                Reports
-                            </a>
-                        </li> --}}
-                @endif
-                @if ($user_role === \App\Models\Users::ROLE_FINANCE)
-                    <li class="nav-item {{ Request::segment(1) == 'dashboard' ? 'active' : '' }}">
-                        <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="#">
-                            Dashboard
-                        </a>
-                    </li>
-                    <li class="nav-item {{ Request::segment(3) == 'ledgerBalanceList' ? 'active' : '' }}">
-                        <a class="nav-link d-flex align-items-center text-capitalize" aria-current="page" href="{{ route('view_ledger_balance') }}">
-                            Ledger Balance
-                        </a>
-                    </li>
-                    <li class="nav-item dropdown {{ Request::segment(2) == 'payment' ? 'active' : '' }}">
-                        <a class="nav-link" href="{{ route('view_keuangan_payment') }}" id="" role="button" aria-expanded="false">
-                            Pembayaran
-                        </a>
-                    </li>
-                    <li class="nav-item dropdown {{ Request::segment(2) == 'billing' ? 'active' : '' }}">
-                        <a class="nav-link" href="{{ route('view_keuangan_billing') }}" id="" role="button" aria-expanded="false">
-                            Penagihan
-                        </a>
-                    </li>
-                    <li class="nav-item dropdown {{ Request::segment(2) == 'pocket_tf_history' ? 'active' : '' }}">
-                        <a class="nav-link" href="{{ route('view_fiinance_pocket_tf_history') }}" id="" role="button" aria-expanded="false">
-                            Riwayat Transfer Uang Saku
-                        </a>
-                    </li>
-                    <li class="nav-item dropdown {{ Request::segment(2) == 'config' ? 'active' : '' }}">
-                        <a class="nav-link dropdown-toggle" href="#" id="" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            Konfigurasi
-                        </a>
-                        <ul class="dropdown-menu" style="right: 0; left: auto;" aria-labelledby="">
-                            <li>
-                                <a class="dropdown-item {{ Request::segment(3) == 'a_items' ? 'active' : '' }}" href="{{ route('view_a_items') }}" title="">additional item</a>
-                            </li>
-                            <li>
-                                <a class="dropdown-item {{ Request::segment(3) == 'dana' ? 'active' : '' }}" href="{{ route('view_finance_dana') }}" title="">Dana</a>
-                            </li>
-                        </ul>
-                    </li>
-                @endif
+                @endcan
             </ul>
             <ul class="navbar-nav ms-auto my-2 my-lg-0 navbar-nav-scroll">
                 <li class="nav-item dropdown">
@@ -229,23 +132,5 @@
                 </li>
             </ul>
         </div>
-        {{-- <p class="mb-0" id="time"></p> --}}
     </div>
 </nav>
-{{-- @if ($user_role == \App\Models\Users::ROLE_ADMIN)
-    <div class="sub-nav shadow" id="subNav">
-        <div class="container-fluid">
-            <div class="row d-flex align-items-center">
-                <div class="col-auto">
-                    <p class="text-bold mb-0">FLEET MANAGER</p>
-                </div>
-                <div class="col-5 d-flex align-items-center">
-                    <span class="me-2">Company</span>
-                    <select name="filter-company" class="select2 form-control" id="filter-company" style="width:100%;">
-                        <option value="all">Semua Company</option>
-                    </select>
-                </div>
-            </div>
-        </div>
-    </div>
-@endif --}}
diff --git a/routes/web.php b/routes/web.php
index 6875834..29dba59 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,8 +2,8 @@
 
 use Illuminate\Support\Facades\Route;
 
-$proxy_url = getenv('PROXY_URL');
-$proxy_schema = getenv('PROXY_SCHEMA');
+$proxy_url = getenv("PROXY_URL");
+$proxy_schema = getenv("PROXY_SCHEMA");
 
 if (!empty($proxy_url)) {
     URL::forceRootUrl($proxy_url);
@@ -43,12 +43,21 @@ Route::middleware(["auth", "auth.user"])->group(function () {
     Route::get("/", "HomeController@check_redirect")->name("view_dashboard_0");
     Route::get("/home", "HomeController@check_redirect")->name("view_dashboard_1");
 
-    Route::get("/transactions", "MenuController@view_transactions")->name("view_transactions");
+    Route::get("/transactions", "MenuController@view_transactions")
+        ->name("view_transactions")
+        ->middleware("permission:transaction.view");
+
     Route::get("/transactions/confirm", "MenuController@view_transactions_confirm")->name(
         "view_transactions_confirm"
     );
-    Route::get("/transactions/view", "MenuController@view_transactions_view")->name("view_transactions_view");
-    Route::get("/transactions/add", "MenuController@view_transactions_add")->name("view_transactions_add");
+    Route::get("/transactions/view", "MenuController@view_transactions_view")
+        ->name("view_transactions_view")
+        ->middleware("permission:transaction.view");
+
+    Route::get("/transactions/add", "MenuController@view_transactions_add")
+        ->name("view_transactions_add")
+        ->middleware("permission:transaction.add");
+
     Route::get("/transactions/download_do", "TransactionController@view_transactions_download_do")->name(
         "view_transactions_download_do"
     );
@@ -85,14 +94,37 @@ Route::middleware(["auth", "auth.user"])->group(function () {
     );
     // ./new
 
-    Route::get("/clients", "ClientController@view_clients")->name("view_clients");
-    Route::get("/zone", "ZoneController@view_zone")->name("view_zone");
-    Route::get("/zone/add", "ZoneController@view_zone_add")->name("view_zone_add");
-    Route::get("/zone/edit/{zid}", "ZoneController@view_zone_edit")->name("view_zone_edit");
-    Route::get("/dashboard", "MenuController@view_dashboard")->name("view_dashboard");
-    Route::get("/drivers", "MenuController@view_drivers")->name("view_drivers");
-    Route::get("/vehicles", "MenuController@view_vehicles")->name("view_vehicles");
-    Route::get("/users", "UsersController@view_users")->name("view_users");
+    Route::get("/clients", "ClientController@view_clients")
+        ->name("view_clients")
+        ->middleware("permission:client.view");
+    Route::get("/zone", "ZoneController@view_zone")
+        ->name("view_zone")
+        ->middleware("permission:zone.view");
+    Route::get("/zone/add", "ZoneController@view_zone_add")
+        ->name("view_zone_add")
+        ->middleware("permission:zone.add");
+    Route::get("/zone/edit/{zid}", "ZoneController@view_zone_edit")
+        ->name("view_zone_edit")
+        ->middleware("permission:zone.edit");
+    Route::get("/dashboard", "MenuController@view_dashboard")
+        ->name("view_dashboard")
+        ->middleware("permission:dashboard.view");
+    Route::get("/drivers", "MenuController@view_drivers")
+        ->name("view_drivers")
+        ->middleware("permission:driver.view");
+
+    Route::get("/vehicles", "MenuController@view_vehicles")
+        ->name("view_vehicles")
+        ->middleware("permission:vehicle.view");
+
+    Route::get("/users", "UsersController@view_users")
+        ->name("view_users")
+        ->middleware("permission:user.view");
+
+    Route::get("/roles", "RolesController@view")
+        ->name("view_roles")
+        ->middleware("permission:role.view");
+
     Route::get("/profile", "UsersController@view_profile")->name("view_profile");
     Route::get("/config/rates", "ConfRateController@view_rates")->name("view_config_rates");
     Route::get("/config/pocket", "PocketController@view_pockets")->name("view_config_pockets");
@@ -100,11 +132,18 @@ Route::middleware(["auth", "auth.user"])->group(function () {
     Route::get("/config/static_insurances", "StaticInsuranceController@view_static_insurances")->name(
         "view_config_static_insurances"
     );
-    Route::get("/config/truck_types", "ConfTruckTypeController@view_truck_types")->name(
-        "view_config_truck_types"
-    );
-    Route::get("/config/devices", "DevicesController@view_devices")->name("view_config_devices");
-    Route::get("/config/logs_gps", "MenuController@view_logs_gps")->name("view_config_logs_gps");
+    Route::get("/config/truck_types", "ConfTruckTypeController@view_truck_types")
+        ->name("view_config_truck_types")
+        ->middleware("permission:config_truck_type.view");
+
+    Route::get("/config/devices", "DevicesController@view_devices")
+        ->name("view_config_devices")
+        ->middleware("permission:config_master_device.view");
+
+    Route::get("/config/logs_gps", "MenuController@view_logs_gps")
+        ->name("view_config_logs_gps")
+        ->middleware("permission:config_logs_gps.view");
+
     Route::get("/config/a_items", "AItemsController@view_a_items")->name("view_adm_a_items");
     Route::get("/config/menu_permissions", "UsersMenuPermissionsController@view_menu_permissions")->name(
         "view_adm_menu_permissions"
@@ -218,6 +257,13 @@ Route::middleware(["auth", "auth.user"])->group(function () {
         "api_search_user_name"
     );
 
+    Route::get("/api/roles", "RolesController@api_list")->name("api_list_roles");
+    Route::get("/api/roles/{uid}", "RolesController@api_show")->name("api_show_role");
+    Route::post("/api/roles", "RolesController@api_add")->name("api_add_role");
+    Route::put("/api/roles/{uid}", "RolesController@api_edit")->name("api_edit_role");
+    Route::delete("/api/roles/{uid}", "RolesController@api_del")->name("api_del_role");
+    Route::post("/api/roles/search", "RolesController@api_search")->name("api_search_role");
+
     Route::get("/api/drivers", "DriversController@api_list_drivers")->name("api_list_drivers");
     Route::get("/api/drivers/{did}", "DriversController@api_show_driver")->name("api_show_driver");
     Route::post("/api/drivers", "DriversController@api_add_driver")->name("api_add_driver");