revised approval system (all forms)

app/Http/Controllers/Forms/FormMeetingSeminarController.php

@@ -16,6 +16,7 @@ use App\Helpers\NextCloudHelper;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Mail;
 use App\Mail\ExpenseApproved;
+use App\Mail\ExpenseApproved2;
 use App\Mail\ExpenseRejected;
 use App\Mail\ExpenseCreated;
 use App\Mail\FinalApprove;
@@ -82,7 +83,7 @@ class FormMeetingSeminarController extends Controller
 
   public function detail($id)
   {
-    $this->checkAuthorization(auth()->user(), ['forms.country.view']);
+    $this->checkAuthorization(auth()->user(), ['forms.meeting.view']);
 
     $form = FormMeetingSeminar::with('user')->findOrFail($id);
     $form->bukti_allowance = $form->bukti_allowance ? NextCloudHelper::getFileUrl($form->bukti_allowance) : null;
@@ -94,7 +95,7 @@ class FormMeetingSeminarController extends Controller
 
   public function view($id)
   {
-    $this->checkAuthorization(auth()->user(), ['forms.country.view']);
+    $this->checkAuthorization(auth()->user(), ['forms.meeting.view']);
 
     $form = FormMeetingSeminar::with('user')->findOrFail($id);
     $form->bukti_allowance = $form->bukti_allowance ? NextCloudHelper::getFileUrl($form->bukti_allowance) : null;
@@ -128,7 +129,7 @@ class FormMeetingSeminarController extends Controller
 
     $cabang = UserHasCabang::with('cabang')->where('user_id', auth()->user()->id)->first()->cabang;
     $region = Region::where('id', $cabang->region_id)->first();
-    $kategori = Kategori::where('name', 'Meeting & Seminar')->first();
+    $kategori = Kategori::where('name', 'Meeting / Seminar')->first();
 
     $filePaths = [];
     $folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/meeting';
@@ -227,7 +228,7 @@ class FormMeetingSeminarController extends Controller
 
     // Generate URL and send WhatsApp notification
     $url = route('forms.meeting.view', $form->id);
-    WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url);
+    WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
 
     // Send bulk email
     Mail::to($recipients)->send(new ExpenseCreated(
@@ -281,7 +282,7 @@ class FormMeetingSeminarController extends Controller
 
     $cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()->cabang;
     $region = Region::where('id', $cabang->region_id)->first();
-    $kategori = Kategori::where('name', 'Meeting & Seminar')->first();
+    $kategori = Kategori::where('name', 'Meeting / Seminar')->first();
 
     $filePaths = [];
     $folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/meeting';
@@ -354,11 +355,122 @@ class FormMeetingSeminarController extends Controller
     return redirect()->back();
 	}
 
-  public function approve(Request $request, $id)
+  public function approve($id)
   {
     $this->checkAuthorization(auth()->user(), ['approval.approve']);
 
     $form = FormMeetingSeminar::findOrfail($id);
+    $form->update([
+      'approved_at' => now(),
+      'approved_by' => auth()->user()->id,
+      'status' => 'Approved 1',
+    ]);
+
+    $heads = $form->user->getCabangAndRegionHead();
+    $name = $form->user->name;
+    $expense_number = $form->expense_number;
+    $tanggal = $form->created_at;
+    $total = $form->total;
+
+    // Collect all recipients
+    $recipients = [$form->user->email, auth()->user()->email];
+    $phoneNumbers = [$form->user->phone, auth()->user()->phone];
+
+    if ($heads['cabang_head']) {
+      $recipients[] = $heads['cabang_head']['email'];
+      $phoneNumbers[] = $heads['cabang_head']['phone'];
+    }
+
+    if ($heads['region_head']) {
+      $recipients[] = $heads['region_head']['email'];
+      $phoneNumbers[] = $heads['region_head']['phone'];
+    }
+
+    // Remove duplicate data, if any
+    $recipients = array_unique($recipients);
+    $phoneNumbers = array_unique($phoneNumbers);
+
+    // send whatsapp message
+    $url = route('forms.meeting.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
+    ));
+
+    AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Meeting Seminar (' . $form->expense_number . ')');
+    session()->flash('success', 'Form has been approved.');
+    return redirect()->back();
+  }
+
+  public function approve2($id)
+  {
+    $this->checkAuthorization(auth()->user(), ['approval2.approve']);
+
+    $form = FormMeetingSeminar::findOrfail($id);
+    $form->update([
+      'approved2_at' => now(),
+      'approved2_by' => auth()->user()->id,
+      'status' => 'Approved 2',
+    ]);
+
+    $heads = $form->user->getCabangAndRegionHead();
+    $name = $form->user->name;
+    $expense_number = $form->expense_number;
+    $tanggal = $form->created_at;
+    $total = $form->total;
+
+    // Collect all recipients
+    $recipients = [$form->user->email, auth()->user()->email];
+    $phoneNumbers = [$form->user->phone, auth()->user()->phone];
+
+    if ($heads['cabang_head']) {
+      $recipients[] = $heads['cabang_head']['email'];
+      $phoneNumbers[] = $heads['cabang_head']['phone'];
+    }
+
+    if ($heads['region_head']) {
+      $recipients[] = $heads['region_head']['email'];
+      $phoneNumbers[] = $heads['region_head']['phone'];
+    }
+
+    // Remove duplicate data, if any
+    $recipients = array_unique($recipients);
+    $phoneNumbers = array_unique($phoneNumbers);
+
+    // send whatsapp message
+    $url = route('forms.meeting.view', $form->id);
+    WhatsappHelper::approve2Expense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
+
+    // // Send bulk email
+    Mail::to($recipients)->send(new ExpenseApproved2(
+      $name,
+      $expense_number,
+      $tanggal,
+      $total,
+      $url
+    ));
+
+    AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Meeting Seminar (' . $form->expense_number . ')');
+    session()->flash('success', 'Form has been approved.');
+    return redirect()->back();
+  }
+
+  public function finalApprove(Request $request, $id)
+  {
+    $this->checkAuthorization(auth()->user(), ['final_approval.approve']);
+
+    $form = FormMeetingSeminar::findOrfail($id);
+    if($form->approved_at == null || $form->approved2_at == null) {
+      session()->flash('error', 'Form must be approved by both approvers before final approval.');
+      return redirect()->back();
+    }
+
     $approved_data = [
       'allowance' => $request->allowance ? $form->allowance : 0,
       'transport_ankot' => $request->transport_ankot ? $form->transport_ankot : 0,
@@ -373,9 +485,9 @@ class FormMeetingSeminarController extends Controller
     }
 
     $form->update([
-      'approved_at' => now(),
-      'approved_by' => auth()->user()->id,
-      'status' => 'Approved',
+      'final_approved_at' => now(),
+      'final_approved_by' => auth()->user()->id,
+      'status' => 'Closed',
       'approved_allowance' => $approved_data['allowance'],
       'approved_transport_ankot' => $approved_data['transport_ankot'],
       'approved_hotel' => $approved_data['hotel'],
@@ -406,67 +518,9 @@ class FormMeetingSeminarController extends Controller
     $recipients = array_unique($recipients);
     $phoneNumbers = array_unique($phoneNumbers);
 
-    // Send bulk WhatsApp message
-    $url = route('forms.meeting.view', $form->id);
-    WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
-
-    // Send bulk email
-    Mail::to($recipients)->send(new ExpenseApproved(
-      $name,
-      $expense_number,
-      $tanggal,
-      $total,
-      $url
-    ));
-
-    AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Meeting Seminar (' . $form->expense_number . ')');
-    session()->flash('success', 'Form has been approved.');
-    return redirect()->back();
-  }
-
-  public function finalApprove($id)
-  {
-    $this->checkAuthorization(auth()->user(), ['final_approval.approve']);
-
-    $form = FormMeetingSeminar::findOrfail($id);
-    if($form->approved_at == null) {
-      session()->flash('error', 'Form must be approved by MIS first.');
-      return redirect()->back();
-    }
-
-    $form->update([
-      'final_approved_at' => now(),
-      'final_approved_by' => auth()->user()->id,
-      'status' => 'Closed'
-    ]);
-
-    $heads = $form->user->getCabangAndRegionHead();
-    $name = $form->user->name;
-    $expense_number = $form->expense_number;
-    $tanggal = $form->created_at;
-    $total = $form->approved_total;
-
-    // Collect all recipients
-    $recipients = [$form->user->email, auth()->user()->email];
-    $phoneNumbers = [$form->user->phone, auth()->user()->phone];
-
-    if ($heads['cabang_head']) {
-      $recipients[] = $heads['cabang_head']['email'];
-      $phoneNumbers[] = $heads['cabang_head']['phone'];
-    }
-
-    if ($heads['region_head']) {
-      $recipients[] = $heads['region_head']['email'];
-      $phoneNumbers[] = $heads['region_head']['phone'];
-    }
-
-    // Remove duplicate email addresses, if any
-    $recipients = array_unique($recipients);
-    $phoneNumbers = array_unique($phoneNumbers);
-
     // send whatsapp message
     $url = route('forms.meeting.view', $form->id);
-    WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url);
+    WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
 
     // Send bulk email
     Mail::to($recipients)->send(new FinalApprove(
@@ -482,25 +536,9 @@ class FormMeetingSeminarController extends Controller
     return redirect()->back();
   }
 
-  public function open($id)
-  {
-    $this->checkAuthorization(auth()->user(), ['final_approval.open']);
-
-    $form = FormMeetingSeminar::findOrfail($id);
-    $form->update([
-      'final_approved_at' => null,
-      'final_approved_by' => null,
-      'status' => 'Approved'
-    ]);
-
-    AuditTrailHelper::AddAuditTrail('Open', 'Open Expense at Form Meeting Seminar (' . $form->expense_number . ')');
-    session()->flash('success', 'Form has been opened.');
-    return redirect()->back();
-  }
-
   public function reject($id)
   {
-    $this->checkAuthorization(auth()->user(), ['approval.approve']);
+    $this->checkAuthorization(auth()->user(), ['approval.reject']);
 
     $form = FormMeetingSeminar::findOrfail($id);
     $form->update([
@@ -531,9 +569,9 @@ class FormMeetingSeminarController extends Controller
     $recipients = array_unique($recipients);
     $phoneNumbers = array_unique($phoneNumbers);
 
-    // Send bulk WhatsApp message
+    // send whatsapp message
     $url = route('forms.meeting.view', $form->id);
-    WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url);
+    WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
 
     // Send bulk email
     Mail::to($recipients)->send(new ExpenseRejected(
@@ -549,6 +587,22 @@ class FormMeetingSeminarController extends Controller
     return redirect()->back();
   }
 
+  public function open($id)
+  {
+    $this->checkAuthorization(auth()->user(), ['final_approval.open']);
+
+    $form = FormMeetingSeminar::findOrfail($id);
+    $form->update([
+      'final_approved_at' => null,
+      'final_approved_by' => null,
+      'status' => 'Approved'
+    ]);
+
+    AuditTrailHelper::AddAuditTrail('Open', 'Open Expense at Form Meeting Seminar (' . $form->expense_number . ')');
+    session()->flash('success', 'Form has been opened.');
+    return redirect()->back();
+  }
+
 	public function destroy($id)
 	{
     $this->checkAuthorization(auth()->user(), ['forms.meeting.delete']);