itdept/expense
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added notifications

Browse Source
This commit is contained in:
Jagad R R
2025-01-17 16:17:53 +07:00
parent 47eb2950ef
commit f4a8972a1d
13 changed files with 344 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+16 -1
View File
@@ -25,6 +25,7 @@ use App\Helpers\AuditTrailHelper;
use App\Models\Admin;
use App\Rules\FileType;
use App\Helpers\BudgetHelper;
use App\Helpers\NotificationHelper;
class FormEntertainmentPresentationController extends Controller
{
@@ -175,6 +176,7 @@ class FormEntertainmentPresentationController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
// Collect all recipients (emails and phone numbers) for the specified roles
foreach ($roles as $role) {
@@ -192,12 +194,14 @@ class FormEntertainmentPresentationController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate email addresses, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// Generate URL and send WhatsApp notification
$url = route('forms.entertainment.view', $form->id);
@@ -212,6 +216,8 @@ class FormEntertainmentPresentationController extends Controller
$url
));
NotificationHelper::newExpense($form->user_id, $expense_number, $receiver_ids);
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Entertainment Presentation (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
@@ -312,6 +318,7 @@ class FormEntertainmentPresentationController extends Controller
// Collect all recipients
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang'];
$receiver_ids = [];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
@@ -331,12 +338,14 @@ class FormEntertainmentPresentationController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate data, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// send whatsapp message
$url = route('forms.entertainment.view', $form->id);
@@ -351,6 +360,8 @@ class FormEntertainmentPresentationController extends Controller
$url
));
NotificationHelper::approveExpense($form->user_id, $expense_number, $receiver_ids);
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Entertainment (' . $form->expense_number . ')');
session()->flash('success', 'Form has been approved.');
return redirect()->back();
@@ -367,13 +378,13 @@ class FormEntertainmentPresentationController extends Controller
'status' => 'Approved 2',
]);
$heads = $form->user->getCabangAndRegionHead();
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->created_at;
$total = $form->total;
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang', 'Marketing Operational Manager Region'];
$receiver_ids = [];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
@@ -394,12 +405,14 @@ class FormEntertainmentPresentationController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate data, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// send whatsapp message
$url = route('forms.entertainment.view', $form->id);
@@ -414,6 +427,8 @@ class FormEntertainmentPresentationController extends Controller
$url
));
NotificationHelper::approve2Expense($form->user_id, $expense_number, $receiver_ids);
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Entertainment (' . $form->expense_number . ')');
session()->flash('success', 'Form has been approved.');
return redirect()->back();
app/Http/Controllers/Forms/FormMeetingSeminarController.php
+17
View File
@@ -25,6 +25,7 @@ use App\Helpers\AuditTrailHelper;
use App\Rules\FileType;
use App\Models\Admin;
use App\Helpers\BudgetHelper;
use App\Helpers\NotificationHelper;
class FormMeetingSeminarController extends Controller
{
@@ -213,6 +214,7 @@ class FormMeetingSeminarController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
// Collect all recipients (emails and phone numbers) for the specified roles
foreach ($roles as $role) {
@@ -230,11 +232,14 @@ class FormMeetingSeminarController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate email addresses, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// Generate URL and send WhatsApp notification
$url = route('forms.meeting.view', $form->id);
@@ -249,6 +254,8 @@ class FormMeetingSeminarController extends Controller
$url
));
NotificationHelper::newExpense($form->user_id, $expense_number, $receiver_ids);
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Meeting Seminar (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
@@ -385,6 +392,7 @@ class FormMeetingSeminarController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
$cabang_id = UserHasCabang::where('user_id', $form->user_id)->first()->cabang_id;
foreach ($roles as $role) {
@@ -402,12 +410,14 @@ class FormMeetingSeminarController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate data, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// send whatsapp message
$url = route('forms.meeting.view', $form->id);
@@ -422,6 +432,8 @@ class FormMeetingSeminarController extends Controller
$url
));
NotificationHelper::approveExpense($form->user_id, $expense_number, $receiver_ids);
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Meeting Seminar (' . $form->expense_number . ')');
session()->flash('success', 'Form has been approved.');
return redirect()->back();
@@ -446,6 +458,7 @@ class FormMeetingSeminarController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
$cabang_id = UserHasCabang::where('user_id', $form->user_id)->first()->cabang_id;
@@ -464,12 +477,14 @@ class FormMeetingSeminarController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate data, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// send whatsapp message
$url = route('forms.meeting.view', $form->id);
@@ -484,6 +499,8 @@ class FormMeetingSeminarController extends Controller
$url
));
NotificationHelper::approve2Expense($form->user_id, $expense_number, $receiver_ids);
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Meeting Seminar (' . $form->expense_number . ')');
session()->flash('success', 'Form has been approved.');
return redirect()->back();
app/Http/Controllers/Forms/FormOtherController.php
+17 -5
View File
@@ -5,11 +5,7 @@ namespace App\Http\Controllers\Forms;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Models\FormOthers;
use App\Models\Rayon;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage;
use App\Models\Region;
use App\Models\Cabang;
use App\Models\UserHasCabang;
use App\Models\Kategori;
use Illuminate\Support\Str;
@@ -25,6 +21,7 @@ use App\Helpers\AuditTrailHelper;
use App\Rules\FileType;
use App\Models\Admin;
use App\Helpers\BudgetHelper;
use App\Helpers\NotificationHelper;
class FormOtherController extends Controller
{
@@ -173,6 +170,7 @@ class FormOtherController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
// Collect all recipients (emails and phone numbers) for the specified roles
foreach ($roles as $role) {
@@ -190,12 +188,14 @@ class FormOtherController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate email addresses, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// Generate URL and send WhatsApp notification
$url = route('forms.other.view', $form->id);
@@ -210,6 +210,9 @@ class FormOtherController extends Controller
$url
));
// Send notification to the user
NotificationHelper::newExpense($form->user_id, $expense_number, $receiver_ids);
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Other (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
@@ -298,7 +301,6 @@ class FormOtherController extends Controller
'status' => 'Approved 1',
]);
$heads = $form->user->getCabangAndRegionHead();
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->created_at;
@@ -308,6 +310,7 @@ class FormOtherController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
$cabang_id = UserHasCabang::where('user_id', $form->user_id)->first()->cabang_id;
foreach ($roles as $role) {
@@ -325,12 +328,14 @@ class FormOtherController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate data, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// send whatsapp message
$url = route('forms.other.view', $form->id);
@@ -345,6 +350,8 @@ class FormOtherController extends Controller
$url
));
NotificationHelper::approveExpense($form->user_id, $expense_number, $receiver_ids);
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Other (' . $form->expense_number . ')');
session()->flash('success', 'Form has been approved.');
return redirect()->back();
@@ -369,6 +376,7 @@ class FormOtherController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
$cabang_id = UserHasCabang::where('user_id', $form->user_id)->first()->cabang_id;
@@ -387,12 +395,14 @@ class FormOtherController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate data, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// send whatsapp message
$url = route('forms.other.view', $form->id);
@@ -407,6 +417,8 @@ class FormOtherController extends Controller
$url
));
NotificationHelper::approve2Expense($form->user_id, $expense_number, $receiver_ids);
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Other (' . $form->expense_number . ')');
session()->flash('success', 'Form has been approved.');
return redirect()->back();
app/Http/Controllers/Forms/FormUpCountryController.php
+15
View File
@@ -25,6 +25,7 @@ use App\Helpers\NextCloudHelper;
use App\Rules\FileType;
use App\Models\Admin;
use App\Helpers\BudgetHelper;
use App\Helpers\NotificationHelper;
class FormUpCountryController extends Controller
{
@@ -240,6 +241,7 @@ class FormUpCountryController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
$name = auth()->user()->name;
$tanggal = $form->tanggal;
@@ -261,12 +263,14 @@ class FormUpCountryController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate email addresses, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// Generate URL and send WhatsApp notification
$url = route('forms.up-country.view', $form->id);
@@ -281,6 +285,8 @@ class FormUpCountryController extends Controller
$url
));
NotificationHelper::newExpense($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.');
return redirect()->back();
@@ -443,6 +449,7 @@ class FormUpCountryController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
$cabang_id = UserHasCabang::where('user_id', $form->user_id)->first()->cabang_id;
foreach ($roles as $role) {
@@ -460,12 +467,14 @@ class FormUpCountryController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate data, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// send whatsapp message
$url = route('forms.up-country.view', $form->id);
@@ -480,6 +489,8 @@ class FormUpCountryController extends Controller
$url
));
NotificationHelper::approveExpense($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();
@@ -504,6 +515,7 @@ class FormUpCountryController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
$cabang_id = UserHasCabang::where('user_id', $form->user_id)->first()->cabang_id;
@@ -522,6 +534,7 @@ class FormUpCountryController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
@@ -542,6 +555,8 @@ class FormUpCountryController extends Controller
$url
));
NotificationHelper::approve2Expense($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();
app/Http/Controllers/Forms/FormVehicleController.php
+16
View File
@@ -25,6 +25,7 @@ use App\Helpers\AuditTrailHelper;
use App\Rules\FileType;
use App\Models\Admin;
use App\Helpers\BudgetHelper;
use App\Helpers\NotificationHelper;
class FormVehicleController extends Controller
{
@@ -177,6 +178,7 @@ class FormVehicleController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
// Collect all recipients (emails and phone numbers) for the specified roles
foreach ($roles as $role) {
@@ -194,12 +196,14 @@ class FormVehicleController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate email addresses, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// Generate URL and send WhatsApp notification
$url = route('forms.vehicle.view', $form->id);
@@ -214,6 +218,8 @@ class FormVehicleController extends Controller
$url
));
NotificationHelper::newExpense($form->user_id, $expense_number, $receiver_ids);
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Vehicle Running Cost (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
@@ -317,6 +323,7 @@ class FormVehicleController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
$cabang_id = UserHasCabang::where('user_id', $form->user_id)->first()->cabang_id;
foreach ($roles as $role) {
@@ -334,12 +341,14 @@ class FormVehicleController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate data, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// send whatsapp message
$url = route('forms.vehicle.view', $form->id);
@@ -354,6 +363,8 @@ class FormVehicleController extends Controller
$url
));
NotificationHelper::approveExpense($form->user_id, $expense_number, $receiver_ids);
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Vehicle Running Cost (' . $form->expense_number . ')');
session()->flash('success', 'Form has been approved.');
return redirect()->back();
@@ -378,6 +389,7 @@ class FormVehicleController extends Controller
$roles = ['Marketing Information System', 'Admin Region', 'Area Manager Cabang', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
$phoneNumbers = [$form->user->phone, auth()->user()->phone];
$receiver_ids = [];
$cabang_id = UserHasCabang::where('user_id', $form->user_id)->first()->cabang_id;
@@ -396,12 +408,14 @@ class FormVehicleController extends Controller
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
$receiver_ids[] = $user->id;
}
}
// Remove duplicate data, if any
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
$receiver_ids = array_unique($receiver_ids);
// send whatsapp message
$url = route('forms.vehicle.view', $form->id);
@@ -416,6 +430,8 @@ class FormVehicleController extends Controller
$url
));
NotificationHelper::approve2Expense($form->user_id, $expense_number, $receiver_ids);
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Vehicle Running Cost (' . $form->expense_number . ')');
session()->flash('success', 'Form has been approved.');
return redirect()->back();