From 65d176e6b2e9eebfd3b16439f2d9d1ad925dbd6a Mon Sep 17 00:00:00 2001 From: Fiqh Pratama Date: Mon, 13 Oct 2025 00:29:49 +0700 Subject: [PATCH] enhance point 6,7,8,9,10 & Fixing bugs point 1, 2 --- ...ormEntertainmentPresentationController.php | 20 +++++++++++++++++-- .../Controllers/Forms/FormOtherController.php | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php b/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php index 4987efe..deb3173 100644 --- a/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php +++ b/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php @@ -193,7 +193,15 @@ class FormEntertainmentPresentationController extends Controller } $region = Region::where('id', $cabang->region_id)->first(); - $kategori = Kategori::where('name', 'Entertainment')->first(); + + $kategori = ""; + if (strtolower($request->jenis) == 'entertainment' || $request->jenis == 'entertainment') { + $kategori = Kategori::where('name', 'Entertainment')->first(); + }elseif (strtolower($request->jenis) == 'presentation' || $request->jenis == 'presentation') { + $kategori = Kategori::where('name', 'Presentation')->first(); + }elseif (strtolower($request->jenis) == 'sponsorship' || $request->jenis == 'sponsorship') { + $kategori = Kategori::where('name', 'Sponsorship')->first(); + } $filePaths = []; $folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/entertainment'; @@ -374,7 +382,15 @@ class FormEntertainmentPresentationController extends Controller $cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()->cabang; $region = Region::where('id', $cabang->region_id)->first(); - $kategori = Kategori::where('name', 'Entertainment')->first(); + + $kategori = ""; + if (strtolower($request->jenis) == 'entertainment' || $request->jenis == 'entertainment') { + $kategori = Kategori::where('name', 'Entertainment')->first(); + }elseif (strtolower($request->jenis) == 'presentation' || $request->jenis == 'presentation') { + $kategori = Kategori::where('name', 'Presentation')->first(); + }elseif (strtolower($request->jenis) == 'sponsorship' || $request->jenis == 'sponsorship') { + $kategori = Kategori::where('name', 'Sponsorship')->first(); + } $filePaths = []; $folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/entertainment'; diff --git a/app/Http/Controllers/Forms/FormOtherController.php b/app/Http/Controllers/Forms/FormOtherController.php index 45d9f2b..21b005f 100644 --- a/app/Http/Controllers/Forms/FormOtherController.php +++ b/app/Http/Controllers/Forms/FormOtherController.php @@ -141,7 +141,7 @@ class FormOtherController extends Controller $this->checkAuthorization(auth()->user(), ['forms.other.create']); return view('backend.pages.forms.other.create', [ - 'kategori' => Kategori::whereNotIn('name', ['Up Country', 'Vehicle Running Cost', 'Entertainment', 'Meeting / Seminar'])->get() + 'kategori' => Kategori::whereNotIn('name', ['Up Country', 'Vehicle Running Cost', 'Entertainment','Presentation','Sponsorship', 'Meeting / Seminar'])->get() ]); } @@ -331,7 +331,7 @@ class FormOtherController extends Controller return view('backend.pages.forms.other.edit', [ 'form' => $form, - 'kategori' => Kategori::whereNotIn('name', ['Up Country', 'Vehicle Running Cost', 'Entertainment', 'Meeting / Seminar'])->get() + 'kategori' => Kategori::whereNotIn('name', ['Up Country', 'Vehicle Running Cost', 'Entertainment','Presentation','Sponsorship', 'Meeting / Seminar'])->get() ]); }