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

add notif expense created

Browse Source
This commit is contained in:
Jagad R R
2025-01-09 13:22:56 +07:00
parent 664ff183cd
commit ace9ea2c9c
20 changed files with 822 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Helpers/WhatsappHelper.php
+30
View File
@@ -98,4 +98,34 @@ class WhatsappHelper
return $response->getBody()->getContents();
}
public static function newExpense($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 baru dengan nomor *' . $expense_number . '* telah dibuat. Silahkan buka link berikut untuk melihat detailnya: ' . $url,
'source' => 'web'
];
}
$response = $client->post(env('WABLAS_HOST') . '/api/v2/send-message', [
'headers' => [
'Authorization' => env('WABLAS_TOKEN'),
'Content-Type' => 'application/json'
],
'json' => [
'data' => $data
]
]);
return $response->getBody()->getContents();
}
}
app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+66 -29
View File
@@ -18,8 +18,10 @@ use Illuminate\Support\Facades\Mail;
use App\Mail\ExpenseApproved;
use App\Mail\ExpenseRejected;
use App\Mail\FinalApprove;
use App\Mail\ExpenseCreated;
use App\Helpers\WhatsappHelper;
use App\Helpers\AuditTrailHelper;
use App\Models\Admin;
use App\Rules\FileType;
class FormEntertainmentPresentationController extends Controller
@@ -127,7 +129,6 @@ class FormEntertainmentPresentationController extends Controller
$bukti_total->getContent(),
$filename
);
}
// Generate sequence number and expense number
@@ -136,7 +137,7 @@ class FormEntertainmentPresentationController extends Controller
$expense_number = $region->code . '-' . $cabang->code . '-ETY-' . date('ym') . $formatted_sequence_number;
// Save the form data
FormEntertaimentPresentation::create([
$form = FormEntertaimentPresentation::create([
'expense_number' => $expense_number,
'user_id' => auth()->user()->id,
'tanggal' => $request->tanggal,
@@ -151,6 +152,40 @@ class FormEntertainmentPresentationController extends Controller
'status' => 'On Progress',
]);
// Send notification to MIS and Admin Region
$roles = ['Marketing Information System', 'Admin Region'];
$recipients = [];
$phoneNumbers = [];
$name = auth()->user()->name;
$tanggal = $form->tanggal;
$total = $form->total;
// Collect all recipients (emails and phone numbers) for the specified roles
foreach ($roles as $role) {
$users = Admin::getUserByRoleName($role);
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
}
}
// Remove duplicate email addresses, if any
$recipients = array_unique($recipients);
// Generate URL and send WhatsApp notification
$url = route('forms.entertainment.view', $form->id);
WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url);
// Send bulk email
Mail::to($recipients)->send(new ExpenseCreated(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Entertainment Presentation (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
@@ -212,7 +247,6 @@ class FormEntertainmentPresentationController extends Controller
$bukti_total->getContent(),
$filename
);
}
// Save the form data
@@ -253,7 +287,7 @@ class FormEntertainmentPresentationController extends Controller
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->tanggal;
$total = $form->total;
$total = $form->approved_total;
// Collect all recipients
$recipients = [$form->user->email, auth()->user()->email];
@@ -273,18 +307,19 @@ class FormEntertainmentPresentationController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new ExpenseApproved(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// Send bulk whatsapp
$url = route('forms.entertainment.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', 'Approved Expense at Form Entertainment Presentation (' . $expense_number . ')');
session()->flash('success', 'Form has been approved.');
return redirect()->back();
@@ -310,7 +345,7 @@ class FormEntertainmentPresentationController extends Controller
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->tanggal;
$total = $form->total;
$total = $form->approved_total;
// Collect all recipients
$recipients = [$form->user->email, auth()->user()->email];
@@ -330,18 +365,19 @@ class FormEntertainmentPresentationController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new FinalApprove(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// send whatsapp message
$url = route('forms.entertainment.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
// Send bulk email
Mail::to($recipients)->send(new FinalApprove(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Final Approve', 'Final Approved Expense at Form Entertainment Presentation (' . $expense_number . ')');
session()->flash('success', 'Form has been final approved.');
return redirect()->back();
@@ -396,18 +432,19 @@ class FormEntertainmentPresentationController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new ExpenseRejected(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// Send bulk whatsapp
$url = route('forms.entertainment.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
// Send bulk email
Mail::to($recipients)->send(new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Entertainment Presentation (' . $expense_number . ')');
session()->flash('success', 'Form has been rejected.');
return redirect()->back();
app/Http/Controllers/Forms/FormMeetingSeminarController.php
+66 -27
View File
@@ -17,10 +17,12 @@ use Illuminate\Support\Str;
use Illuminate\Support\Facades\Mail;
use App\Mail\ExpenseApproved;
use App\Mail\ExpenseRejected;
use App\Mail\ExpenseCreated;
use App\Mail\FinalApprove;
use App\Helpers\WhatsappHelper;
use App\Helpers\AuditTrailHelper;
use App\Rules\FileType;
use App\Models\Admin;
class FormMeetingSeminarController extends Controller
{
@@ -168,7 +170,7 @@ class FormMeetingSeminarController extends Controller
];
// Save the form data
FormMeetingSeminar::create([
$form = FormMeetingSeminar::create([
'expense_number' => $expense_number,
'user_id' => auth()->user()->id,
'allowance' => $data_nominal['allowance'],
@@ -182,6 +184,40 @@ class FormMeetingSeminarController extends Controller
'status' => 'On Progress',
]);
// Send notification to MIS and Admin Region
$roles = ['Marketing Information System', 'Admin Region'];
$recipients = [];
$phoneNumbers = [];
$name = auth()->user()->name;
$tanggal = $form->created_at;
$total = $form->total;
// Collect all recipients (emails and phone numbers) for the specified roles
foreach ($roles as $role) {
$users = Admin::getUserByRoleName($role);
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
}
}
// Remove duplicate email addresses, if any
$recipients = array_unique($recipients);
// Generate URL and send WhatsApp notification
$url = route('forms.meeting.view', $form->id);
WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url);
// Send bulk email
Mail::to($recipients)->send(new ExpenseCreated(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Meeting Seminar (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
@@ -316,7 +352,7 @@ class FormMeetingSeminarController extends Controller
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->created_at;
$total = $form->total;
$total = $form->approved_total;
// Collect all recipients
$recipients = [$form->user->email, auth()->user()->email];
@@ -336,18 +372,19 @@ class FormMeetingSeminarController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new ExpenseApproved(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// 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();
@@ -373,7 +410,7 @@ class FormMeetingSeminarController extends Controller
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->created_at;
$total = $form->total;
$total = $form->approved_total;
// Collect all recipients
$recipients = [$form->user->email, auth()->user()->email];
@@ -393,18 +430,19 @@ class FormMeetingSeminarController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new FinalApprove(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// send whatsapp message
$url = route('forms.meeting.view', $form->id);
WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url);
// Send bulk email
Mail::to($recipients)->send(new FinalApprove(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Final Approve', 'Final Approve Expense at Form Meeting Seminar (' . $form->expense_number . ')');
session()->flash('success', 'Form has been final approved.');
return redirect()->back();
@@ -459,18 +497,19 @@ class FormMeetingSeminarController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new ExpenseRejected(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// Send bulk WhatsApp message
$url = route('forms.meeting.view', $form->id);
WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url);
// Send bulk email
Mail::to($recipients)->send(new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Meeting Seminar (' . $form->expense_number . ')');
session()->flash('success', 'Form has been rejected.');
return redirect()->back();
app/Http/Controllers/Forms/FormOtherController.php
+73 -34
View File
@@ -18,9 +18,11 @@ use Illuminate\Support\Facades\Mail;
use App\Mail\ExpenseApproved;
use App\Mail\ExpenseRejected;
use App\Mail\FinalApprove;
use App\Mail\ExpenseCreated;
use App\Helpers\WhatsappHelper;
use App\Helpers\AuditTrailHelper;
use App\Rules\FileType;
use App\Models\Admin;
class FormOtherController extends Controller
{
@@ -135,7 +137,7 @@ class FormOtherController extends Controller
$expense_number = $region->code . '-' . $cabang->code . '-OTH-' . date('ym') . $formatted_sequence_number;
// Save the form data
FormOthers::create([
$form = FormOthers::create([
'expense_number' => $expense_number,
'user_id' => auth()->user()->id,
'kategori_id' => $request->kategori_id,
@@ -147,7 +149,41 @@ class FormOtherController extends Controller
'status' => 'On Progress',
]);
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Entertainment Presentation (' . $expense_number . ')');
// Send notification to MIS and Admin Region
$roles = ['Marketing Information System', 'Admin Region'];
$recipients = [];
$phoneNumbers = [];
$name = auth()->user()->name;
$tanggal = $request->tanggal;
$total = $request->total;
// Collect all recipients (emails and phone numbers) for the specified roles
foreach ($roles as $role) {
$users = Admin::getUserByRoleName($role);
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
}
}
// Remove duplicate email addresses, if any
$recipients = array_unique($recipients);
// Generate URL and send WhatsApp notification
$url = route('forms.other.view', $form->id);
WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url);
// Send bulk email
Mail::to($recipients)->send(new ExpenseCreated(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Other (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
}
@@ -218,7 +254,7 @@ class FormOtherController extends Controller
'account_number' => $kategori->account_number,
]);
AuditTrailHelper::AddAuditTrail('Update', 'Update Record at Form Entertainment Presentation (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Update', 'Update Record at Form Other (' . $form->expense_number . ')');
session()->flash('success', 'Form has been updated.');
return redirect()->back();
}
@@ -244,7 +280,7 @@ class FormOtherController extends Controller
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->tanggal;
$total = $form->total;
$total = $form->approved_total;
// Collect all recipients
$recipients = [$form->user->email, auth()->user()->email];
@@ -264,19 +300,20 @@ class FormOtherController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new ExpenseApproved(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// Send bulk WhatsApp message
$url = route('forms.other.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
// Send bulk email
Mail::to($recipients)->send(new ExpenseApproved(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Other (' . $form->expense_number . ')');
session()->flash('success', 'Form has been approved.');
return redirect()->back();
}
@@ -301,7 +338,7 @@ class FormOtherController extends Controller
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->tanggal;
$total = $form->total;
$total = $form->approved_total;
// Collect all recipients
$recipients = [$form->user->email, auth()->user()->email];
@@ -321,19 +358,20 @@ class FormOtherController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new FinalApprove(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// send whatsapp message
$url = route('forms.other.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
AuditTrailHelper::AddAuditTrail('Final Approve', 'Final Approve Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
// Send bulk email
Mail::to($recipients)->send(new FinalApprove(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Final Approve', 'Final Approve Expense at Form Other (' . $form->expense_number . ')');
session()->flash('success', 'Form has been final approved.');
return redirect()->back();
}
@@ -349,7 +387,7 @@ class FormOtherController extends Controller
'status' => 'Approved'
]);
AuditTrailHelper::AddAuditTrail('Open', 'Open Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Open', 'Open Expense at Form Other (' . $form->expense_number . ')');
session()->flash('success', 'Form has been opened.');
return redirect()->back();
}
@@ -387,19 +425,20 @@ class FormOtherController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new ExpenseRejected(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// Send bulk WhatsApp message
$url = route('forms.other.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
// Send bulk email
Mail::to($recipients)->send(new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Other (' . $form->expense_number . ')');
session()->flash('success', 'Form has been rejected.');
return redirect()->back();
}
@@ -415,7 +454,7 @@ class FormOtherController extends Controller
return redirect()->back();
}
AuditTrailHelper::AddAuditTrail('Delete', 'Delete Record at Form Entertainment Presentation (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Delete', 'Delete Record at Form Other (' . $form->expense_number . ')');
$form->delete();
app/Http/Controllers/Forms/FormUpCountryController.php
+73 -34
View File
@@ -17,10 +17,12 @@ use Illuminate\Support\Facades\Mail;
use App\Mail\ExpenseApproved;
use App\Mail\ExpenseRejected;
use App\Mail\FinalApprove;
use App\Mail\ExpenseCreated;
use App\Helpers\WhatsappHelper;
use App\Helpers\AuditTrailHelper;
use App\Helpers\NextCloudHelper;
use App\Rules\FileType;
use App\Models\Admin;
class FormUpCountryController extends Controller
{
@@ -192,7 +194,7 @@ class FormUpCountryController extends Controller
];
// Save the form data
FormUpCountry::create([
$form = FormUpCountry::create([
'expense_number' => $expense_number,
'user_id' => auth()->user()->id,
'rayon_id' => $request->rayon_id,
@@ -212,7 +214,41 @@ class FormUpCountryController extends Controller
'status' => 'On Progress',
]);
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Entertainment Presentation (' . $expense_number . ')');
// Send notification to MIS and Admin Region
$roles = ['Marketing Information System', 'Admin Region'];
$recipients = [];
$phoneNumbers = [];
$name = auth()->user()->name;
$tanggal = $form->tanggal;
$total = $form->total;
// Collect all recipients (emails and phone numbers) for the specified roles
foreach ($roles as $role) {
$users = Admin::getUserByRoleName($role);
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
}
}
// Remove duplicate email addresses, if any
$recipients = array_unique($recipients);
// Generate URL and send WhatsApp notification
$url = route('forms.up-country.view', $form->id);
WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url);
// Send bulk email
Mail::to($recipients)->send(new ExpenseCreated(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Up Country (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
}
@@ -342,7 +378,7 @@ class FormUpCountryController extends Controller
'account_number' => $kategori->account_number,
]);
AuditTrailHelper::AddAuditTrail('Update', 'Update Record at Form Entertainment Presentation (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Update', 'Update Record at Form Up Country (' . $form->expense_number . ')');
session()->flash('success', 'Form has been updated.');
return redirect()->back();
}
@@ -374,7 +410,7 @@ class FormUpCountryController extends Controller
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->tanggal;
$total = $form->total;
$total = $form->approved_total;
// Collect all recipients
$recipients = [$form->user->email, auth()->user()->email];
@@ -394,19 +430,20 @@ class FormUpCountryController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// // Send bulk email
// Mail::to($recipients)->send(new ExpenseApproved(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// send whatsapp message
$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 . ')');
// // Send bulk email
Mail::to($recipients)->send(new ExpenseApproved(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Up Country (' . $form->expense_number . ')');
session()->flash('success', 'Form has been approved.');
return redirect()->back();
}
@@ -444,19 +481,20 @@ class FormUpCountryController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new ExpenseRejected(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// send whatsapp message
$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 . ')');
// Send bulk email
Mail::to($recipients)->send(new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Up Country (' . $form->expense_number . ')');
session()->flash('success', 'Form has been rejected.');
return redirect()->back();
}
@@ -481,7 +519,7 @@ class FormUpCountryController extends Controller
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->tanggal;
$total = $form->total;
$total = $form->approved_total;
// Collect all recipients
$recipients = [$form->user->email, auth()->user()->email];
@@ -501,19 +539,20 @@ class FormUpCountryController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new FinalApprove(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// send whatsapp message
$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 . ')');
// Send bulk email
Mail::to($recipients)->send(new FinalApprove(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Final Approve', 'Final Approve Expense at Form Up Country (' . $form->expense_number . ')');
session()->flash('success', 'Form has been final approved.');
return redirect()->back();
}
@@ -529,7 +568,7 @@ class FormUpCountryController extends Controller
'status' => 'Approved'
]);
AuditTrailHelper::AddAuditTrail('Open', 'Open Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Open', 'Open Expense at Form Up Country (' . $form->expense_number . ')');
session()->flash('success', 'Form has been opened.');
return redirect()->back();
}
@@ -544,7 +583,7 @@ class FormUpCountryController extends Controller
return redirect()->back();
}
AuditTrailHelper::AddAuditTrail('Delete', 'Delete Record at Form Entertainment Presentation (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Delete', 'Delete Record at Form Up Country (' . $form->expense_number . ')');
$form->delete();
app/Http/Controllers/Forms/FormVehicleController.php
+73 -34
View File
@@ -18,9 +18,11 @@ use Illuminate\Support\Facades\Mail;
use App\Mail\ExpenseApproved;
use App\Mail\ExpenseRejected;
use App\Mail\FinalApprove;
use App\Mail\ExpenseCreated;
use App\Helpers\WhatsappHelper;
use App\Helpers\AuditTrailHelper;
use App\Rules\FileType;
use App\Models\Admin;
class FormVehicleController extends Controller
{
@@ -136,7 +138,7 @@ class FormVehicleController extends Controller
$expense_number = $region->code . '-' . $cabang->code . '-VHC-' . date('ym') . $formatted_sequence_number;
// Save the form data
FormVehicleRunningCost::create([
$form = FormVehicleRunningCost::create([
'expense_number' => $expense_number,
'user_id' => auth()->user()->id,
'tanggal' => $request->tanggal,
@@ -151,7 +153,41 @@ class FormVehicleController extends Controller
'status' => 'On Progress',
]);
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Entertainment Presentation (' . $expense_number . ')');
// Send notification to MIS and Admin Region
$roles = ['Marketing Information System', 'Admin Region'];
$recipients = [];
$phoneNumbers = [];
$name = auth()->user()->name;
$tanggal = $form->tanggal;
$total = $form->total;
// Collect all recipients (emails and phone numbers) for the specified roles
foreach ($roles as $role) {
$users = Admin::getUserByRoleName($role);
foreach ($users as $user) {
$recipients[] = $user->email;
$phoneNumbers[] = $user->phone;
}
}
// Remove duplicate email addresses, if any
$recipients = array_unique($recipients);
// Generate URL and send WhatsApp notification
$url = route('forms.vehicle.view', $form->id);
WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url);
// Send bulk email
Mail::to($recipients)->send(new ExpenseCreated(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Vehicle Running Cost (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
}
@@ -228,7 +264,7 @@ class FormVehicleController extends Controller
'status' => 'On Progress',
]);
AuditTrailHelper::AddAuditTrail('Update', 'Update Record at Form Entertainment Presentation (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Update', 'Update Record at Form Vehicle Running Cost (' . $form->expense_number . ')');
session()->flash('success', 'Form has been updated.');
return redirect()->back();
}
@@ -253,7 +289,7 @@ class FormVehicleController extends Controller
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->tanggal;
$total = $form->total;
$total = $form->approved_total;
// Collect all recipients
$recipients = [$form->user->email, auth()->user()->email];
@@ -273,19 +309,20 @@ class FormVehicleController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new ExpenseApproved(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// Send bulk WhatsApp message
$url = route('forms.vehicle.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
// Send bulk email
Mail::to($recipients)->send(new ExpenseApproved(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Vehicle Running Cost (' . $form->expense_number . ')');
session()->flash('success', 'Form has been approved.');
return redirect()->back();
}
@@ -310,7 +347,7 @@ class FormVehicleController extends Controller
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->tanggal;
$total = $form->total;
$total = $form->approved_total;
// Collect all recipients
$recipients = [$form->user->email, auth()->user()->email];
@@ -330,19 +367,20 @@ class FormVehicleController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new FinalApprove(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// send whatsapp message
$url = route('forms.vehicle.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
AuditTrailHelper::AddAuditTrail('Final Approve', 'Final Approve Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
// Send bulk email
Mail::to($recipients)->send(new FinalApprove(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Final Approve', 'Final Approve Expense at Form Vehicle Running Cost (' . $form->expense_number . ')');
session()->flash('success', 'Form has been final approved.');
return redirect()->back();
}
@@ -358,7 +396,7 @@ class FormVehicleController extends Controller
'status' => 'Approved'
]);
AuditTrailHelper::AddAuditTrail('Open', 'Open Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Open', 'Open Expense at Form Vehicle Running Cost (' . $form->expense_number . ')');
session()->flash('success', 'Form has been opened.');
return redirect()->back();
}
@@ -396,19 +434,20 @@ class FormVehicleController extends Controller
$recipients = array_unique($recipients);
$phoneNumbers = array_unique($phoneNumbers);
// Send bulk email
// Mail::to($recipients)->send(new ExpenseRejected(
// $name,
// $expense_number,
// $tanggal,
// $total
// ));
// Send bulk WhatsApp message
$url = route('forms.vehicle.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
// Send bulk email
Mail::to($recipients)->send(new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url
));
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Vehicle Running Cost (' . $form->expense_number . ')');
session()->flash('success', 'Form has been rejected.');
return redirect()->back();
}
@@ -424,7 +463,7 @@ class FormVehicleController extends Controller
return redirect()->back();
}
AuditTrailHelper::AddAuditTrail('Delete', 'Delete Record at Form Entertainment Presentation (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Delete', 'Delete Record at Form Vehicle Running Cost (' . $form->expense_number . ')');
$form->delete();
app/Mail/ExpenseApproved.php
+2
View File
@@ -21,6 +21,7 @@ class ExpenseApproved extends Mailable
protected string $expense_number,
protected string $tanggal,
protected int $total,
protected string $url,
) {}
/**
@@ -45,6 +46,7 @@ class ExpenseApproved extends Mailable
'expense_number' => $this->expense_number,
'tanggal' => $this->tanggal,
'total' => $this->total,
'url' => $this->url,
],
);
}
app/Mail/ExpenseCreated.php
+63
View File
@@ -0,0 +1,63 @@
<?php
namespace App\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Mail\Mailables\Content;
use Illuminate\Mail\Mailables\Envelope;
use Illuminate\Queue\SerializesModels;
class ExpenseCreated extends Mailable
{
use Queueable, SerializesModels;
/**
* Create a new message instance.
*/
public function __construct(
protected string $name,
protected string $expense_number,
protected string $tanggal,
protected int $total,
protected string $url,
) {}
/**
* Get the message envelope.
*/
public function envelope(): Envelope
{
return new Envelope(
subject: 'Expense Created',
);
}
/**
* Get the message content definition.
*/
public function content(): Content
{
return new Content(
view: 'mail.created',
with: [
'name' => $this->name,
'expense_number' => $this->expense_number,
'tanggal' => $this->tanggal,
'total' => $this->total,
'url' => $this->url,
],
);
}
/**
* Get the attachments for the message.
*
* @return array<int, \Illuminate\Mail\Mailables\Attachment>
*/
public function attachments(): array
{
return [];
}
}
app/Mail/ExpenseRejected.php
+2
View File
@@ -21,6 +21,7 @@ class ExpenseRejected extends Mailable
protected string $expense_number,
protected string $tanggal,
protected int $total,
protected string $url,
) {}
/**
@@ -45,6 +46,7 @@ class ExpenseRejected extends Mailable
'expense_number' => $this->expense_number,
'tanggal' => $this->tanggal,
'total' => $this->total,
'url' => $this->url,
],
);
}
app/Mail/FinalApprove.php
+2
View File
@@ -21,6 +21,7 @@ class FinalApprove extends Mailable
protected string $expense_number,
protected string $tanggal,
protected int $total,
protected string $url,
) {}
/**
@@ -45,6 +46,7 @@ class FinalApprove extends Mailable
'expense_number' => $this->expense_number,
'tanggal' => $this->tanggal,
'total' => $this->total,
'url' => $this->url,
],
);
}