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

Initial commit - expense
Deploy to VPS (PAT over HTTPS) / deploy (push) Has been cancelled
Details

Browse Source
This commit is contained in:
root
2026-06-01 15:01:03 +07:00
parent 9e9fab4a3f
commit 1c1418f3e0
123 changed files with 18622 additions and 10376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+133 -100
View File
@@ -76,7 +76,7 @@ class FormEntertainmentPresentationController extends Controller
$role = auth()->user()->getRoleNames()[0];
$startDay = (int) env('STARTING_DATE', 11);
$closingDay = (int) env('CLOSING_DATE', 10);
$closingDay = (int) env('CLOSING_DATE', 13);
$userRegionData = auth()->user()->getMyCabangAndRegionId();
$regionContextId = $userRegionData['region'] !== '-' ? $userRegionData['region'] : null;
$cabangContextId = $userRegionData['cabang'] !== '-' ? $userRegionData['cabang'] : null;
@@ -182,15 +182,15 @@ class FormEntertainmentPresentationController extends Controller
]);
}
public function create()
{
public function create()
{
$this->checkAuthorization(auth()->user(), ['forms.entertainment.create']);
return view('backend.pages.forms.entertainment.create');
}
return view('backend.pages.forms.entertainment.create');
}
public function store(Request $request)
{
public function store(Request $request)
{
$this->checkAuthorization(auth()->user(), ['forms.entertainment.create']);
$validator = Validator::make($request->all(), [
@@ -201,6 +201,9 @@ class FormEntertainmentPresentationController extends Controller
'name' => 'required|string',
'alamat' => 'required|string',
'nik_or_npwp' => 'required|string',
'jabatan' => 'required|string',
'nama_perusahaan' => 'required|string',
'jenis_usaha' => 'required|string',
'attachments' => 'nullable|array',
'attachments.*.file_category' => 'nullable|string|in:' . implode(',', array_keys($this->attachmentCategories)),
'attachments.*.file_path' => 'nullable|file|max:10240',
@@ -209,24 +212,26 @@ class FormEntertainmentPresentationController extends Controller
$validator->validate();
$tanggal = Carbon::parse($request->tanggal);
// PEMBATASAN INPUT MENGGUNAKAN STARTING_DATE & INPUT_MAX_DATE
$startDay = (int) env('STARTING_DATE', 11);
$closingDay = (int) env('CLOSING_DATE', 10);
$inputMaxDay = (int) env('INPUT_MAX_DATE', 10);
// Ambil tanggal sekarang untuk tentukan periode berjalan
$now = Carbon::now();
if ($now->day >= $startDay) {
// Periode berjalan dari bulan ini sampai bulan depan
$startDate = Carbon::create($now->year, $now->month, $startDay);
$closingDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $closingDay);
// Jendela Aktif: Tgl 11 Bulan Ini s/d Tgl 10 Bulan Depan
$startDate = Carbon::create($now->year, $now->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $inputMaxDay)->endOfDay();
} else {
// Periode berjalan dari bulan lalu sampai bulan ini
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay);
$closingDate = Carbon::create($now->year, $now->month, $closingDay);
// Jendela Aktif: Tgl 11 Bulan Lalu s/d Tgl 10 Bulan Ini
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->year, $now->month, $inputMaxDay)->endOfDay();
}
if ($tanggal->lt($startDate) || $tanggal->gt($closingDate)) {
session()->flash('error', "Gagal, tanggal tidak berada dalam periode input: {$startDate->format('d M')} - {$closingDate->format('d M')}");
if ($tanggal->lt($startDate) || $tanggal->gt($maxInputDate)) {
session()->flash('error', "Gagal, tanggal expense tidak berada dalam batas waktu input yang diizinkan: {$startDate->format('d M Y')} - {$maxInputDate->format('d M Y')}");
return redirect()->back()->withInput();
}
@@ -244,19 +249,19 @@ class FormEntertainmentPresentationController extends Controller
$region = Region::where('id', $cabang->region_id)->first();
$kategori = "";
$kategori = null;
if (strtolower($request->jenis) == 'entertainment' || $request->jenis == 'entertainment') {
$kategori = Kategori::where('name', 'Entertainment')->first();
$kategori = Kategori::where('name', 'LIKE', '%Entertainment%')->first();
} elseif (strtolower($request->jenis) == 'presentation' || $request->jenis == 'presentation') {
$kategori = Kategori::where('name', 'Presentation')->first();
$kategori = Kategori::where('name', 'LIKE', '%Presentation%')->first();
} elseif (strtolower($request->jenis) == 'sponsorship' || $request->jenis == 'sponsorship') {
$kategori = Kategori::where('name', 'Sponsorship')->first();
$kategori = Kategori::where('name', 'LIKE', '%Sponsorship%')->first();
}
$folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/entertainment';
// Generate sequence number and expense number
$sequence_number = FormEntertaimentPresentation::withTrashed()->where('expense_number', 'like', $region->code . '-' . $cabang->code . '-ETY-' . date('ym') . '%')->count() + 1;
$sequence_number = FormEntertaimentPresentation::withTrashed()->where('expense_number', 'like', $region->code . '-' . $cabang->code . '-ETY-' . date('ym') . '%')->count() + 1;
$formatted_sequence_number = str_pad($sequence_number, 4, '0', STR_PAD_LEFT);
$expense_number = $region->code . '-' . $cabang->code . '-ETY-' . date('ym') . $formatted_sequence_number;
@@ -275,6 +280,7 @@ class FormEntertainmentPresentationController extends Controller
$form = FormEntertaimentPresentation::create([
'expense_number' => $expense_number,
'user_id' => auth()->user()->id,
'cabang_id' => $cabang->id, // <--- REPARASI SUNTIK CABANG_ID BARU
'tanggal' => $request->tanggal,
'jenis' => $request->jenis,
'keterangan' => $request->keterangan,
@@ -282,8 +288,12 @@ class FormEntertainmentPresentationController extends Controller
'name' => $request->name,
'alamat' => $request->alamat,
'nik_or_npwp' => $request->nik_or_npwp,
'jabatan' => $request->jabatan,
'nama_perusahaan' => $request->nama_perusahaan,
'jenis_usaha' => $request->jenis_usaha,
'bukti_total' => $primaryAttachmentPath,
'account_number' => $kategori->account_number,
'account_number' => $kategori->account_number ?? null,
'kategori_id' => $kategori->id ?? null,
'status' => 'On Progress',
]);
@@ -388,10 +398,10 @@ class FormEntertainmentPresentationController extends Controller
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Entertainment Presentation (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
}
}
public function edit($id)
{
public function edit($id)
{
$this->checkAuthorization(auth()->user(), ['forms.entertainment.edit']);
$role = auth()->user()->getRoleNames()[0];
@@ -403,39 +413,49 @@ class FormEntertainmentPresentationController extends Controller
$attachments = $this->formatAttachmentCollection($form);
return view('backend.pages.forms.entertainment.edit', [
return view('backend.pages.forms.entertainment.edit', [
'form' => $form,
'attachments' => $attachments,
]);
}
]);
}
public function update(Request $request, $id)
{
public function update(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['forms.entertainment.edit']);
$role = auth()->user()->getRoleNames()[0];
$form = FormEntertaimentPresentation::with('attachments')->findOrFail($id);
$cabang_id = UserHasCabang::where('user_id', $form->user_id)->first()?->cabang_id;
$cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()?->cabang;
if (!$cabang_id) {
if (!$cabang) {
return redirect()->back()->with('error', 'Cabang tidak ditemukan.');
}
// Hitung periode berdasarkan tanggal form
$tanggal = Carbon::parse($request->tanggal);
// PEMBATASAN INPUT MENGGUNAKAN STARTING_DATE & INPUT_MAX_DATE (Konsisten dengan fungsi Store)
$startDay = (int) env('STARTING_DATE', 11);
$closingDay = (int) env('CLOSING_DATE', 10);
$inputMaxDay = (int) env('INPUT_MAX_DATE', 10);
$now = Carbon::now();
// Periode aktif berdasarkan tanggal input
if ($tanggal->day >= $startDay) {
$periodeDate = Carbon::create($tanggal->year, $tanggal->month, $startDay);
if ($now->day >= $startDay) {
$startDate = Carbon::create($now->year, $now->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $inputMaxDay)->endOfDay();
} else {
$periodeDate = Carbon::create($tanggal->copy()->subMonth()->year, $tanggal->copy()->subMonth()->month, $startDay);
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->year, $now->month, $inputMaxDay)->endOfDay();
}
$periodeMonth = strtolower($periodeDate->format('F'));
$periodeYear = (int) $periodeDate->format('Y');
if ($tanggal->lt($startDate) || $tanggal->gt($maxInputDate)) {
session()->flash('error', "Gagal, tanggal expense tidak berada dalam batas waktu input yang diizinkan: {$startDate->format('d M Y')} - {$maxInputDate->format('d M Y')}");
return redirect()->back()->withInput();
}
$availableBudget = BudgetHelper::getAvailableBudget($cabang_id, $periodeMonth, $periodeYear);
// Hitung periode berdasarkan tanggal form untuk validasi budget
$periodeMonth = strtolower($startDate->format('F'));
$periodeYear = (int) $startDate->format('Y');
$availableBudget = BudgetHelper::getAvailableBudget($cabang->id, $periodeMonth, $periodeYear);
$validator = Validator::make($request->all(), [
'tanggal' => 'required|date',
@@ -445,6 +465,9 @@ class FormEntertainmentPresentationController extends Controller
'name' => 'required|string',
'alamat' => 'required|string',
'nik_or_npwp' => 'required|string',
'jabatan' => 'required|string',
'nama_perusahaan' => 'required|string',
'jenis_usaha' => 'required|string',
'attachments' => 'nullable|array',
'attachments.*.file_category' => 'nullable|string|in:' . implode(',', array_keys($this->attachmentCategories)),
'attachments.*.file_path' => 'nullable|file|max:10240',
@@ -457,16 +480,15 @@ class FormEntertainmentPresentationController extends Controller
return redirect()->back();
}
$cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()->cabang;
$region = Region::where('id', $cabang->region_id)->first();
$kategori = "";
$kategori = null;
if (strtolower($request->jenis) == 'entertainment' || $request->jenis == 'entertainment') {
$kategori = Kategori::where('name', 'Entertainment')->first();
$kategori = Kategori::where('name', 'LIKE', '%Entertainment%')->first();
} elseif (strtolower($request->jenis) == 'presentation' || $request->jenis == 'presentation') {
$kategori = Kategori::where('name', 'Presentation')->first();
$kategori = Kategori::where('name', 'LIKE', '%Presentation%')->first();
} elseif (strtolower($request->jenis) == 'sponsorship' || $request->jenis == 'sponsorship') {
$kategori = Kategori::where('name', 'Sponsorship')->first();
$kategori = Kategori::where('name', 'LIKE', '%Sponsorship%')->first();
}
$folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/entertainment';
@@ -479,6 +501,7 @@ class FormEntertainmentPresentationController extends Controller
: $form->bukti_total;
$form->update([
'cabang_id' => $cabang->id, // <--- REPARASI SUNTIK CABANG_ID TERBARU
'tanggal' => $request->tanggal,
'jenis' => $request->jenis,
'keterangan' => $request->keterangan,
@@ -486,8 +509,12 @@ class FormEntertainmentPresentationController extends Controller
'name' => $request->name,
'alamat' => $request->alamat,
'nik_or_npwp' => $request->nik_or_npwp,
'jabatan' => $request->jabatan,
'nama_perusahaan' => $request->nama_perusahaan,
'jenis_usaha' => $request->jenis_usaha,
'bukti_total' => $primaryAttachmentPath,
'account_number' => $kategori->account_number,
'account_number' => $kategori->account_number ?? $form->account_number,
'kategori_id' => $kategori->id ?? null,
]);
if (!empty($attachmentsPayload)) {
@@ -518,7 +545,7 @@ class FormEntertainmentPresentationController extends Controller
AuditTrailHelper::AddAuditTrail('Update', 'Update Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
session()->flash('success', 'Form has been updated.');
return redirect()->back();
}
}
public function deleteAttachment(Request $request, $formId, $attachmentId)
{
@@ -731,7 +758,8 @@ class FormEntertainmentPresentationController extends Controller
return redirect()->back();
}
public function finalApprove($id)
// <--- REPARASI SUNTIKAN REQUEST DARI JAVASCRIPT MODAL AGAR DATA BISA DIAMBIL
public function finalApprove(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormEntertaimentPresentation::findOrFail($id);
@@ -748,11 +776,10 @@ class FormEntertainmentPresentationController extends Controller
return redirect()->back();
}
// Hitung periode dari tanggal form
// Hitung periode berdasarkan tanggal form
$tanggal = Carbon::parse($form->tanggal);
$startDay = (int) env('STARTING_DATE', 11);
$closingDay = (int) env('CLOSING_DATE', 10);
if ($tanggal->day >= $startDay) {
$periodeDate = Carbon::create($tanggal->year, $tanggal->month, $startDay);
} else {
@@ -762,13 +789,17 @@ class FormEntertainmentPresentationController extends Controller
$periodeMonth = strtolower($periodeDate->format('F'));
$periodeYear = (int) $periodeDate->format('Y');
// <--- REPARASI: Penangkapan nilai payload dari checkbox JavaScript
$approvedTotal = $request->input('approved_total', $form->total);
$availableBudget = BudgetHelper::getAvailableBudget($cabang_id, $periodeMonth, $periodeYear);
if($form->approved_total > $availableBudget) {
if($approvedTotal > $availableBudget) { // <--- DISINKRONKAN DENGAN NILAI BARU HASIL CHECKLIST
session()->flash('error', 'Budget cabang untuk periode ini tidak mencukupi, silahkan ajukan pada periode expense berikutnya');
return redirect()->back();
}
$form->update([
'approved_total' => $approvedTotal, // <--- SUNTIK DATA UPDATE HASIL CHECKLIST KE DATABASE
'final_approved_at' => now(),
'final_approved_by' => auth()->user()->id,
'status' => 'Closed',
@@ -777,7 +808,7 @@ class FormEntertainmentPresentationController extends Controller
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->created_at;
$total = $form->approved_total;
$total = $form->approved_total; // <--- TOTAL BARU YANG DIKIRIMKAN KE EMAIL / WHATSAPP
$roles = ['Head of Sales Marketing', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
@@ -850,75 +881,77 @@ class FormEntertainmentPresentationController extends Controller
public function reject(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['approval.reject']);
// Otorisasi khusus MOM Region dan Atasan
if (!auth()->user()->hasAnyPermission(['approval.reject', 'approval2.reject', 'final_approval.approve'])) {
abort(403, 'Akses Ditolak: Anda tidak memiliki izin untuk melakukan Reject.');
}
$request->validate([
'remarks' => 'required|string|max:500',
'remarks' => 'required|string|max:500',
]);
// Menggunakan Model Entertainment & Presentation
$form = FormEntertaimentPresentation::findOrfail($id);
$form->update([
'status' => 'Rejected',
'remarks' => $request->remarks,
'status' => 'Rejected',
'remarks' => $request->remarks,
'rejected_by' => auth()->id(), // Kolom baru
'rejected_at' => now(), // Kolom baru
]);
$heads = $form->user->getCabangAndRegionHead();
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->created_at;
$tanggal = $form->tanggal;
$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'];
$recipients[] = $heads['cabang_head']['email'];
$phoneNumbers[] = $heads['cabang_head']['phone'];
}
if ($heads['region_head']) {
$recipients[] = $heads['region_head']['email'];
$phoneNumbers[] = $heads['region_head']['phone'];
$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
// Route khusus Entertainment
$url = route('forms.entertainment.view', $form->id);
WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name, $request->remarks);
// Notifikasi WhatsApp
$this->rejectExpenseWithNotification($phoneNumbers, $expense_number, $url, $tanggal, $total, $name, $request->remarks, $recipients);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
$mail = new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url,
$request->remarks
);
$response = $brevoService->expenseRejected($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
}
}
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Entertainment (' . $form->expense_number . ')');
// Audit Trail Khusus Form Entertainment
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Entertainment Presentation (' . $form->expense_number . ') oleh ' . auth()->user()->name);
session()->flash('success', 'Form has been rejected.');
return redirect()->back();
}
private function rejectExpenseWithNotification($phoneNumbers, $expense_number, $url, $tanggal, $total, $name, $remarks, $recipients)
{
WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name, $remarks);
// Notifikasi Email (Brevo)
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
$mail = new ExpenseRejected($name, $expense_number, $tanggal, $total, $url, $remarks);
$brevoService->expenseRejected($recipient, $name, $mail);
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
}
}
}
public function open($id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.open']);
@@ -935,23 +968,23 @@ class FormEntertainmentPresentationController extends Controller
return redirect()->back();
}
public function destroy($id)
{
public function destroy($id)
{
$this->checkAuthorization(auth()->user(), ['forms.entertainment.delete']);
$role = auth()->user()->getRoleNames()[0];
$form = FormEntertaimentPresentation::findOrfail($id);
$form = FormEntertaimentPresentation::findOrfail($id);
if($form->status != 'On Progress' && $role == 'Medical Representatif') {
session()->flash('error', 'You cannot edit this form because it has been approved or rejected.');
return redirect()->back();
}
AuditTrailHelper::AddAuditTrail('Delete', 'Delete Record at Form Entertainment Presentation (' . $form->expense_number . ')');
$form->delete();
$form->delete();
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
protected function addAttachmentValidationRules(\Illuminate\Validation\Validator $validator, Request $request): void
{
@@ -1138,4 +1171,4 @@ class FormEntertainmentPresentationController extends Controller
return ucwords(str_replace('_', ' ', $category));
}
}
}
app/Http/Controllers/Forms/FormMeetingSeminarController.php
+105 -76
View File
@@ -75,7 +75,7 @@ class FormMeetingSeminarController extends Controller
$role = auth()->user()->getRoleNames()[0];
$startDay = (int) env('STARTING_DATE', 11);
$closingDay = (int) env('CLOSING_DATE', 10);
$closingDay = (int) env('CLOSING_DATE', 13);
$userRegionData = auth()->user()->getMyCabangAndRegionId();
$regionContextId = $userRegionData['region'] !== '-' ? $userRegionData['region'] : null;
$cabangContextId = $userRegionData['cabang'] !== '-' ? $userRegionData['cabang'] : null;
@@ -180,14 +180,14 @@ class FormMeetingSeminarController extends Controller
]);
}
public function create()
{
public function create()
{
$this->checkAuthorization(auth()->user(), ['forms.meeting.create']);
return view('backend.pages.forms.meeting.create');
}
return view('backend.pages.forms.meeting.create');
}
public function store(Request $request)
public function store(Request $request)
{
$this->checkAuthorization(auth()->user(), ['forms.meeting.create']);
@@ -204,23 +204,28 @@ class FormMeetingSeminarController extends Controller
$validator->validate();
$tanggal = Carbon::parse($request->tanggal);
// PEMBATASAN INPUT MENGGUNAKAN STARTING_DATE & INPUT_MAX_DATE
$startDay = (int) env('STARTING_DATE', 11);
$closingDay = (int) env('CLOSING_DATE', 10);
$inputMaxDay = (int) env('INPUT_MAX_DATE', 10);
$now = Carbon::now();
// Tentukan periode aktif berdasarkan tanggal saat ini
if ($now->day >= $startDay) {
$startDate = Carbon::create($now->year, $now->month, $startDay);
$closingDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $closingDay);
// Jendela Aktif: Tgl 11 Bulan Ini s/d Tgl 10 Bulan Depan
$startDate = Carbon::create($now->year, $now->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $inputMaxDay)->endOfDay();
} else {
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay);
$closingDate = Carbon::create($now->year, $now->month, $closingDay);
// Jendela Aktif: Tgl 11 Bulan Lalu s/d Tgl 10 Bulan Ini
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->year, $now->month, $inputMaxDay)->endOfDay();
}
// Validasi apakah tanggal pengajuan masuk ke periode saat ini
if ($tanggal->lt($startDate) || $tanggal->gt($closingDate)) {
session()->flash('error', "Gagal, tanggal tidak berada dalam periode input: {$startDate->format('d M')} - {$closingDate->format('d M')}");
return redirect()->back();
// Validasi apakah tanggal pengajuan masuk ke periode input saat ini
if ($tanggal->lt($startDate) || $tanggal->gt($maxInputDate)) {
session()->flash('error', "Gagal, tanggal expense tidak berada dalam batas waktu input yang diizinkan: {$startDate->format('d M Y')} - {$maxInputDate->format('d M Y')}");
return redirect()->back()->withInput();
}
$cabang = UserHasCabang::with('cabang')->where('user_id', auth()->user()->id)->first()?->cabang;
@@ -230,7 +235,9 @@ class FormMeetingSeminarController extends Controller
}
$region = Region::find($cabang->region_id);
$kategori = Kategori::where('name', 'Meeting / Seminar')->first();
// Optimasi pencarian kategori menggunakan LIKE fleksibel untuk menjamin ID ditemukan
$kategori = Kategori::where('name', 'LIKE', '%Meeting / Seminar%')->first();
// Hitung periode dari tanggal input (bukan dari today)
if ($tanggal->day >= $startDay) {
@@ -266,7 +273,7 @@ class FormMeetingSeminarController extends Controller
// Check if the total nominal exceeds the available budget
if ($totalNominal > $availableBudget) {
session()->flash('error', 'Alokasi budget bulanan cabang tidak mencukupi,silahkan ajukan pada periode expense berikutnya');
return redirect()->back();
return redirect()->back()->withInput();
}
DB::beginTransaction();
@@ -276,6 +283,7 @@ class FormMeetingSeminarController extends Controller
$form = FormMeetingSeminar::create([
'expense_number' => $expense_number,
'user_id' => auth()->user()->id,
'cabang_id' => $cabang->id, // <--- REPARASI SUNTIK CABANG_ID BARU
'tanggal' => $request->tanggal,
'allowance' => $data_nominal['allowance'],
'transport_ankot' => $data_nominal['transport_ankot'],
@@ -285,6 +293,7 @@ class FormMeetingSeminarController extends Controller
'bukti_transport_ankot' => null,
'bukti_hotel' => null,
'account_number' => $kategori?->account_number,
'kategori_id' => $kategori->id ?? null,
'status' => 'On Progress',
]);
@@ -391,10 +400,10 @@ class FormMeetingSeminarController extends Controller
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Meeting Seminar (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
}
}
public function edit($id)
{
public function edit($id)
{
$this->checkAuthorization(auth()->user(), ['forms.meeting.edit']);
$role = auth()->user()->getRoleNames()[0];
@@ -406,14 +415,14 @@ class FormMeetingSeminarController extends Controller
$attachments = $this->formatAttachmentCollection($form);
return view('backend.pages.forms.meeting.edit', [
return view('backend.pages.forms.meeting.edit', [
'form' => $form,
'attachments' => $attachments,
]);
}
]);
}
public function update(Request $request, $id)
{
public function update(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['forms.meeting.edit']);
$role = auth()->user()->getRoleNames()[0];
$form = FormMeetingSeminar::with('attachments')->findOrFail($id);
@@ -434,6 +443,28 @@ class FormMeetingSeminarController extends Controller
session()->flash('error', 'You cannot edit this form because it has been approved or rejected.');
return redirect()->back();
}
$tanggal = Carbon::parse($request->tanggal);
// PEMBATASAN INPUT MENGGUNAKAN STARTING_DATE & INPUT_MAX_DATE
$startDay = (int) env('STARTING_DATE', 11);
$inputMaxDay = (int) env('INPUT_MAX_DATE', 10);
$now = Carbon::now();
if ($now->day >= $startDay) {
$startDate = Carbon::create($now->year, $now->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $inputMaxDay)->endOfDay();
} else {
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->year, $now->month, $inputMaxDay)->endOfDay();
}
// Validasi apakah tanggal pengajuan masuk ke periode input saat ini
if ($tanggal->lt($startDate) || $tanggal->gt($maxInputDate)) {
session()->flash('error', "Gagal, tanggal expense tidak berada dalam batas waktu input yang diizinkan: {$startDate->format('d M Y')} - {$maxInputDate->format('d M Y')}");
return redirect()->back()->withInput();
}
$cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()?->cabang;
if (!$cabang) {
@@ -442,7 +473,7 @@ class FormMeetingSeminarController extends Controller
}
$region = Region::find($cabang->region_id);
$kategori = Kategori::where('name', 'Meeting / Seminar')->first();
$kategori = Kategori::where('name', 'LIKE', '%Meeting / Seminar%')->first();
$folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/meeting';
@@ -458,8 +489,6 @@ class FormMeetingSeminarController extends Controller
$totalNominal = array_sum($data_nominal);
// Hitung periode dari tanggal form yang diinput
$tanggal = Carbon::parse($request->tanggal);
$startDay = (int) env('STARTING_DATE', 11);
if ($tanggal->day >= $startDay) {
$periodeDate = Carbon::create($tanggal->year, $tanggal->month, $startDay);
} else {
@@ -473,18 +502,20 @@ class FormMeetingSeminarController extends Controller
$availableBudget = BudgetHelper::getAvailableBudget($cabang->id, $periodeMonth, $periodeYear);
if ($totalNominal > $availableBudget) {
session()->flash('error', 'The total nominal exceeds the available budget.');
return redirect()->back();
return redirect()->back()->withInput();
}
DB::beginTransaction();
try {
$form->update([
'cabang_id' => $cabang->id, // <--- REPARASI SUNTIK CABANG_ID TERBARU SAAT PROSES UPDATE
'tanggal' => $request->tanggal,
'allowance' => $data_nominal['allowance'],
'transport_ankot' => $data_nominal['transport_ankot'],
'hotel' => $data_nominal['hotel'],
'total' => $totalNominal,
'account_number' => $kategori?->account_number,
'kategori_id' => $kategori->id ?? null,
]);
if (!empty($attachmentsPayload)) {
@@ -512,7 +543,7 @@ class FormMeetingSeminarController extends Controller
AuditTrailHelper::AddAuditTrail('Update', 'Update Expense at Form Meeting Seminar (' . $form->expense_number . ')');
session()->flash('success', 'Form has been updated.');
return redirect()->back();
}
}
public function deleteAttachment(Request $request, $formId, $attachmentId)
{
@@ -735,7 +766,8 @@ class FormMeetingSeminarController extends Controller
return redirect()->back();
}
public function finalApprove($id)
// <--- REPARASI SUNTIKAN OBJECT REQUEST HASIL CHECKLIST JAVASCRIPT MODAL DILUAR
public function finalApprove(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormMeetingSeminar::findOrFail($id);
@@ -764,22 +796,27 @@ class FormMeetingSeminarController extends Controller
$periodeMonth = strtolower($periodeDate->format('F'));
$periodeYear = (int) $periodeDate->format('Y');
// <--- REPARASI: Penangkapan nilai payload dari checkbox JavaScript
$approvedTotal = $request->input('approved_total', $form->total);
// Ambil sisa budget bulanan dan sinkronkan dengan nominal dinamis terbaru
$availableBudget = BudgetHelper::getAvailableBudget($cabang_id, $periodeMonth, $periodeYear);
if($form->approved_total > $availableBudget) {
if($approvedTotal > $availableBudget) {
session()->flash('error', 'Budget cabang untuk periode ini tidak mencukupi, silahkan ajukan pada periode expense berikutnya');
return redirect()->back();
}
$form->update([
'approved_total' => $approvedTotal, // <--- SUNTIK NOMINAL BARU HASIL CHECKLIST DARI JAVASCRIPT KE DB
'final_approved_at' => now(),
'final_approved_by' => auth()->user()->id,
'status' => 'Closed',
'status' => 'Closed',
]);
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->tanggal;
$total = $form->approved_total;
$total = $form->approved_total; // <--- TOTAL BARU YANG DIKIRIMKAN KE EMAIL / WHATSAPP
$roles = ['Head of Sales Marketing', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
@@ -822,16 +859,18 @@ class FormMeetingSeminarController extends Controller
$url = route('forms.meeting.view', $form->id);
WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
// Send bulk email (Optimasi menggunakan BrevoService)
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new FinalApprove(
$mail = new FinalApprove(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$brevoService->expenseFinalApproved($recipient, $name, $mail);
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -845,16 +884,22 @@ class FormMeetingSeminarController extends Controller
public function reject(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['approval.reject']);
if (!auth()->user()->hasAnyPermission(['approval.reject', 'approval2.reject', 'final_approval.approve'])) {
abort(403, 'Akses Ditolak: Anda tidak memiliki izin untuk melakukan Reject.');
}
$request->validate([
'remarks' => 'required|string|max:500',
'remarks' => 'required|string|max:500',
]);
$form = FormMeetingSeminar::findOrfail($id);
// Update Metadata Rejeksi
$form->update([
'status' => 'Rejected',
'remarks' => $request->remarks,
'status' => 'Rejected',
'remarks' => $request->remarks,
'rejected_by' => auth()->id(), // Kolom baru
'rejected_at' => now(), // Kolom baru
]);
$heads = $form->user->getCabangAndRegionHead();
@@ -863,53 +908,37 @@ class FormMeetingSeminarController extends Controller
$tanggal = $form->tanggal;
$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'];
$recipients[] = $heads['cabang_head']['email'];
$phoneNumbers[] = $heads['cabang_head']['phone'];
}
if ($heads['region_head']) {
$recipients[] = $heads['region_head']['email'];
$phoneNumbers[] = $heads['region_head']['phone'];
$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::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name, $request->remarks);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
$mail = new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url,
$request->remarks
);
$response = $brevoService->expenseRejected($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
try {
$mail = new ExpenseRejected($name, $expense_number, $tanggal, $total, $url, $request->remarks);
$brevoService->expenseRejected($recipient, $name, $mail);
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
}
}
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Meeting Seminar (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Meeting Seminar (' . $form->expense_number . ') oleh ' . auth()->user()->name);
session()->flash('success', 'Form has been rejected.');
return redirect()->back();
}
@@ -930,12 +959,12 @@ class FormMeetingSeminarController extends Controller
return redirect()->back();
}
public function destroy($id)
{
public function destroy($id)
{
$this->checkAuthorization(auth()->user(), ['forms.meeting.delete']);
$role = auth()->user()->getRoleNames()[0];
$form = FormMeetingSeminar::findOrfail($id);
$form = FormMeetingSeminar::findOrfail($id);
if($form->status != 'On Progress' && $role == 'Medical Representatif') {
session()->flash('error', 'You cannot edit this form because it has been approved or rejected.');
return redirect()->back();
@@ -943,11 +972,11 @@ class FormMeetingSeminarController extends Controller
AuditTrailHelper::AddAuditTrail('Delete', 'Delete Record at Form Meeting Seminar (' . $form->expense_number . ')');
$form->delete();
$form->delete();
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
protected function addAttachmentValidationRules(\Illuminate\Validation\Validator $validator, Request $request): void
{
@@ -1138,4 +1167,4 @@ class FormMeetingSeminarController extends Controller
return ucwords(str_replace('_', ' ', $category));
}
}
}
app/Http/Controllers/Forms/FormOtherController.php
+93 -75
View File
@@ -74,7 +74,7 @@ class FormOtherController extends Controller
$role = auth()->user()->getRoleNames()[0];
$startDay = (int) env('STARTING_DATE', 11);
$closingDay = (int) env('CLOSING_DATE', 10);
$closingDay = (int) env('CLOSING_DATE', 13);
$userRegionData = auth()->user()->getMyCabangAndRegionId();
$regionContextId = $userRegionData['region'] !== '-' ? $userRegionData['region'] : null;
$cabangContextId = $userRegionData['cabang'] !== '-' ? $userRegionData['cabang'] : null;
@@ -179,18 +179,18 @@ class FormOtherController extends Controller
]);
}
public function create()
{
public function create()
{
$this->checkAuthorization(auth()->user(), ['forms.other.create']);
return view('backend.pages.forms.other.create', [
return view('backend.pages.forms.other.create', [
'kategori' => Kategori::whereNotIn('name', $this->excludedKategoriNames)->get(),
'attachmentCategories' => $this->attachmentCategories,
]);
}
}
public function store(Request $request)
{
public function store(Request $request)
{
$this->checkAuthorization(auth()->user(), ['forms.other.create']);
$validator = Validator::make($request->all(), [
'kategori_id' => 'required',
@@ -203,7 +203,7 @@ class FormOtherController extends Controller
'nullable',
'file',
'max:10240',
'mimetypes:image/jpeg,image/png,image/webp,application/pdf,application/msword,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,text/plain,text/csv,application/zip,application/x-zip-compressed,application/x-7z-compressed,application/vnd.rar,application/octet-stream'
'mimetypes:image/jpeg,image/png,image/webp,application/pdf,application/msword,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,text/plain,text/csv,application/zip,application/x-zip-compressed,application/x-7z-compressed,application/vnd.rar,application/octet-stream'
],
]);
@@ -229,23 +229,27 @@ class FormOtherController extends Controller
$validator->validate();
$tanggal = Carbon::parse($request->tanggal);
// PEMBATASAN INPUT MENGGUNAKAN STARTING_DATE & INPUT_MAX_DATE
$startDay = (int) env('STARTING_DATE', 11);
$closingDay = (int) env('CLOSING_DATE', 10);
$inputMaxDay = (int) env('INPUT_MAX_DATE', 10);
$now = Carbon::now();
// Tentukan periode input berdasarkan waktu saat ini
// Tentukan periode aktif berdasarkan tanggal saat ini
if ($now->day >= $startDay) {
$startDate = Carbon::create($now->year, $now->month, $startDay);
$closingDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $closingDay);
// Jendela Aktif: Tgl 11 Bulan Ini s/d Tgl 10 Bulan Depan
$startDate = Carbon::create($now->year, $now->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $inputMaxDay)->endOfDay();
} else {
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay);
$closingDate = Carbon::create($now->year, $now->month, $closingDay);
// Jendela Aktif: Tgl 11 Bulan Lalu s/d Tgl 10 Bulan Ini
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->year, $now->month, $inputMaxDay)->endOfDay();
}
// Validasi apakah tanggal berada dalam periode aktif input
if ($tanggal->lt($startDate) || $tanggal->gt($closingDate)) {
session()->flash('error', "Gagal, tanggal tidak berada dalam periode input: {$startDate->format('d M')} - {$closingDate->format('d M')}");
return redirect()->back();
// Validasi apakah tanggal pengajuan masuk ke periode input saat ini
if ($tanggal->lt($startDate) || $tanggal->gt($maxInputDate)) {
session()->flash('error', "Gagal, tanggal expense tidak berada dalam batas waktu input yang diizinkan: {$startDate->format('d M Y')} - {$maxInputDate->format('d M Y')}");
return redirect()->back()->withInput();
}
// Ambil cabang user
@@ -256,7 +260,7 @@ class FormOtherController extends Controller
return redirect()->back();
}
// Tentukan periode budget berdasarkan tanggal input (bukan now)
// Tentukan periode budget berdasarkan tanggal input
if ($tanggal->day >= $startDay) {
$periodeDate = Carbon::create($tanggal->year, $tanggal->month, $startDay);
} else {
@@ -270,7 +274,7 @@ class FormOtherController extends Controller
$availableBudget = BudgetHelper::getAvailableBudget($cabang->id, $periodeMonth, $periodeYear);
if($request->total > $availableBudget) {
session()->flash('error', 'Alokasi budget bulanan cabang tidak mencukupi,silahkan ajukan pada periode expense berikutnya');
return redirect()->back();
return redirect()->back()->withInput();
}
$region = Region::where('id', $cabang->region_id)->first();
@@ -279,10 +283,9 @@ class FormOtherController extends Controller
$folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/other';
$attachmentsPayload = $this->buildAttachmentPayload($request, $folderPath);
$primaryAttachmentPath = $attachmentsPayload[0]['file_path'] ?? null;
$primaryAttachmentPath = $attachmentsPayload[0]['file_path'] ?? null;
// Generate sequence number and expense number
$sequence_number = FormOthers::withTrashed()->where('expense_number', 'like', $region->code . '-' . $cabang->code . '-OTH-' . date('ym') . '%')->count() + 1;
$sequence_number = FormOthers::withTrashed()->where('expense_number', 'like', $region->code . '-' . $cabang->code . '-OTH-' . date('ym') . '%')->count() + 1;
$formatted_sequence_number = str_pad($sequence_number, 4, '0', STR_PAD_LEFT);
$expense_number = $region->code . '-' . $cabang->code . '-OTH-' . date('ym') . $formatted_sequence_number;
@@ -291,6 +294,7 @@ class FormOtherController extends Controller
$form = FormOthers::create([
'expense_number' => $expense_number,
'user_id' => auth()->user()->id,
'cabang_id' => $cabang->id, // <--- REPARASI SUNTIK CABANG_ID BARU
'kategori_id' => $request->kategori_id,
'tanggal' => $request->tanggal,
'keterangan' => $request->keterangan,
@@ -400,10 +404,10 @@ class FormOtherController extends Controller
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Other (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
}
}
public function edit($id)
{
public function edit($id)
{
$this->checkAuthorization(auth()->user(), ['forms.other.edit']);
$role = auth()->user()->getRoleNames()[0];
@@ -413,15 +417,15 @@ class FormOtherController extends Controller
return redirect()->back();
}
return view('backend.pages.forms.other.edit', [
return view('backend.pages.forms.other.edit', [
'form' => $form,
'kategori' => Kategori::whereNotIn('name', $this->excludedKategoriNames)->get(),
'attachments' => $this->formatAttachmentCollection($form),
'attachmentCategories' => $this->attachmentCategories,
]);
}
}
public function update(Request $request, $id)
public function update(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['forms.other.edit']);
$role = auth()->user()->getRoleNames()[0];
@@ -438,10 +442,28 @@ class FormOtherController extends Controller
return redirect()->back();
}
// Hitung periode dari tanggal input
$tanggal = Carbon::parse($request->tanggal);
// PEMBATASAN INPUT MENGGUNAKAN STARTING_DATE & INPUT_MAX_DATE
$startDay = (int) env('STARTING_DATE', 11);
$inputMaxDay = (int) env('INPUT_MAX_DATE', 10);
$now = Carbon::now();
if ($now->day >= $startDay) {
$startDate = Carbon::create($now->year, $now->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $inputMaxDay)->endOfDay();
} else {
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->year, $now->month, $inputMaxDay)->endOfDay();
}
// Validasi apakah tanggal pengajuan masuk ke periode input saat ini
if ($tanggal->lt($startDate) || $tanggal->gt($maxInputDate)) {
session()->flash('error', "Gagal, tanggal expense tidak berada dalam batas waktu input yang diizinkan: {$startDate->format('d M Y')} - {$maxInputDate->format('d M Y')}");
return redirect()->back()->withInput();
}
// Hitung periode budget dari tanggal input
if ($tanggal->day >= $startDay) {
$periodeDate = Carbon::create($tanggal->year, $tanggal->month, $startDay);
} else {
@@ -465,7 +487,7 @@ class FormOtherController extends Controller
'nullable',
'file',
'max:10240',
'mimetypes:image/jpeg,image/png,image/webp,application/pdf,application/msword,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,text/plain,text/csv,application/zip,application/x-zip-compressed,application/x-7z-compressed,application/vnd.rar,application/octet-stream'
'mimetypes:image/jpeg,image/png,image/webp,application/pdf,application/msword,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,text/plain,text/csv,application/zip,application/x-zip-compressed,application/x-7z-compressed,application/vnd.rar,application/octet-stream'
],
]);
@@ -495,10 +517,12 @@ class FormOtherController extends Controller
$folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/other';
$attachmentsPayload = $this->buildAttachmentPayload($request, $folderPath);
$primaryAttachmentPath = !empty($attachmentsPayload) ? $attachmentsPayload[0]['file_path'] : null;
DB::beginTransaction();
try {
$form->update([
'cabang_id' => $cabang->id, // <--- REPARASI SUNTIK CABANG_ID TERBARU
'kategori_id' => $request->kategori_id,
'tanggal' => $request->tanggal,
'keterangan' => $request->keterangan,
@@ -752,7 +776,8 @@ class FormOtherController extends Controller
return redirect()->back();
}
public function finalApprove($id)
// <--- REPARASI SUNTIKAN OBJECT REQUEST HASIL CHECKLIST JAVASCRIPT MODAL DILUAR
public function finalApprove(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormOthers::findOrFail($id);
@@ -781,14 +806,18 @@ class FormOtherController extends Controller
$periodeMonth = strtolower($periodeDate->format('F'));
$periodeYear = (int) $periodeDate->format('Y');
// Ambil sisa budget
// <--- REPARASI: Penangkapan nilai payload dari checkbox JavaScript
$approvedTotal = $request->input('approved_total', $form->total);
// Ambil sisa budget dan sinkronkan validasinya dengan nominal dinamis terbaru
$availableBudget = BudgetHelper::getAvailableBudget($cabang_id, $periodeMonth, $periodeYear);
if($form->approved_total > $availableBudget) {
if($approvedTotal > $availableBudget) {
session()->flash('error', 'Budget cabang untuk periode ini tidak mencukupi, silahkan ajukan pada periode expense berikutnya');
return redirect()->back();
}
$form->update([
'approved_total' => $approvedTotal, // <--- SUNTIK NOMINAL BARU HASIL CHECKLIST DARI JAVASCRIPT KE DB
'final_approved_at' => now(),
'final_approved_by' => auth()->user()->id,
'status' => 'Closed',
@@ -797,7 +826,7 @@ class FormOtherController extends Controller
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->created_at;
$total = $form->approved_total;
$total = $form->approved_total; // <--- SEKARANG MENGGUNAKAN DATA UPDATE TERBARU
$roles = ['Head of Sales Marketing', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
@@ -870,71 +899,60 @@ class FormOtherController extends Controller
public function reject(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['approval.reject']);
if (!auth()->user()->hasAnyPermission(['approval.reject', 'approval2.reject', 'final_approval.approve'])) {
abort(403, 'Akses Ditolak: Anda tidak memiliki izin untuk melakukan Reject.');
}
$request->validate([
'remarks' => 'required|string|max:500',
'remarks' => 'required|string|max:500',
]);
$form = FormOthers::findOrfail($id);
$form->update([
'status' => 'Rejected',
'remarks' => $request->remarks,
'status' => 'Rejected',
'remarks' => $request->remarks,
'rejected_by' => auth()->id(), // Kolom baru
'rejected_at' => now(), // Kolom baru
]);
$heads = $form->user->getCabangAndRegionHead();
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->created_at;
$tanggal = $form->tanggal;
$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'];
$recipients[] = $heads['cabang_head']['email'];
$phoneNumbers[] = $heads['cabang_head']['phone'];
}
if ($heads['region_head']) {
$recipients[] = $heads['region_head']['email'];
$phoneNumbers[] = $heads['region_head']['phone'];
$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.other.view', $form->id);
$url = route('forms.others.view', $form->id);
WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name, $request->remarks);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
$mail = new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url,
$request->remarks
);
$response = $brevoService->expenseRejected($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
try {
$mail = new ExpenseRejected($name, $expense_number, $tanggal, $total, $url, $request->remarks);
$brevoService->expenseRejected($recipient, $name, $mail);
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
}
}
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Other (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Others (' . $form->expense_number . ') oleh ' . auth()->user()->name);
session()->flash('success', 'Form has been rejected.');
return redirect()->back();
}
@@ -955,12 +973,12 @@ class FormOtherController extends Controller
return redirect()->back();
}
public function destroy($id)
{
public function destroy($id)
{
$this->checkAuthorization(auth()->user(), ['forms.other.delete']);
$role = auth()->user()->getRoleNames()[0];
$form = FormOthers::findOrfail($id);
$form = FormOthers::findOrfail($id);
if($form->status != 'On Progress' && $role == 'Medical Representatif') {
session()->flash('error', 'You cannot edit this form because it has been approved or rejected.');
return redirect()->back();
@@ -968,11 +986,11 @@ class FormOtherController extends Controller
AuditTrailHelper::AddAuditTrail('Delete', 'Delete Record at Form Other (' . $form->expense_number . ')');
$form->delete();
$form->delete();
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
protected function formatAttachmentCollection(FormOthers $form): array
{
@@ -1075,4 +1093,4 @@ class FormOtherController extends Controller
return $payload;
}
}
}
app/Http/Controllers/Forms/FormUpCountryController.php
+128 -94
View File
@@ -66,7 +66,7 @@ class FormUpCountryController extends Controller
$role = auth()->user()->getRoleNames()[0];
$startDay = (int) env('STARTING_DATE', 11);
$closingDay = (int) env('CLOSING_DATE', 10);
$closingDay = (int) env('CLOSING_DATE', 13);
// Current time reference
$now = Carbon::now();
@@ -190,20 +190,20 @@ class FormUpCountryController extends Controller
]);
}
public function create()
{
public function create()
{
$this->checkAuthorization(auth()->user(), ['forms.country.create']);
$rayons = $this->getAccessibleRayonsForCurrentUser();
return view('backend.pages.forms.upcountry.create', [
'rayons' => $rayons,
return view('backend.pages.forms.upcountry.create', [
'rayons' => $rayons,
'attachmentCategories' => array_keys($this->attachmentCategories),
'attachmentCategoryLabels' => $this->attachmentCategories,
]);
}
]);
}
public function store(Request $request)
{
public function store(Request $request)
{
$this->checkAuthorization(auth()->user(), ['forms.country.create']);
$request->validate([
'rayon_id' => 'required|exists:rayon,id',
@@ -221,23 +221,24 @@ class FormUpCountryController extends Controller
]);
$tanggal = Carbon::parse($request->tanggal);
// SINKRONISASI JENDELA INPUT ATURAN BISNIS: 11 s/d 10 Bulan Berikutnya
$startDay = (int) env('STARTING_DATE', 11);
$closingDay = (int) env('CLOSING_DATE', 10);
$inputMaxDay = (int) env('INPUT_MAX_DATE', 10);
$now = Carbon::now();
// Tentukan periode aktif saat ini
if ($now->day >= $startDay) {
$startDate = Carbon::create($now->year, $now->month, $startDay);
$closingDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $closingDay);
$startDate = Carbon::create($now->year, $now->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $inputMaxDay)->endOfDay();
} else {
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay);
$closingDate = Carbon::create($now->year, $now->month, $closingDay);
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->year, $now->month, $inputMaxDay)->endOfDay();
}
// Validasi apakah tanggal input berada di periode aktif
if ($tanggal->lt($startDate) || $tanggal->gt($closingDate)) {
session()->flash('error', "Gagal, tanggal tidak berada dalam periode input: {$startDate->format('d M')} - {$closingDate->format('d M')}");
return redirect()->back();
// Blokade Sistem: Tolak input jika berada di luar siklus pengisian aktif
if ($now->lt($startDate) || $now->gt($maxInputDate)) {
session()->flash('error', "Gagal, pengajuan saat ini sudah ditutup. Periode pengisian aktif hanya diizinkan dari tanggal {$startDay} sampai tanggal {$inputMaxDay} berikutnya.");
return redirect()->back()->withInput();
}
$cabang = UserHasCabang::with('cabang')->where('user_id', auth()->user()->id)->first()?->cabang;
@@ -247,7 +248,9 @@ class FormUpCountryController extends Controller
}
$region = Region::find($cabang->region_id);
$kategori = Kategori::where('name', 'Up Country')->first();
// Optimasi pencarian kategori menggunakan LIKE fleksibel untuk menjamin ID ditemukan
$kategori = Kategori::where('name', 'LIKE', '%Up Country%')->first();
// Hitung periode budget dari tanggal input
if ($tanggal->day >= $startDay) {
@@ -301,6 +304,8 @@ class FormUpCountryController extends Controller
$form = FormUpCountry::create([
'expense_number' => $expense_number,
'user_id' => auth()->user()->id,
'cabang_id' => $cabang->id, // <--- REPARASI: Memasukkan Cabang ID milik user pengaju secara instan
'kategori_id' => $kategori->id ?? null, // SUNTIK KATEGORI_ID OTOMATIS BERHASIL
'rayon_id' => $request->rayon_id,
'tanggal' => $request->tanggal,
'tujuan' => $request->tujuan,
@@ -315,14 +320,14 @@ class FormUpCountryController extends Controller
'bukti_transport_ankot' => null,
'bukti_hotel' => null,
'uc_plan' => $ucPlanPath,
'account_number' => $kategori->account_number,
'account_number' => $kategori->account_number ?? null,
'status' => 'On Progress',
]);
if (!empty($attachmentsPayload)) {
$this->attachmentService->addMultipleAttachments(
$form->id,
AttachmentTableName::FORM_UP_COUNTRY,
$dynamicTable = AttachmentTableName::FORM_UP_COUNTRY,
$attachmentsPayload
);
}
@@ -359,11 +364,11 @@ class FormUpCountryController extends Controller
foreach ($roles as $role) {
$users = Admin::getUserByRoleName($role)->filter(function ($user) use ($role, $cabang_id, $region_id) {
if ($role === 'Marketing Information System') {
return true; // Tidak ada filter cabang untuk peran ini
return true;
}
if (!$user->cabang || !$user->cabang->cabang) {
return false; // Pastikan user memiliki cabang
return false;
}
if ($role === 'Admin Region' || $role === 'Marketing Operational Manager Region') {
@@ -417,10 +422,10 @@ class FormUpCountryController extends Controller
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Up Country (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
}
}
public function edit($id)
{
public function edit($id)
{
$this->checkAuthorization(auth()->user(), ['forms.country.edit']);
$role = auth()->user()->getRoleNames()[0];
@@ -453,14 +458,14 @@ class FormUpCountryController extends Controller
];
})->values();
return view('backend.pages.forms.upcountry.edit', [
'rayons' => $rayonData,
return view('backend.pages.forms.upcountry.edit', [
'rayons' => $rayonData,
'form' => $form,
'attachments' => $existingAttachments,
'attachmentCategories' => array_keys($this->attachmentCategories),
'attachmentCategoryLabels' => $this->attachmentCategories,
]);
}
]);
}
protected function getAccessibleRayonsForCurrentUser()
{
@@ -494,7 +499,7 @@ class FormUpCountryController extends Controller
}
public function update(Request $request, $id)
{
{
$this->checkAuthorization(auth()->user(), ['forms.country.edit']);
$role = auth()->user()->getRoleNames()[0];
@@ -525,12 +530,31 @@ class FormUpCountryController extends Controller
return redirect()->back();
}
// PEMBATASAN INPUT MENGGUNAKAN STARTING_DATE & INPUT_MAX_DATE
$startDay = (int) env('STARTING_DATE', 11);
$inputMaxDay = (int) env('INPUT_MAX_DATE', 10);
$now = Carbon::now();
if ($now->day >= $startDay) {
$startDate = Carbon::create($now->year, $now->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $inputMaxDay)->endOfDay();
} else {
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->year, $now->month, $inputMaxDay)->endOfDay();
}
if ($now->lt($startDate) || $now->gt($maxInputDate)) {
session()->flash('error', "Gagal, pengajuan saat ini sudah ditutup. Periode pengisian aktif hanya diizinkan dari tanggal {$startDay} sampai tanggal {$inputMaxDay} berikutnya.");
return redirect()->back()->withInput();
}
$region = Region::find($cabang->region_id);
$kategori = Kategori::where('name', 'Up Country')->first();
// Optimasi pencarian kategori menggunakan LIKE fleksibel untuk menjamin ID ditemukan
$kategori = Kategori::where('name', 'LIKE', '%Up Country%')->first();
// Hitung periode dari tanggal input
$tanggal = Carbon::parse($request->tanggal);
$startDay = (int) env('STARTING_DATE', 11);
if ($tanggal->day >= $startDay) {
$periodeDate = Carbon::create($tanggal->year, $tanggal->month, $startDay);
} else {
@@ -564,7 +588,7 @@ class FormUpCountryController extends Controller
// Validasi budget dengan periode
$availableBudget = BudgetHelper::getAvailableBudget($cabang->id, $periodeMonth, $periodeYear);
if(array_sum($data_nominal) > $availableBudget) {
if($totalNominal > $availableBudget) {
session()->flash('error', 'The total nominal exceeds the available budget.');
return redirect()->back();
}
@@ -574,6 +598,8 @@ class FormUpCountryController extends Controller
try {
$form->update([
'rayon_id' => $request->rayon_id,
'cabang_id' => $cabang->id, // <--- REPARASI: Memastikan Cabang ID tersimpan akurat saat update data
'kategori_id' => $kategori->id ?? null, // RE-SUNTIK KATEGORI_ID SAAT UPDATE
'tanggal' => $request->tanggal,
'tujuan' => $request->tujuan,
'jarak' => $request->jarak,
@@ -583,7 +609,7 @@ class FormUpCountryController extends Controller
'hotel' => $data_nominal['hotel'],
'total' => $totalNominal,
'uc_plan' => $ucPlanPath ?? $form->uc_plan,
'account_number' => $kategori->account_number,
'account_number' => $kategori->account_number ?? $form->account_number,
]);
if (!empty($attachmentsPayload)) {
@@ -609,7 +635,7 @@ class FormUpCountryController extends Controller
AuditTrailHelper::AddAuditTrail('Update', 'Update Record at Form Up Country (' . $form->expense_number . ')');
session()->flash('success', 'Form has been updated.');
return redirect()->back();
}
}
public function deleteAttachment(Request $request, $formId, $attachmentId)
{
@@ -717,11 +743,11 @@ class FormUpCountryController extends Controller
foreach ($roles as $role) {
$users = Admin::getUserByRoleName($role)->filter(function ($user) use ($role, $cabang_id, $region_id) {
if ($role === 'Marketing Information System') {
return true; // Tidak ada filter cabang untuk peran ini
return true;
}
if (!$user->cabang || !$user->cabang->cabang) {
return false; // Pastikan user memiliki cabang
return false;
}
if ($role === 'Admin Region' || $role === 'Marketing Operational Manager Region') {
@@ -808,11 +834,11 @@ class FormUpCountryController extends Controller
foreach ($roles as $role) {
$users = Admin::getUserByRoleName($role)->filter(function ($user) use ($role, $cabang_id, $region_id) {
if ($role === 'Marketing Information System' || $role === 'Head of Sales Marketing') {
return true; // Tidak ada filter cabang untuk peran ini
return true;
}
if (!$user->cabang || !$user->cabang->cabang) {
return false; // Pastikan user memiliki cabang
return false;
}
if ($role === 'Admin Region' || $role === 'Marketing Operational Manager Region') {
@@ -867,7 +893,7 @@ class FormUpCountryController extends Controller
return redirect()->back();
}
public function finalApprove($id)
public function finalApprove(Request $request, $id) // <--- MENAMBAHKAN OBJECT REQUEST
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormUpCountry::findOrFail($id);
@@ -877,42 +903,61 @@ class FormUpCountryController extends Controller
return redirect()->back();
}
// Ambil cabang_id dari user yang mengisi form
// ATURAN BISNIS: Batas Akhir Approval adalah tanggal CLOSING_DATE (Bulan Depan tgl 13)
$closingDay = (int) env('CLOSING_DATE', 13);
$startDay = (int) env('STARTING_DATE', 11);
$now = Carbon::now();
$tanggalForm = Carbon::parse($form->tanggal);
// Hitung batas maksimal closing sesuai siklus transaksi form tersebut
if ($tanggalForm->day >= $startDay) {
$maxClosingDate = Carbon::create($tanggalForm->year, $tanggalForm->month, $closingDay)->addMonth()->endOfDay();
} else {
$maxClosingDate = Carbon::create($tanggalForm->year, $tanggalForm->month, $closingDay)->endOfDay();
}
if ($now->gt($maxClosingDate)) {
session()->flash('error', "Gagal, Batas waktu maksimal approval (Closing Date) untuk pengajuan ini telah berakhir pada {$maxClosingDate->format('d M Y H:i')} WIB.");
return redirect()->back();
}
$cabang_id = UserHasCabang::where('user_id', $form->user_id)->first()?->cabang_id;
if (!$cabang_id) {
session()->flash('error', 'Data cabang tidak ditemukan.');
return redirect()->back();
}
// Hitung periode berdasarkan tanggal form
$tanggal = Carbon::parse($form->tanggal);
$startDay = (int) env('STARTING_DATE', 11);
if ($tanggal->day >= $startDay) {
$periodeDate = Carbon::create($tanggal->year, $tanggal->month, $startDay);
if ($tanggalForm->day >= $startDay) {
$periodeDate = Carbon::create($tanggalForm->year, $tanggalForm->month, $startDay);
} else {
$periodeDate = Carbon::create($tanggal->copy()->subMonth()->year, $tanggal->copy()->subMonth()->month, $startDay);
$periodeDate = Carbon::create($tanggalForm->copy()->subMonth()->year, $tanggalForm->copy()->subMonth()->month, $startDay);
}
$periodeMonth = strtolower($periodeDate->format('F'));
$periodeYear = (int) $periodeDate->format('Y');
// MENGAMBIL NILAI AKUMULASI CHECKLIST DARI JAVASCRIPT JS (Fallback ke total awal jika kosong)
$approvedTotal = $request->input('approved_total', $form->total);
// Ambil sisa budget sesuai periode
$availableBudget = BudgetHelper::getAvailableBudget($cabang_id, $periodeMonth, $periodeYear);
if($form->approved_total > $availableBudget) {
if($approvedTotal > $availableBudget) { // <--- DISINKRONKAN DENGAN NILAI BARU HASIL CHECKLIST
session()->flash('error', 'Budget cabang untuk periode ini tidak mencukupi, silahkan ajukan pada periode expense berikutnya');
return redirect()->back();
}
// UPDATE DATABASE SECARA AKURAT BERDASARKAN HASIL PILIHAN CHECKLIST FINANCE
$form->update([
'approved_total' => $approvedTotal, // <--- SUNTIK NOMINAL BARU HASIL CHECKLIST KE DATABASE
'final_approved_at' => now(),
'final_approved_by' => auth()->user()->id,
'status' => 'Closed',
'status' => 'Closed',
]);
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->tanggal;
$total = $form->approved_total;
$total = $form->approved_total; // <--- OTOMATIS MEMAKAI DATA UPDATE TERBARU
$roles = ['Head of Sales Marketing', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
@@ -927,11 +972,11 @@ class FormUpCountryController extends Controller
foreach ($roles as $role) {
$users = Admin::getUserByRoleName($role)->filter(function ($user) use ($role, $cabang_id, $region_id) {
if ($role === 'Marketing Information System' || $role === 'Head of Sales Marketing') {
return true; // Tidak ada filter cabang untuk peran ini
return true;
}
if (!$user->cabang || !$user->cabang->cabang) {
return false; // Pastikan user memiliki cabang
return false;
}
if ($role === 'Admin Region' || $role === 'Marketing Operational Manager Region') {
@@ -985,16 +1030,21 @@ class FormUpCountryController extends Controller
public function reject(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['approval.reject']);
if (!auth()->user()->hasAnyPermission(['approval.reject', 'approval2.reject', 'final_approval.approve'])) {
abort(403, 'Akses Ditolak: Anda tidak memiliki izin untuk melakukan Reject.');
}
$request->validate([
'remarks' => 'required|string|max:500',
'remarks' => 'required|string|max:500',
]);
$form = FormUpCountry::findOrfail($id);
$form->update([
'status' => 'Rejected',
'remarks' => $request->remarks,
'status' => 'Rejected',
'remarks' => $request->remarks,
'rejected_by' => auth()->id(), // SUNTIK DATA AUDIT TRAIL
'rejected_at' => now(), // SUNTIK DATA AUDIT TRAIL
]);
$heads = $form->user->getCabangAndRegionHead();
@@ -1003,53 +1053,37 @@ class FormUpCountryController extends Controller
$tanggal = $form->tanggal;
$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'];
$recipients[] = $heads['cabang_head']['email'];
$phoneNumbers[] = $heads['cabang_head']['phone'];
}
if ($heads['region_head']) {
$recipients[] = $heads['region_head']['email'];
$phoneNumbers[] = $heads['region_head']['phone'];
$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.up-country.view', $form->id);
$url = route('forms.up-country.view', $form->id);
WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name, $request->remarks);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
$mail = new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url,
$request->remarks
);
$response = $brevoService->expenseRejected($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
try {
$mail = new ExpenseRejected($name, $expense_number, $tanggal, $total, $url, $request->remarks);
$brevoService->expenseRejected($recipient, $name, $mail);
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
}
} 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 . ')');
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Up Country (' . $form->expense_number . ') oleh ' . auth()->user()->name);
session()->flash('success', 'Form has been rejected.');
return redirect()->back();
}
@@ -1070,12 +1104,12 @@ class FormUpCountryController extends Controller
return redirect()->back();
}
public function destroy($id)
{
public function destroy($id)
{
$this->checkAuthorization(auth()->user(), ['forms.country.delete']);
$role = auth()->user()->getRoleNames()[0];
$form = FormUpCountry::findOrfail($id);
$form = FormUpCountry::findOrfail($id);
if($form->status != 'On Progress' && $role == 'Medical Representatif') {
session()->flash('error', 'You cannot edit this form because it has been approved or rejected.');
return redirect()->back();
@@ -1083,9 +1117,9 @@ class FormUpCountryController extends Controller
AuditTrailHelper::AddAuditTrail('Delete', 'Delete Record at Form Up Country (' . $form->expense_number . ')');
$form->delete();
$form->delete();
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
}
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
}
app/Http/Controllers/Forms/FormVehicleController.php
+107 -86
View File
@@ -68,7 +68,7 @@ class FormVehicleController extends Controller
$role = auth()->user()->getRoleNames()[0];
$startDay = (int) env('STARTING_DATE', 11);
$closingDay = (int) env('CLOSING_DATE', 10);
$closingDay = (int) env('CLOSING_DATE', 13);
// Referensi waktu sekarang
$now = Carbon::now();
@@ -173,17 +173,17 @@ class FormVehicleController extends Controller
]);
}
public function create()
{
public function create()
{
$this->checkAuthorization(auth()->user(), ['forms.vehicle.create']);
return view('backend.pages.forms.vehicle.create', [
return view('backend.pages.forms.vehicle.create', [
'attachmentCategories' => $this->attachmentCategories,
]);
}
}
public function store(Request $request)
{
public function store(Request $request)
{
$this->checkAuthorization(auth()->user(), ['forms.vehicle.create']);
$validator = Validator::make($request->all(), [
'tanggal' => 'required',
@@ -226,23 +226,27 @@ class FormVehicleController extends Controller
$validator->validate();
$tanggal = Carbon::parse($request->tanggal);
// PEMBATASAN INPUT MENGGUNAKAN STARTING_DATE & INPUT_MAX_DATE
$startDay = (int) env('STARTING_DATE', 11);
$closingDay = (int) env('CLOSING_DATE', 10);
$inputMaxDay = (int) env('INPUT_MAX_DATE', 10);
$now = Carbon::now();
// Tentukan periode input berdasarkan waktu saat ini
// Tentukan periode aktif berdasarkan tanggal saat ini
if ($now->day >= $startDay) {
$startDate = Carbon::create($now->year, $now->month, $startDay);
$closingDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $closingDay);
// Jendela Aktif: Tgl 11 Bulan Ini s/d Tgl 10 Bulan Depan
$startDate = Carbon::create($now->year, $now->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $inputMaxDay)->endOfDay();
} else {
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay);
$closingDate = Carbon::create($now->year, $now->month, $closingDay);
// Jendela Aktif: Tgl 11 Bulan Lalu s/d Tgl 10 Bulan Ini
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->year, $now->month, $inputMaxDay)->endOfDay();
}
// Validasi apakah tanggal form berada dalam periode input
if ($tanggal->lt($startDate) || $tanggal->gt($closingDate)) {
session()->flash('error', "Gagal, tanggal tidak berada dalam periode input: {$startDate->format('d M')} - {$closingDate->format('d M')}");
return redirect()->back();
// Validasi apakah tanggal pengajuan masuk ke periode input saat ini
if ($tanggal->lt($startDate) || $tanggal->gt($maxInputDate)) {
session()->flash('error', "Gagal, tanggal expense tidak berada dalam batas waktu input yang diizinkan: {$startDate->format('d M Y')} - {$maxInputDate->format('d M Y')}");
return redirect()->back()->withInput();
}
// Ambil cabang user
@@ -252,7 +256,7 @@ class FormVehicleController extends Controller
return redirect()->back();
}
// Tentukan periode budget berdasarkan tanggal input (bukan now)
// Tentukan periode budget dari tanggal input
if ($tanggal->day >= $startDay) {
$periodeDate = Carbon::create($tanggal->year, $tanggal->month, $startDay);
} else {
@@ -266,18 +270,19 @@ class FormVehicleController extends Controller
$availableBudget = BudgetHelper::getAvailableBudget($cabang->id, $periodeMonth, $periodeYear);
if($request->total > $availableBudget) {
session()->flash('error', 'Alokasi budget bulanan cabang tidak mencukupi,silahkan ajukan pada periode expense berikutnya');
return redirect()->back();
return redirect()->back()->withInput();
}
$region = Region::where('id', $cabang->region_id)->first();
$kategori = Kategori::where('name', 'Vehicle Running Cost')->first();
// REPARASI SUNTIK KATEGORI: Penggunaan LIKE untuk toleransi kecocokan spasi
$kategori = Kategori::where('name', 'LIKE', '%Vehicle Running Cost%')->first();
$folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/vehicle';
$attachmentsPayload = $this->buildAttachmentPayload($request, $folderPath);
// Generate sequence number and expense number
$sequence_number = FormVehicleRunningCost::withTrashed()->where('expense_number', 'like', $region->code . '-' . $cabang->code . '-VHC-' . date('ym') . '%')->count() + 1;
$sequence_number = FormVehicleRunningCost::withTrashed()->where('expense_number', 'like', $region->code . '-' . $cabang->code . '-VHC-' . date('ym') . '%')->count() + 1;
$formatted_sequence_number = str_pad($sequence_number, 4, '0', STR_PAD_LEFT);
$expense_number = $region->code . '-' . $cabang->code . '-VHC-' . date('ym') . $formatted_sequence_number;
@@ -286,6 +291,8 @@ class FormVehicleController extends Controller
$form = FormVehicleRunningCost::create([
'expense_number' => $expense_number,
'user_id' => auth()->user()->id,
'cabang_id' => $cabang->id, // <--- REPARASI SUNTIK CABANG ID
'kategori_id' => $kategori->id ?? null, // <--- REPARASI SUNTIK KATEGORI ID
'tanggal' => $request->tanggal,
'type' => $request->type,
'liter' => $request->liter ?? 0,
@@ -295,7 +302,7 @@ class FormVehicleController extends Controller
'nopol' => $request->nopol ?? '-',
'keterangan' => $request->keterangan,
'bukti_total' => null,
'account_number' => $kategori->account_number,
'account_number' => $kategori->account_number ?? null,
'status' => 'On Progress',
]);
@@ -399,10 +406,10 @@ class FormVehicleController extends Controller
AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Expense at Form Vehicle Running Cost (' . $expense_number . ')');
session()->flash('success', 'Form has been created.');
return redirect()->back();
}
}
public function edit($id)
{
public function edit($id)
{
$this->checkAuthorization(auth()->user(), ['forms.vehicle.edit']);
$role = auth()->user()->getRoleNames()[0];
@@ -412,30 +419,48 @@ class FormVehicleController extends Controller
return redirect()->back();
}
return view('backend.pages.forms.vehicle.edit', [
return view('backend.pages.forms.vehicle.edit', [
'form' => $form,
'attachments' => $this->formatAttachmentCollection($form),
'attachmentCategories' => $this->attachmentCategories,
]);
}
]);
}
public function update(Request $request, $id)
{
public function update(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['forms.vehicle.edit']);
$role = auth()->user()->getRoleNames()[0];
$form = FormVehicleRunningCost::with('attachments')->findOrFail($id);
// Ambil cabang ID dari user yang mengisi form
$cabang_id = UserHasCabang::where('user_id', $form->user_id)->first()?->cabang_id;
if (!$cabang_id) {
$cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()?->cabang;
if (!$cabang) {
session()->flash('error', 'Data cabang tidak ditemukan.');
return redirect()->back();
}
// Hitung periode berdasarkan tanggal input
$tanggal = Carbon::parse($request->tanggal);
// PEMBATASAN INPUT MENGGUNAKAN STARTING_DATE & INPUT_MAX_DATE
$startDay = (int) env('STARTING_DATE', 11);
$inputMaxDay = (int) env('INPUT_MAX_DATE', 10);
$now = Carbon::now();
if ($now->day >= $startDay) {
$startDate = Carbon::create($now->year, $now->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->copy()->addMonth()->year, $now->copy()->addMonth()->month, $inputMaxDay)->endOfDay();
} else {
$startDate = Carbon::create($now->copy()->subMonth()->year, $now->copy()->subMonth()->month, $startDay)->startOfDay();
$maxInputDate = Carbon::create($now->year, $now->month, $inputMaxDay)->endOfDay();
}
// Validasi apakah tanggal pengajuan masuk ke periode input saat ini
if ($tanggal->lt($startDate) || $tanggal->gt($maxInputDate)) {
session()->flash('error', "Gagal, tanggal expense tidak berada dalam batas waktu input yang diizinkan: {$startDate->format('d M Y')} - {$maxInputDate->format('d M Y')}");
return redirect()->back()->withInput();
}
// Hitung periode dari tanggal form yang diinput
if ($tanggal->day >= $startDay) {
$periodeDate = Carbon::create($tanggal->year, $tanggal->month, $startDay);
} else {
@@ -446,7 +471,7 @@ class FormVehicleController extends Controller
$periodeYear = (int) $periodeDate->format('Y');
// Hitung sisa budget
$availableBudget = BudgetHelper::getAvailableBudget($cabang_id, $periodeMonth, $periodeYear);
$availableBudget = BudgetHelper::getAvailableBudget($cabang->id, $periodeMonth, $periodeYear);
// Validasi input
$validator = Validator::make($request->all(), [
@@ -494,9 +519,9 @@ class FormVehicleController extends Controller
return redirect()->back();
}
$cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()->cabang;
$region = Region::where('id', $cabang->region_id)->first();
$kategori = Kategori::where('name', 'Vehicle Running Cost')->first();
// REPARASI SUNTIK KATEGORI_ID SAAT UPDATE
$kategori = Kategori::where('name', 'LIKE', '%Vehicle Running Cost%')->first();
$folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/vehicle';
@@ -505,6 +530,8 @@ class FormVehicleController extends Controller
DB::beginTransaction();
try {
$form->update([
'cabang_id' => $cabang->id, // <--- REPARASI SUNTIK CABANG_ID
'kategori_id' => $kategori->id ?? null, // <--- REPARASI SUNTIK KATEGORI_ID
'tanggal' => $request->tanggal,
'type' => $request->type,
'liter' => $request->liter ?? 0,
@@ -514,7 +541,7 @@ class FormVehicleController extends Controller
'nopol' => $request->nopol ?? '-',
'keterangan' => $request->keterangan,
'bukti_total' => $form->bukti_total,
'account_number' => $kategori->account_number,
'account_number' => $kategori->account_number ?? $form->account_number,
'status' => 'On Progress',
]);
@@ -542,7 +569,7 @@ class FormVehicleController extends Controller
AuditTrailHelper::AddAuditTrail('Update', 'Update Record at Form Vehicle Running Cost (' . $form->expense_number . ')');
session()->flash('success', 'Form has been updated.');
return redirect()->back();
}
}
public function deleteAttachment(Request $request, $formId, $attachmentId)
{
@@ -755,7 +782,8 @@ class FormVehicleController extends Controller
return redirect()->back();
}
public function finalApprove($id)
// <--- REPARASI SUNTIKAN REQUEST DARI JAVASCRIPT MODAL AGAR DATA BISA DIAMBIL
public function finalApprove(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormVehicleRunningCost::findOrFail($id);
@@ -785,23 +813,27 @@ class FormVehicleController extends Controller
$periodeMonth = strtolower($periodeDate->format('F'));
$periodeYear = (int) $periodeDate->format('Y');
// Hitung sisa budget cabang di periode tersebut
// <--- REPARASI: Penangkapan nilai payload dari checkbox JavaScript
$approvedTotal = $request->input('approved_total', $form->total);
// Hitung sisa budget cabang di periode tersebut disinkronisasi dengan variabel kalkulasi terbaru
$availableBudget = BudgetHelper::getAvailableBudget($cabang_id, $periodeMonth, $periodeYear);
if($form->approved_total > $availableBudget) {
if($approvedTotal > $availableBudget) {
session()->flash('error', 'Budget cabang untuk periode ini tidak mencukupi, silahkan ajukan pada periode expense berikutnya');
return redirect()->back();
}
$form->update([
'approved_total' => $approvedTotal, // <--- SUNTIK DATA UPDATE HASIL CHECKLIST
'final_approved_at' => now(),
'final_approved_by' => auth()->user()->id,
'status' => 'Closed',
'status' => 'Closed',
]);
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->created_at;
$total = $form->approved_total;
$total = $form->approved_total; // <--- TOTAL BARU YANG DIKIRIMKAN KE EMAIL / WHATSAPP
$roles = ['Head of Sales Marketing', 'Marketing Operational Manager Region'];
$recipients = [$form->user->email, auth()->user()->email];
@@ -874,75 +906,64 @@ class FormVehicleController extends Controller
}
public function reject(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['approval.reject']);
{
if (!auth()->user()->hasAnyPermission(['approval.reject', 'approval2.reject', 'final_approval.approve'])) {
abort(403, 'Akses Ditolak: Anda tidak memiliki izin untuk melakukan Reject.');
}
$request->validate([
'remarks' => 'required|string|max:500',
'remarks' => 'required|string|max:500',
]);
$form = FormVehicleRunningCost::findOrfail($id);
$form->update([
'status' => 'Rejected',
'remarks' => $request->remarks,
]);
'status' => 'Rejected',
'remarks' => $request->remarks,
'rejected_by' => auth()->id(), // Kolom baru
'rejected_at' => now(), // Kolom baru
]);
$heads = $form->user->getCabangAndRegionHead();
$name = $form->user->name;
$expense_number = $form->expense_number;
$tanggal = $form->created_at;
$tanggal = $form->tanggal;
$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'];
$recipients[] = $heads['cabang_head']['email'];
$phoneNumbers[] = $heads['cabang_head']['phone'];
}
if ($heads['region_head']) {
$recipients[] = $heads['region_head']['email'];
$phoneNumbers[] = $heads['region_head']['phone'];
$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.vehicle.view', $form->id);
WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name, $request->remarks);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
$mail = new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url,
$request->remarks
);
$response = $brevoService->expenseRejected($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
try {
$mail = new ExpenseRejected($name, $expense_number, $tanggal, $total, $url, $request->remarks);
$brevoService->expenseRejected($recipient, $name, $mail);
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
}
}
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Vehicle Running Cost (' . $form->expense_number . ')');
AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Vehicle Running Cost (' . $form->expense_number . ') oleh ' . auth()->user()->name);
session()->flash('success', 'Form has been rejected.');
return redirect()->back();
}
}
public function open($id)
{
@@ -960,12 +981,12 @@ class FormVehicleController extends Controller
return redirect()->back();
}
public function destroy($id)
{
public function destroy($id)
{
$this->checkAuthorization(auth()->user(), ['forms.vehicle.delete']);
$role = auth()->user()->getRoleNames()[0];
$form = FormVehicleRunningCost::findOrfail($id);
$form = FormVehicleRunningCost::findOrfail($id);
if($form->status != 'On Progress' && $role == 'Medical Representatif') {
session()->flash('error', 'You cannot edit this form because it has been approved or rejected.');
return redirect()->back();
@@ -973,11 +994,11 @@ class FormVehicleController extends Controller
AuditTrailHelper::AddAuditTrail('Delete', 'Delete Record at Form Vehicle Running Cost (' . $form->expense_number . ')');
$form->delete();
$form->delete();
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
protected function formatAttachmentCollection(FormVehicleRunningCost $form): array
{
@@ -1080,4 +1101,4 @@ class FormVehicleController extends Controller
return $payload;
}
}
}