added url to whatsapp notif, email soon

app/Helpers/WhatsappHelper.php

@@ -8,15 +8,20 @@ use Illuminate\Support\Str;
 
 class WhatsappHelper
 {
-    public static function approveExpense($phones, $expense_number)
+    public static function approveExpense($phones, $expense_number, $url = null)
     {
         $client = new Client();
 
+        // Ensure the URL is formatted correctly
+        if ($url && !preg_match('/^https?:\/\//', $url)) {
+            $url = 'https://' . $url;
+        }
+
         $data = [];
         foreach ($phones as $phone) {
             $data[] = [
                 'phone' => $phone,
-				'message' => 'Pengajuan pengeluaran anda dengan nomor *' . $expense_number . '* telah disetujui. Silahkan buka website untuk melihat detailnya.',
+                'message' => 'Pengajuan pengeluaran anda dengan nomor *' . $expense_number . '* telah disetujui. Silahkan buka link berikut untuk melihat detailnya: ' . $url,
                 'source' => 'web'
             ];
         }
@@ -34,15 +39,19 @@ class WhatsappHelper
         return $response->getBody()->getContents();
     }
 
-	public static function rejectExpense($phones, $expense_number)
+    public static function rejectExpense($phones, $expense_number, $url = null)
     {
         $client = new Client();
 
+        if ($url && !preg_match('/^https?:\/\//', $url)) {
+            $url = 'https://' . $url;
+        }
+
         $data = [];
         foreach ($phones as $phone) {
             $data[] = [
                 'phone' => $phone,
-				'message' => 'Pengajuan pengeluaran anda dengan nomor *' . $expense_number . '* telah ditolak. Silahkan buka website untuk melihat detailnya.',
+                'message' => 'Pengajuan pengeluaran anda dengan nomor *' . $expense_number . '* telah ditolak. Silahkan buka link berikut untuk melihat detailnya: ' . $url,
                 'source' => 'web'
             ];
         }
@@ -60,15 +69,19 @@ class WhatsappHelper
         return $response->getBody()->getContents();
     }
 
-	public static function finalApprove($phones, $expense_number)
+    public static function finalApprove($phones, $expense_number, $url = null)
     {
         $client = new Client();
 
+        if ($url && !preg_match('/^https?:\/\//', $url)) {
+            $url = 'https://' . $url;
+        }
+
         $data = [];
         foreach ($phones as $phone) {
             $data[] = [
                 'phone' => $phone,
-				'message' => 'Pengajuan pengeluaran anda dengan nomor *' . $expense_number . '* telah ditutup karena telah selesai diproses. Silahkan buka website untuk melihat detailnya.',
+                'message' => 'Pengajuan pengeluaran anda dengan nomor *' . $expense_number . '* telah ditutup karena telah selesai diproses. Silahkan buka link berikut untuk melihat detailnya: ' . $url,
                 'source' => 'web'
             ];
         }

app/Http/Controllers/Forms/FormMeetingSeminarController.php

@@ -343,7 +343,8 @@ class FormMeetingSeminarController extends Controller
     // ));
 
     // Send bulk WhatsApp message
-    WhatsappHelper::approveExpense($phoneNumbers, $expense_number);
+    $url = route('forms.meeting.view', $form->id);
+    WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
 
     AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Meeting Seminar (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been approved.');
@@ -399,7 +400,8 @@ class FormMeetingSeminarController extends Controller
     // ));
 
     // send whatsapp message
-    WhatsappHelper::finalApprove($phoneNumbers, $expense_number);
+    $url = route('forms.meeting.view', $form->id);
+    WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url);
 
     AuditTrailHelper::AddAuditTrail('Final Approve', 'Final Approve Expense at Form Meeting Seminar (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been final approved.');
@@ -464,7 +466,8 @@ class FormMeetingSeminarController extends Controller
     // ));
 
     // Send bulk WhatsApp message
-    WhatsappHelper::rejectExpense($phoneNumbers, $expense_number);
+    $url = route('forms.meeting.view', $form->id);
+    WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url);
 
     AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Meeting Seminar (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been rejected.');

app/Http/Controllers/Forms/FormUpCountryController.php

@@ -401,7 +401,8 @@ class FormUpCountryController extends Controller
     // ));
 
     // send whatsapp message
-    WhatsappHelper::approveExpense($phoneNumbers, $expense_number);
+    $url = route('forms.up-country.view', $form->id);
+    WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
 
     AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been approved.');
@@ -450,7 +451,8 @@ class FormUpCountryController extends Controller
     // ));
 
     // send whatsapp message
-    WhatsappHelper::rejectExpense($phoneNumbers, $expense_number);
+    $url = route('forms.up-country.view', $form->id);
+    WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url);
 
     AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been rejected.');
@@ -506,7 +508,8 @@ class FormUpCountryController extends Controller
     // ));
 
     // send whatsapp message
-    WhatsappHelper::finalApprove($phoneNumbers, $expense_number);
+    $url = route('forms.up-country.view', $form->id);
+    WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url);
 
     AuditTrailHelper::AddAuditTrail('Final Approve', 'Final Approve Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been final approved.');