This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user