insyaallah revisi done

app/Http/Controllers/Forms/FormUpCountryController.php

@@ -26,6 +26,7 @@ use App\Rules\FileType;
 use App\Models\Admin;
 use App\Helpers\BudgetHelper;
 use App\Helpers\NotificationHelper;
+use Illuminate\Support\Facades\Log;
 
 class FormUpCountryController extends Controller
 {
@@ -285,15 +286,22 @@ class FormUpCountryController extends Controller
     WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
 
     // Send bulk email
-    Mail::to($recipients)->send(new ExpenseCreated(
-      $name,
-      $expense_number,
-      $tanggal,
-      $total,
-      $url
-    ));
+    foreach ($recipients as $recipient) {
+      try {
+        Mail::to($recipient)->send(new ExpenseCreated(
+          $name,
+          $expense_number,
+          $tanggal,
+          $total,
+          $url
+        ));
+      } catch (\Exception $e) {
+        Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
+        continue;
+      }
+    }
 
-    NotificationHelper::newExpense($form->user_id, $expense_number, $receiver_ids);
+    NotificationHelper::newExpense('up-country', $form->id, $form->user_id, $expense_number, $receiver_ids);
 
     AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Up Country (' . $expense_number . ')');
     session()->flash('success', 'Form has been created.');
@@ -439,15 +447,29 @@ class FormUpCountryController extends Controller
     return redirect()->back();
 	}
 
-  public function approve($id)
+  public function approve(Request $request, $id)
   {
     $this->checkAuthorization(auth()->user(), ['approval.approve']);
 
     $form = FormUpCountry::findOrfail($id);
+
+    $approved_data = [
+      'allowance' => $request->allowance ? $form->allowance : 0,
+      'transport_dalkot' => $request->transport_dalkot ? $form->transport_dalkot : 0,
+      'transport_ankot' => $request->transport_ankot ? $form->transport_ankot : 0,
+      'hotel' => $request->hotel ? $form->hotel : 0,
+    ];
+
     $form->update([
       'approved_at' => now(),
       'approved_by' => auth()->user()->id,
       'status' => 'Approved 1',
+
+      'approved_allowance' => $approved_data['allowance'],
+      'approved_transport_dalkot' => $approved_data['transport_dalkot'],
+      'approved_transport_ankot' => $approved_data['transport_ankot'],
+      'approved_hotel' => $approved_data['hotel'],
+      'approved_total' => array_sum($approved_data),
     ]);
 
     $name = $form->user->name;
@@ -490,16 +512,22 @@ class FormUpCountryController extends Controller
     $url = route('forms.up-country.view', $form->id);
     WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
 
-    // // Send bulk email
-    Mail::to($recipients)->send(new ExpenseApproved(
-      $name,
-      $expense_number,
-      $tanggal,
-      $total,
-      $url
-    ));
+    foreach ($recipients as $recipient) {
+      try {
+        Mail::to($recipient)->send(new ExpenseApproved(
+          $name,
+          $expense_number,
+          $tanggal,
+          $total,
+          $url
+        ));
+      } catch (\Exception $e) {
+        Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
+        continue;
+      }
+    }
 
-    NotificationHelper::approveExpense($form->user_id, $expense_number, $receiver_ids);
+    NotificationHelper::approveExpense('up-country', $form->id, $form->user_id, $expense_number, $receiver_ids);
 
     AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Up Country (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been approved.');
@@ -557,22 +585,29 @@ class FormUpCountryController extends Controller
     WhatsappHelper::approve2Expense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
 
     // // Send bulk email
-    Mail::to($recipients)->send(new ExpenseApproved2(
-      $name,
-      $expense_number,
-      $tanggal,
-      $total,
-      $url
-    ));
+    foreach ($recipients as $recipient) {
+      try {
+        Mail::to($recipient)->send(new ExpenseApproved2(
+          $name,
+          $expense_number,
+          $tanggal,
+          $total,
+          $url
+        ));
+      } catch (\Exception $e) {
+        Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
+        continue;
+      }
+    }
 
-    NotificationHelper::approve2Expense($form->user_id, $expense_number, $receiver_ids);
+    NotificationHelper::approve2Expense('up-country', $form->id, $form->user_id, $expense_number, $receiver_ids);
 
     AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Up Country (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been approved.');
     return redirect()->back();
   }
 
-  public function finalApprove(Request $request, $id)
+  public function finalApprove($id)
   {
     $this->checkAuthorization(auth()->user(), ['final_approval.approve']);
 
@@ -582,17 +617,10 @@ class FormUpCountryController extends Controller
       return redirect()->back();
     }
 
-    $approved_data = [
-      'allowance' => $request->allowance ? $form->allowance : 0,
-      'transport_dalkot' => $request->transport_dalkot ? $form->transport_dalkot : 0,
-      'transport_ankot' => $request->transport_ankot ? $form->transport_ankot : 0,
-      'hotel' => $request->hotel ? $form->hotel : 0,
-    ];
-
     // Check if the total nominal exceeds the available budget
     $cabang_id = UserHasCabang::where('user_id', $form->user_id)->first()->cabang_id;
-    if(array_sum($approved_data) > BudgetHelper::getAvailableBudget($cabang_id)) {
-      session()->flash('error', 'The total nominal exceeds the available budget.');
+    if($form->approved_total > BudgetHelper::getAvailableBudget($cabang_id)) {
+      session()->flash('error', 'Budget cabang untuk periode ini tidak mencukupi, silahkan ajukan pada periode expense berikutnya');
       return redirect()->back();
     }
 
@@ -600,11 +628,6 @@ class FormUpCountryController extends Controller
       'final_approved_at' => now(),
       'final_approved_by' => auth()->user()->id,
       'status' => 'Closed',
-      'approved_allowance' => $approved_data['allowance'],
-      'approved_transport_dalkot' => $approved_data['transport_dalkot'],
-      'approved_transport_ankot' => $approved_data['transport_ankot'],
-      'approved_hotel' => $approved_data['hotel'],
-      'approved_total' => array_sum($approved_data),
     ]);
 
     $name = $form->user->name;
@@ -643,13 +666,20 @@ class FormUpCountryController extends Controller
     WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
 
     // Send bulk email
-    Mail::to($recipients)->send(new FinalApprove(
-      $name,
-      $expense_number,
-      $tanggal,
-      $total,
-      $url
-    ));
+    foreach ($recipients as $recipient) {
+      try {
+        Mail::to($recipient)->send(new FinalApprove(
+          $name,
+          $expense_number,
+          $tanggal,
+          $total,
+          $url
+        ));
+      } catch (\Exception $e) {
+        Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
+        continue;
+      }
+    }
 
     AuditTrailHelper::AddAuditTrail('Final Approve', 'Final Approve Expense at Form Up Country (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been final approved.');
@@ -694,13 +724,20 @@ class FormUpCountryController extends Controller
     WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
 
     // Send bulk email
-    Mail::to($recipients)->send(new ExpenseRejected(
-      $name,
-      $expense_number,
-      $tanggal,
-      $total,
-      $url
-    ));
+    foreach ($recipients as $recipient) {
+      try {
+        Mail::to($recipient)->send(new ExpenseRejected(
+          $name,
+          $expense_number,
+          $tanggal,
+          $total,
+          $url
+        ));
+      } catch (\Exception $e) {
+        Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
+        continue;
+      }
+    }
 
     AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Up Country (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been rejected.');