fixing OutstandingHelper

2025-10-26 16:20:13 +07:00
parent e918e1e8a1
commit 1a090c8292
1 changed files with 11 additions and 1 deletions
@@ -28,7 +28,13 @@ class OutstandingHelper
                return false;
            }

-            $status = $form->status;
+            $status = (string) $form->status;
+            $normalizedStatus = strtolower($status);
+
+            if (in_array($normalizedStatus, ['rejected', 'closed'], true)) {
+                return false;
+            }
+
            switch ($role) {
                case 'Admin Region':
                    if ($status !== 'On Progress') {
@@ -70,6 +76,10 @@ class OutstandingHelper
                    return is_null($form->final_approved_at) || is_null($form->final_approved_by);

                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);
            }
        });