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