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

enhance point 6,7,8,9,10 & Fixing bugs point 1, 2

Browse Source
This commit is contained in:
Fiqh Pratama
2025-10-13 00:29:49 +07:00
parent 2e3126ea29
commit 65d176e6b2
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+18 -2
View File
@@ -193,7 +193,15 @@ class FormEntertainmentPresentationController extends Controller
} }
$region = Region::where('id', $cabang->region_id)->first(); $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 = []; $filePaths = [];
$folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/entertainment'; $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; $cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()->cabang;
$region = Region::where('id', $cabang->region_id)->first(); $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 = []; $filePaths = [];
$folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/entertainment'; $folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/entertainment';
app/Http/Controllers/Forms/FormOtherController.php
+2 -2
View File
@@ -141,7 +141,7 @@ class FormOtherController extends Controller
$this->checkAuthorization(auth()->user(), ['forms.other.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', ['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', [ return view('backend.pages.forms.other.edit', [
'form' => $form, '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()
]); ]);
} }