Merge pull request #419 from czqoocavatsim/JoshuaBranch

Joshua branch
czqoocavatsim · Dec 1, 2024 · d4cc3a3 · d4cc3a3
2 parents 7b16990 + 35dde33
commit d4cc3a3
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/app/Jobs/ProcessRosterInactivity.php b/app/Jobs/ProcessRosterInactivity.php
@@ -95,21 +95,21 @@ public function handle()
             }
 
             // 1NOV - 2 Month Activity Check
-            if($roster->certification == "certified" && $roster->active && Carbon::now()->format('d/m') == "01/12" && $roster->currency < 1) {
+            if($roster->certification == "certified" && $roster->active && Carbon::now()->format('d/m') == "01/11" && $roster->currency < 1) {
                 $active_status = 0;
 
-                $first_names[] = $name;
+                $first_names[] = $name ."(". $roster->currency ." hrs)";
 
                 $first_notice++;
 
-                // Notification::send($roster->user, new TwoMonthFromRemoval($roster->user, $currency));
+                Notification::send($roster->user, new TwoMonthFromRemoval($roster->user, $currency));
             }
 
             // 1DEC - 1 Month till Removal
-            if($roster->certification == "certified" && Carbon::now()->format('d/m') == "02/12" && $roster->currency < 1){
+            if($roster->certification == "certified" && Carbon::now()->format('d/m') == "01/12" && $roster->currency < 1){
                 $active_status = 0;
 
-                $second_names[] = $name;
+                $second_names[] = $name ."(". $roster->currency ." hrs)";
 
                 $second_notice++;
 
@@ -120,7 +120,7 @@ public function handle()
             if($roster->certification == "certified" && Carbon::now()->format('d/m') == "24/12" && $roster->currency < 1){
                 $active_status = 0;
 
-                $third_names[] = $name;
+                $third_names[] = $name ."(". $roster->currency ." hrs)";
 
                 $third_notice++;
 
@@ -132,7 +132,7 @@ public function handle()
 
                 // User to be terminated
                 if($roster->currency < 1){
-                    $termination_names[] = $name;
+                    $termination_names[] = $name ."(". $roster->currency ." hrs)";
 
                     $termination_notice++;
                 }