From 6d6de5fa4b6ef8cfb5e9592c634dc987517940ad Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Mon, 22 Jun 2026 13:24:53 +0700 Subject: [PATCH] refactor: standardize enum case naming and update route permissions for consistency across the application --- app/Enums/ActivityEventLabel.php | 20 +++---- app/Enums/Permission.php | 46 ++++++++-------- .../Finance/EmployeeAdvanceController.php | 12 ++--- .../Admin/Hr/LeaveRequestController.php | 10 ++-- .../Manage/OwnerVerificationController.php | 4 +- .../Admin/Master/RawMaterialController.php | 6 +-- app/Http/Middleware/HandleInertiaRequests.php | 2 +- ....php => ResolvesAuthenticatedEmployee.php} | 4 +- .../Finance/EmployeeAdvanceService.php | 6 +-- app/Services/Hr/AttendanceService.php | 8 +-- app/Services/Hr/LeaveRequestService.php | 6 +-- resources/js/components/AppSidebar.vue | 10 ++-- .../admin/finance/employee-advances/Index.vue | 4 +- .../table/data-table-actions.vue | 18 +++---- .../hr/employees/table/data-table-actions.vue | 4 +- .../table/employee-status-toggle.vue | 4 +- .../pages/admin/hr/leave-requests/Index.vue | 2 +- .../table/data-table-actions.vue | 14 ++--- .../table/data-table-actions.vue | 2 +- .../admin/master/raw-materials/Index.vue | 2 +- .../table/data-table-actions.vue | 6 +-- .../table/raw-material-status-toggle.vue | 4 +- routes/web.php | 52 +++++++++---------- 23 files changed, 123 insertions(+), 123 deletions(-) rename app/Services/Concerns/{ResolvesAuthEmployee.php => ResolvesAuthenticatedEmployee.php} (78%) diff --git a/app/Enums/ActivityEventLabel.php b/app/Enums/ActivityEventLabel.php index 24e8c44..794f6b6 100644 --- a/app/Enums/ActivityEventLabel.php +++ b/app/Enums/ActivityEventLabel.php @@ -4,20 +4,20 @@ enum ActivityEventLabel: string { - case Created = 'created'; - case Updated = 'updated'; - case Deleted = 'deleted'; - case Login = 'login'; - case Logout = 'logout'; + case CREATED = 'created'; + case UPDATED = 'updated'; + case DELETED = 'deleted'; + case LOGIN = 'login'; + case LOGOUT = 'logout'; public function label(): string { return match ($this) { - self::Created => 'Dibuat', - self::Updated => 'Diperbarui', - self::Deleted => 'Dihapus', - self::Login => 'Masuk', - self::Logout => 'Keluar', + self::CREATED => 'Dibuat', + self::UPDATED => 'Diperbarui', + self::DELETED => 'Dihapus', + self::LOGIN => 'Masuk', + self::LOGOUT => 'Keluar', }; } diff --git a/app/Enums/Permission.php b/app/Enums/Permission.php index 12709f3..94aa1c9 100644 --- a/app/Enums/Permission.php +++ b/app/Enums/Permission.php @@ -14,19 +14,19 @@ enum Permission: string case EMPLOYEES_CREATE = 'employees.create'; case EMPLOYEES_UPDATE = 'employees.update'; case EMPLOYEES_DELETE = 'employees.delete'; - case EMPLOYEES_RESET_PASSWORD = 'employees.reset-password'; - case EMPLOYEES_TOGGLE_STATUS = 'employees.toggle-status'; + case EMPLOYEES_RESET_PASSWORD = 'employees.reset_password'; + case EMPLOYEES_TOGGLE_STATUS = 'employees.toggle_status'; case ATTENDANCES_VIEW = 'attendances.view'; case ATTENDANCES_CREATE = 'attendances.create'; case ATTENDANCES_DELETE = 'attendances.delete'; case ATTENDANCES_MANAGE = 'attendances.manage'; - case LEAVE_REQUESTS_VIEW = 'leave-requests.view'; - case LEAVE_REQUESTS_CREATE = 'leave-requests.create'; - case LEAVE_REQUESTS_UPDATE = 'leave-requests.update'; - case LEAVE_REQUESTS_DELETE = 'leave-requests.delete'; - case LEAVE_REQUESTS_VERIFY = 'leave-requests.verify'; + case LEAVE_REQUESTS_VIEW = 'leave_requests.view'; + case LEAVE_REQUESTS_CREATE = 'leave_requests.create'; + case LEAVE_REQUESTS_UPDATE = 'leave_requests.update'; + case LEAVE_REQUESTS_DELETE = 'leave_requests.delete'; + case LEAVE_REQUESTS_VERIFY = 'leave_requests.verify'; case CATEGORIES_VIEW = 'categories.view'; case CATEGORIES_CREATE = 'categories.create'; @@ -47,13 +47,13 @@ enum Permission: string case PRODUCTS_CREATE = 'products.create'; case PRODUCTS_UPDATE = 'products.update'; case PRODUCTS_DELETE = 'products.delete'; - case PRODUCTS_TOGGLE_STATUS = 'products.toggle-status'; + case PRODUCTS_TOGGLE_STATUS = 'products.toggle_status'; - case RAW_MATERIALS_VIEW = 'raw-materials.view'; - case RAW_MATERIALS_CREATE = 'raw-materials.create'; - case RAW_MATERIALS_UPDATE = 'raw-materials.update'; - case RAW_MATERIALS_DELETE = 'raw-materials.delete'; - case RAW_MATERIALS_TOGGLE_STATUS = 'raw-materials.toggle-status'; + case RAW_MATERIALS_VIEW = 'raw_materials.view'; + case RAW_MATERIALS_CREATE = 'raw_materials.create'; + case RAW_MATERIALS_UPDATE = 'raw_materials.update'; + case RAW_MATERIALS_DELETE = 'raw_materials.delete'; + case RAW_MATERIALS_TOGGLE_STATUS = 'raw_materials.toggle_status'; case PURCHASES_VIEW = 'purchases.view'; case PURCHASES_CREATE = 'purchases.create'; @@ -76,9 +76,9 @@ enum Permission: string case CUTTINGS_VERIFY = 'cuttings.verify'; case CUTTINGS_REJECT = 'cuttings.reject'; - case OWNER_VERIFICATIONS_VIEW = 'owner-verifications.view'; - case OWNER_VERIFICATIONS_VERIFY = 'owner-verifications.verify'; - case OWNER_VERIFICATIONS_REJECT = 'owner-verifications.reject'; + case OWNER_VERIFICATIONS_VIEW = 'owner_verifications.view'; + case OWNER_VERIFICATIONS_VERIFY = 'owner_verifications.verify'; + case OWNER_VERIFICATIONS_REJECT = 'owner_verifications.reject'; case STOCKS_VIEW = 'stocks.view'; @@ -93,12 +93,12 @@ enum Permission: string case EXPENSES_UPDATE = 'expenses.update'; case EXPENSES_DELETE = 'expenses.delete'; - case EMPLOYEE_ADVANCES_VIEW = 'employee-advances.view'; - case EMPLOYEE_ADVANCES_CREATE = 'employee-advances.create'; - case EMPLOYEE_ADVANCES_UPDATE = 'employee-advances.update'; - case EMPLOYEE_ADVANCES_DELETE = 'employee-advances.delete'; - case EMPLOYEE_ADVANCES_VERIFY = 'employee-advances.verify'; - case EMPLOYEE_ADVANCES_PAY = 'employee-advances.pay'; + case EMPLOYEE_ADVANCES_VIEW = 'employee_advances.view'; + case EMPLOYEE_ADVANCES_CREATE = 'employee_advances.create'; + case EMPLOYEE_ADVANCES_UPDATE = 'employee_advances.update'; + case EMPLOYEE_ADVANCES_DELETE = 'employee_advances.delete'; + case EMPLOYEE_ADVANCES_VERIFY = 'employee_advances.verify'; + case EMPLOYEE_ADVANCES_PAY = 'employee_advances.pay'; case PAYROLL_VIEW = 'payroll.view'; case PAYROLL_ADJUST = 'payroll.adjust'; @@ -106,7 +106,7 @@ enum Permission: string case SETTINGS_VIEW = 'settings.view'; case SETTINGS_UPDATE = 'settings.update'; - case ACTIVITY_LOGS_VIEW = 'activity-logs.view'; + case ACTIVITY_LOGS_VIEW = 'activity_logs.view'; case ROLES_VIEW = 'roles.view'; case ROLES_CREATE = 'roles.create'; diff --git a/app/Http/Controllers/Admin/Finance/EmployeeAdvanceController.php b/app/Http/Controllers/Admin/Finance/EmployeeAdvanceController.php index d0fcc62..d4951d0 100644 --- a/app/Http/Controllers/Admin/Finance/EmployeeAdvanceController.php +++ b/app/Http/Controllers/Admin/Finance/EmployeeAdvanceController.php @@ -48,7 +48,7 @@ public function store(EmployeeAdvanceRequest $request): RedirectResponse $this->flashSuccess('Kasbon berhasil diajukan.'); - return redirect()->route('admin.finance.employee-advances.index'); + return redirect()->route('admin.finance.employee_advances.index'); } public function update(EmployeeAdvanceRequest $request, EmployeeAdvance $employeeAdvance): RedirectResponse @@ -57,7 +57,7 @@ public function update(EmployeeAdvanceRequest $request, EmployeeAdvance $employe $this->flashUpdated('Kasbon'); - return redirect()->route('admin.finance.employee-advances.index'); + return redirect()->route('admin.finance.employee_advances.index'); } public function destroy(EmployeeAdvance $employeeAdvance): RedirectResponse @@ -66,7 +66,7 @@ public function destroy(EmployeeAdvance $employeeAdvance): RedirectResponse $this->flashDeleted('Kasbon'); - return redirect()->route('admin.finance.employee-advances.index'); + return redirect()->route('admin.finance.employee_advances.index'); } public function approve(EmployeeAdvance $employeeAdvance): RedirectResponse @@ -75,7 +75,7 @@ public function approve(EmployeeAdvance $employeeAdvance): RedirectResponse $this->flashSuccess('Kasbon berhasil disetujui dan dicairkan dari kas.'); - return redirect()->route('admin.finance.employee-advances.index'); + return redirect()->route('admin.finance.employee_advances.index'); } public function reject(RejectEmployeeAdvanceRequest $request, EmployeeAdvance $employeeAdvance): RedirectResponse @@ -88,7 +88,7 @@ public function reject(RejectEmployeeAdvanceRequest $request, EmployeeAdvance $e $this->flashSuccess('Kasbon berhasil ditolak.'); - return redirect()->route('admin.finance.employee-advances.index'); + return redirect()->route('admin.finance.employee_advances.index'); } public function pay(EmployeeAdvance $employeeAdvance): RedirectResponse @@ -97,6 +97,6 @@ public function pay(EmployeeAdvance $employeeAdvance): RedirectResponse $this->flashSuccess('Kasbon berhasil dilunasi.'); - return redirect()->route('admin.finance.employee-advances.index'); + return redirect()->route('admin.finance.employee_advances.index'); } } diff --git a/app/Http/Controllers/Admin/Hr/LeaveRequestController.php b/app/Http/Controllers/Admin/Hr/LeaveRequestController.php index 80c04d3..1cc8bd9 100644 --- a/app/Http/Controllers/Admin/Hr/LeaveRequestController.php +++ b/app/Http/Controllers/Admin/Hr/LeaveRequestController.php @@ -52,7 +52,7 @@ public function store(SubmitLeaveRequest $request): RedirectResponse $this->flashSuccess('Pengajuan cuti berhasil diajukan.'); - return redirect()->route('admin.hr.leave-requests.index'); + return redirect()->route('admin.hr.leave_requests.index'); } public function update(SubmitLeaveRequest $request, LeaveRequest $leaveRequest): RedirectResponse @@ -61,7 +61,7 @@ public function update(SubmitLeaveRequest $request, LeaveRequest $leaveRequest): $this->flashUpdated('Pengajuan cuti'); - return redirect()->route('admin.hr.leave-requests.index'); + return redirect()->route('admin.hr.leave_requests.index'); } public function destroy(LeaveRequest $leaveRequest): RedirectResponse @@ -70,7 +70,7 @@ public function destroy(LeaveRequest $leaveRequest): RedirectResponse $this->flashDeleted('Pengajuan cuti'); - return redirect()->route('admin.hr.leave-requests.index'); + return redirect()->route('admin.hr.leave_requests.index'); } public function approve(LeaveRequest $leaveRequest): RedirectResponse @@ -79,7 +79,7 @@ public function approve(LeaveRequest $leaveRequest): RedirectResponse $this->flashSuccess('Pengajuan cuti berhasil disetujui.'); - return redirect()->route('admin.hr.leave-requests.index'); + return redirect()->route('admin.hr.leave_requests.index'); } public function reject(RejectLeaveRequestRequest $request, LeaveRequest $leaveRequest): RedirectResponse @@ -92,6 +92,6 @@ public function reject(RejectLeaveRequestRequest $request, LeaveRequest $leaveRe $this->flashSuccess('Pengajuan cuti berhasil ditolak.'); - return redirect()->route('admin.hr.leave-requests.index'); + return redirect()->route('admin.hr.leave_requests.index'); } } diff --git a/app/Http/Controllers/Admin/Manage/OwnerVerificationController.php b/app/Http/Controllers/Admin/Manage/OwnerVerificationController.php index 2dcd9cc..4eff83a 100644 --- a/app/Http/Controllers/Admin/Manage/OwnerVerificationController.php +++ b/app/Http/Controllers/Admin/Manage/OwnerVerificationController.php @@ -40,7 +40,7 @@ public function approve(ApproveVerificationRequest $request, Cutting $cutting): $this->flashSuccess('Verifikasi berhasil disetujui. Stok produk telah ditambahkan ke toko.'); - return redirect()->route('admin.manage.owner-verifications.index'); + return redirect()->route('admin.manage.owner_verifications.index'); } public function reject(RejectVerificationRequest $request, Cutting $cutting): RedirectResponse @@ -53,6 +53,6 @@ public function reject(RejectVerificationRequest $request, Cutting $cutting): Re $this->flashSuccess('Verifikasi berhasil ditolak.'); - return redirect()->route('admin.manage.owner-verifications.index'); + return redirect()->route('admin.manage.owner_verifications.index'); } } diff --git a/app/Http/Controllers/Admin/Master/RawMaterialController.php b/app/Http/Controllers/Admin/Master/RawMaterialController.php index c1477f5..44b2c23 100644 --- a/app/Http/Controllers/Admin/Master/RawMaterialController.php +++ b/app/Http/Controllers/Admin/Master/RawMaterialController.php @@ -53,7 +53,7 @@ public function store(RawMaterialRequest $request): RedirectResponse $this->flashCreated('Bahan baku'); - return redirect()->route('admin.master.raw-materials.index'); + return redirect()->route('admin.master.raw_materials.index'); } public function edit(RawMaterial $rawMaterial): Response @@ -78,7 +78,7 @@ public function update(RawMaterialRequest $request, RawMaterial $rawMaterial): R $this->flashUpdated('Bahan baku'); - return redirect()->route('admin.master.raw-materials.index'); + return redirect()->route('admin.master.raw_materials.index'); } public function toggleStatus(ToggleStatusRequest $request, RawMaterial $rawMaterial): RedirectResponse @@ -96,6 +96,6 @@ public function destroy(RawMaterial $rawMaterial): RedirectResponse $this->flashDeleted('Bahan baku'); - return redirect()->route('admin.master.raw-materials.index'); + return redirect()->route('admin.master.raw_materials.index'); } } diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index 25a6c6c..ef0269b 100644 --- a/app/Http/Middleware/HandleInertiaRequests.php +++ b/app/Http/Middleware/HandleInertiaRequests.php @@ -114,7 +114,7 @@ private function pendingOwnerVerifications(Request $request): int { $user = $request->user(); - if ($user === null || ! $user->can('owner-verifications.view')) { + if ($user === null || ! $user->can('owner_verifications.view')) { return 0; } diff --git a/app/Services/Concerns/ResolvesAuthEmployee.php b/app/Services/Concerns/ResolvesAuthenticatedEmployee.php similarity index 78% rename from app/Services/Concerns/ResolvesAuthEmployee.php rename to app/Services/Concerns/ResolvesAuthenticatedEmployee.php index a1a979b..95e73bb 100644 --- a/app/Services/Concerns/ResolvesAuthEmployee.php +++ b/app/Services/Concerns/ResolvesAuthenticatedEmployee.php @@ -6,9 +6,9 @@ use App\Models\User; use Illuminate\Validation\ValidationException; -trait ResolvesAuthEmployee +trait ResolvesAuthenticatedEmployee { - private function resolveAuthEmployee(?User $user = null): Employee + private function resolveAuthenticatedEmployee(?User $user = null): Employee { $employee = ($user ?? auth()->user())?->employee; diff --git a/app/Services/Finance/EmployeeAdvanceService.php b/app/Services/Finance/EmployeeAdvanceService.php index c45161a..324319c 100644 --- a/app/Services/Finance/EmployeeAdvanceService.php +++ b/app/Services/Finance/EmployeeAdvanceService.php @@ -6,7 +6,7 @@ use App\Enums\Role; use App\Models\EmployeeAdvance; use App\Models\User; -use App\Services\Concerns\ResolvesAuthEmployee; +use App\Services\Concerns\ResolvesAuthenticatedEmployee; use App\Services\System\PushNotificationService; use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Database\Eloquent\Builder; @@ -14,7 +14,7 @@ class EmployeeAdvanceService { - use ResolvesAuthEmployee; + use ResolvesAuthenticatedEmployee; public function __construct( private readonly CashService $cashService, @@ -74,7 +74,7 @@ public function paginateForIndex(array $tableQuery, User $user, string $status = */ public function create(array $validated, User $user): void { - $employee = $this->resolveAuthEmployee($user); + $employee = $this->resolveAuthenticatedEmployee($user); $employeeAdvance = DB::transaction(function () use ($validated, $employee) { return EmployeeAdvance::create([ diff --git a/app/Services/Hr/AttendanceService.php b/app/Services/Hr/AttendanceService.php index 9e5671e..a4aabd7 100644 --- a/app/Services/Hr/AttendanceService.php +++ b/app/Services/Hr/AttendanceService.php @@ -6,7 +6,7 @@ use App\Models\Employee; use App\Models\LeaveRequest; use App\Models\User; -use App\Services\Concerns\ResolvesAuthEmployee; +use App\Services\Concerns\ResolvesAuthenticatedEmployee; use App\Services\Media\MediaService; use App\Services\System\PushNotificationService; use Carbon\CarbonInterface; @@ -16,7 +16,7 @@ class AttendanceService { - use ResolvesAuthEmployee; + use ResolvesAuthenticatedEmployee; public function __construct( private readonly MediaService $mediaService, @@ -72,7 +72,7 @@ public function isOnLeaveToday(Employee $employee): bool */ public function checkIn(array $validated, User $user): void { - $employee = $this->resolveAuthEmployee($user); + $employee = $this->resolveAuthenticatedEmployee($user); $existing = Attendance::query() ->where('employee_id', $employee->id) @@ -113,7 +113,7 @@ public function checkIn(array $validated, User $user): void */ public function checkOut(array $validated, User $user): void { - $employee = $this->resolveAuthEmployee($user); + $employee = $this->resolveAuthenticatedEmployee($user); $attendance = Attendance::query() ->where('employee_id', $employee->id) diff --git a/app/Services/Hr/LeaveRequestService.php b/app/Services/Hr/LeaveRequestService.php index 53894c3..5d53fe1 100644 --- a/app/Services/Hr/LeaveRequestService.php +++ b/app/Services/Hr/LeaveRequestService.php @@ -5,7 +5,7 @@ use App\Enums\LeaveRequestStatus; use App\Models\LeaveRequest; use App\Models\User; -use App\Services\Concerns\ResolvesAuthEmployee; +use App\Services\Concerns\ResolvesAuthenticatedEmployee; use App\Services\System\PushNotificationService; use Carbon\Carbon; use Illuminate\Contracts\Pagination\LengthAwarePaginator; @@ -15,7 +15,7 @@ class LeaveRequestService { - use ResolvesAuthEmployee; + use ResolvesAuthenticatedEmployee; public function __construct( private readonly PushNotificationService $pushNotificationService, @@ -53,7 +53,7 @@ public function paginateForIndex(array $tableQuery, User $user): LengthAwarePagi */ public function create(array $validated, User $user): void { - $employee = $this->resolveAuthEmployee($user); + $employee = $this->resolveAuthenticatedEmployee($user); $hasPending = LeaveRequest::pending() ->where('employee_id', $employee->id) diff --git a/resources/js/components/AppSidebar.vue b/resources/js/components/AppSidebar.vue index 771f826..44e6361 100644 --- a/resources/js/components/AppSidebar.vue +++ b/resources/js/components/AppSidebar.vue @@ -44,7 +44,7 @@ const menuGroups: MenuGroup[] = [ items: [ { title: 'Kategori', href: '/admin/master/categories', icon: FolderTree, permission: 'categories.view' }, { title: 'Produk', href: '/admin/master/products', icon: Package, permission: 'products.view' }, - { title: 'Bahan Baku', href: '/admin/master/raw-materials', icon: Layers, permission: 'raw-materials.view' }, + { title: 'Bahan Baku', href: '/admin/master/raw-materials', icon: Layers, permission: 'raw_materials.view' }, { title: 'Supplier', href: '/admin/master/suppliers', icon: User, permission: 'suppliers.view' }, { title: 'Customer', href: '/admin/master/customers', icon: UserCheck, permission: 'customers.view' }, ], @@ -55,7 +55,7 @@ const menuGroups: MenuGroup[] = [ { title: 'Belanja', href: '/admin/manage/purchases', icon: ShoppingBag, permission: 'purchases.view' }, { title: 'Cutting', href: '/admin/manage/cuttings', icon: Scissors, permission: 'cuttings.view' }, { title: 'Stok', href: '/admin/manage/stocks', icon: Warehouse, permission: 'stocks.view', badgeKey: 'pendingCuttings' }, - { title: 'Verifikasi Owner', href: '/admin/manage/owner-verifications', icon: CheckCircle, permission: 'owner-verifications.view', badgeKey: 'pendingOwnerVerifications' }, + { title: 'Verifikasi Owner', href: '/admin/manage/owner-verifications', icon: CheckCircle, permission: 'owner_verifications.view', badgeKey: 'pendingOwnerVerifications' }, { title: 'Pesanan', href: '/admin/manage/orders', icon: ShoppingCart, permission: 'orders.view' }, ], }, @@ -64,7 +64,7 @@ const menuGroups: MenuGroup[] = [ items: [ { title: 'Kas Toko', href: '/admin/finance/cash', icon: Wallet, permission: 'cash.view' }, { title: 'Pengeluaran', href: '/admin/finance/expenses', icon: Receipt, permission: 'expenses.view' }, - { title: 'Kasbon', href: '/admin/finance/employee-advances', icon: Banknote, permission: 'employee-advances.view', badgeKey: 'pendingEmployeeAdvances' }, + { title: 'Kasbon', href: '/admin/finance/employee-advances', icon: Banknote, permission: 'employee_advances.view', badgeKey: 'pendingEmployeeAdvances' }, { title: 'Gaji', href: '/admin/finance/payroll', icon: WalletCards, permission: 'payroll.view' }, ], }, @@ -73,7 +73,7 @@ const menuGroups: MenuGroup[] = [ items: [ { title: 'Pegawai', href: '/admin/hr/employees', icon: Users, permission: 'employees.view' }, { title: 'Presensi', href: '/admin/hr/attendances', icon: Clock, permission: 'attendances.view' }, - { title: 'Cuti', href: '/admin/hr/leave-requests', icon: CalendarDays, permission: 'leave-requests.view', badgeKey: 'pendingLeaveRequests' }, + { title: 'Cuti', href: '/admin/hr/leave-requests', icon: CalendarDays, permission: 'leave_requests.view', badgeKey: 'pendingLeaveRequests' }, ], }, { @@ -81,7 +81,7 @@ const menuGroups: MenuGroup[] = [ items: [ { title: 'Role & Permission', href: '/admin/system/roles', icon: Shield, permission: 'roles.view' }, { title: 'Pengaturan', href: '/admin/system/setting', icon: Settings2, permission: 'settings.view' }, - { title: 'Log Aktivitas', href: '/admin/system/activity-logs', icon: History, permission: 'activity-logs.view' }, + { title: 'Log Aktivitas', href: '/admin/system/activity-logs', icon: History, permission: 'activity_logs.view' }, ], }, ]; diff --git a/resources/js/pages/admin/finance/employee-advances/Index.vue b/resources/js/pages/admin/finance/employee-advances/Index.vue index d646bf4..b015711 100644 --- a/resources/js/pages/admin/finance/employee-advances/Index.vue +++ b/resources/js/pages/admin/finance/employee-advances/Index.vue @@ -118,7 +118,7 @@ watch( - + Total Kasbon @@ -147,7 +147,7 @@ watch( - diff --git a/resources/js/pages/admin/finance/employee-advances/table/data-table-actions.vue b/resources/js/pages/admin/finance/employee-advances/table/data-table-actions.vue index 727604b..4909c3e 100644 --- a/resources/js/pages/admin/finance/employee-advances/table/data-table-actions.vue +++ b/resources/js/pages/admin/finance/employee-advances/table/data-table-actions.vue @@ -28,16 +28,16 @@ const isOwner = computed(() => ( const canEdit = computed(() => ( props.employeeAdvance.is_editable - && !can('employee-advances.verify') + && !can('employee_advances.verify') && isOwner.value - && can('employee-advances.update') + && can('employee_advances.update') )); const canDelete = computed(() => ( props.employeeAdvance.is_editable - && !can('employee-advances.verify') + && !can('employee_advances.verify') && isOwner.value - && can('employee-advances.delete') + && can('employee_advances.delete') )); const deleteConfirmOpen = ref(false); @@ -111,7 +111,7 @@ function payEmployeeAdvance() { Ubah - +