diff --git a/app/Models/User.php b/app/Models/User.php index c9ab3e4..cba290f 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -139,6 +139,10 @@ class User extends Authenticatable public function isEmployee(): bool { + if ($this->isSuperAdmin()) { + return false; + } + return $this->role === 'employee' || $this->hasRole('employee') || $this->can('employee.dashboard') diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index efb19ff..f4bccc1 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -220,22 +220,6 @@ Dashboard @endif - - @can('employee.p2h') - - - Pemeriksaan P2H - - @endcan - - @can('employee.timesheet') - - - Timesheet - - @endcan @endif @@ -410,6 +394,40 @@ @endif + + @if(auth()->user()->canAny(['employee.dashboard', 'employee.p2h', 'employee.timesheet'])) +
+

+ PORTAL KARYAWAN & DRIVER +

+ +
+ @endif +

@@ -520,20 +538,6 @@ Dashboard @endif - - @can('employee.p2h') - - - Pemeriksaan P2H - - @endcan - - @can('employee.timesheet') - - - Timesheet - - @endcan

@endif @@ -691,6 +695,37 @@ @endif + + @if(auth()->user()->canAny(['employee.dashboard', 'employee.p2h', 'employee.timesheet'])) +
+

+ PORTAL KARYAWAN & DRIVER +

+ +
+ @endif +

PENGATURAN

diff --git a/tests/Feature/SuperAdminRbacTest.php b/tests/Feature/SuperAdminRbacTest.php index 89f2154..7dc3db1 100644 --- a/tests/Feature/SuperAdminRbacTest.php +++ b/tests/Feature/SuperAdminRbacTest.php @@ -39,6 +39,9 @@ class SuperAdminRbacTest extends TestCase $response = $this->actingAs($superAdmin)->get(route('admin.dashboard')); $response->assertOk(); $response->assertSee('Dashboard Super Admin'); + $response->assertSee('PORTAL KARYAWAN'); + $response->assertSee('Pemeriksaan P2H'); + $response->assertSee('Timesheet'); } public function test_non_super_admin_cannot_access_admin_dashboard(): void