diff --git a/app/Http/Middleware/RequirePermission.php b/app/Http/Middleware/RequirePermission.php index 078ddca83..c9d6f7131 100644 --- a/app/Http/Middleware/RequirePermission.php +++ b/app/Http/Middleware/RequirePermission.php @@ -18,9 +18,17 @@ class RequirePermission */ public function handle($request, Closure $next, $permission) { - $perms = UserPermission::where(['character_id' => auth()->user()->character_id, 'permission'=> $permission])->get(['permission']); + $role = UserRole::where([ + 'character_id' => auth()->user()->character_id, + ])->get(['role']); - abort_unless(auth()->check() && isset($perms[0]->permission), 403, "You don't have the correct permission to be in this area."); + if($role[0]->role != "Admin") { + $perms = UserPermission::where(['character_id' => auth()->user()->character_id, 'permission'=> $permission])->get(['permission']); + + abort_unless(auth()->check() && isset($perms[0]->permission), 403, "You don't have the correct permission to be in this area."); + } + + return $next($request); } diff --git a/resources/views/layouts/user/sidebarmenu/finances.blade.php b/resources/views/layouts/user/sidebarmenu/finances.blade.php index 272c1171d..746d85882 100644 --- a/resources/views/layouts/user/sidebarmenu/finances.blade.php +++ b/resources/views/layouts/user/sidebarmenu/finances.blade.php @@ -1,5 +1,5 @@ @if((auth()->user()->hasRole('User') && auth()->user()->hasPermission('ceo')) || - (auth()->user()->hasRole('Admin') && auth()->user()->hasPermission('ceo'))) + auth()->user()->hasRole('Admin'))