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

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
@@ -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;
}
}
}