itdept/expense
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing OutstandingHelper

Browse Source
This commit is contained in:
Fiqh Pratama
2025-10-26 16:20:13 +07:00
parent e918e1e8a1
commit 1a090c8292
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Helpers/OutstandingHelper.php
+11 -1
View File
@@ -28,7 +28,13 @@ class OutstandingHelper
return false; return false;
} }
$status = $form->status; $status = (string) $form->status;
$normalizedStatus = strtolower($status);
if (in_array($normalizedStatus, ['rejected', 'closed'], true)) {
return false;
}
switch ($role) { switch ($role) {
case 'Admin Region': case 'Admin Region':
if ($status !== 'On Progress') { if ($status !== 'On Progress') {
@@ -70,6 +76,10 @@ class OutstandingHelper
return is_null($form->final_approved_at) || is_null($form->final_approved_by); return is_null($form->final_approved_at) || is_null($form->final_approved_by);
default: default:
if (!in_array($normalizedStatus, ['on progress', 'approved 1', 'approved 2'], true)) {
return false;
}
return is_null($form->final_approved_at) || is_null($form->final_approved_by); return is_null($form->final_approved_at) || is_null($form->final_approved_by);
} }
}); });