diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php index 8285d13..d319b73 100644 --- a/app/Http/Controllers/CustomersController.php +++ b/app/Http/Controllers/CustomersController.php @@ -11,38 +11,27 @@ class CustomersController extends Controller { public function index(Request $request) { - $menuId = $request->query('menu_id'); - $user = Auth::user(); - $userId = $user->id; + $menuId = $request->query('menu_id') ?? $request->input('menu_id'); + $permissions = $this->permissions[$menuId]?? []; // Avoid undefined index error + $creator = $permissions['allow_create'] ?? 0; + $updater = $permissions['allow_update'] ?? 0; + $destroyer = $permissions['allow_destroy'] ?? 0; - // Ambil role_id yang dimiliki user - $roleIds = DB::table('user_role') - ->where('user_id', $userId) - ->pluck('role_id'); - - // Ambil data akses berdasarkan role_id dan menu_id - $roleAccess = DB::table('role_menu') - ->whereIn('role_id', $roleIds) - ->where('menu_id', $menuId) - ->first(); - - // Pastikan roleAccess tidak null sebelum mengakses properti - $creator = $roleAccess->allow_create ?? 0; - $updater = $roleAccess->allow_update ?? 0; - $destroyer = $roleAccess->allow_destroy ?? 0; - - return view('customers.index', compact('creator', 'updater', 'destroyer')); + return view('customers.index', compact('creator', 'updater', 'destroyer', 'menuId')); } - public function create() + public function create(Request $request) { - return view('customers.create'); + $menuId = $request->query('menu_id'); + return view('customers.create', compact('menuId')); } - public function edit(string $id) + public function edit(Request $request, string $id) { $data = Customer::findOrFail($id); - return view('customers.edit', compact('data')); + $menuId = $request->query('menu_id'); + return view('customers.edit', compact('data', 'menuId')); } - public function upload(){ - return view('customers.upload'); + public function upload(Request $request){ + $menuId = $request->query('menu_id'); + return view('customers.upload', compact('menuId')); } } diff --git a/app/Http/Controllers/Data/AdvertisementController.php b/app/Http/Controllers/Data/AdvertisementController.php index 65275f9..d95c9bd 100644 --- a/app/Http/Controllers/Data/AdvertisementController.php +++ b/app/Http/Controllers/Data/AdvertisementController.php @@ -15,27 +15,14 @@ class AdvertisementController extends Controller */ public function index(Request $request) { - $menuId = $request->query('menu_id'); - $user = Auth::user(); - $userId = $user->id; + $menuId = (int) $request->query('menu_id', 0); + $permissions = $this->permissions[$menuId] ?? []; // Avoid undefined index error - // Ambil role_id yang dimiliki user - $roleIds = DB::table('user_role') - ->where('user_id', $userId) - ->pluck('role_id'); + $creator = $permissions['allow_create'] ?? 0; + $updater = $permissions['allow_update'] ?? 0; + $destroyer = $permissions['allow_destroy'] ?? 0; - // Ambil data akses berdasarkan role_id dan menu_id - $roleAccess = DB::table('role_menu') - ->whereIn('role_id', $roleIds) - ->where('menu_id', $menuId) - ->first(); - - // Pastikan roleAccess tidak null sebelum mengakses properti - $creator = $roleAccess->allow_create ?? 0; - $updater = $roleAccess->allow_update ?? 0; - $destroyer = $roleAccess->allow_destroy ?? 0; - - return view('data.advertisements.index', compact('creator', 'updater', 'destroyer')); + return view('data.advertisements.index', compact('creator', 'updater', 'destroyer','menuId')); } /** @@ -50,8 +37,9 @@ class AdvertisementController extends Controller /** * Show the form for creating a new resource. */ - public function create() + public function create(Request $request) { + $menuId = (int) $request->query('menu_id', 0); $title = 'Advertisement'; $subtitle = 'Create Data'; @@ -68,14 +56,15 @@ class AdvertisementController extends Controller // $route = 'advertisements.create'; // info("AdvertisementController@edit diakses dengan ID: $title"); - return view('data.advertisements.form', compact('title', 'subtitle', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions')); + return view('data.advertisements.form', compact('title', 'subtitle', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions','menuId')); } /** * Show the form for editing the specified resource. */ - public function edit($id) + public function edit(Request $request, $id) { + $menuId = (int) $request->query('menu_id', 0); info("AdvertisementController@edit diakses dengan ID: $id"); $title = 'Advertisement'; $subtitle = 'Update Data'; @@ -107,7 +96,7 @@ class AdvertisementController extends Controller // $route = 'advertisements.update'; // Menggunakan route update untuk form edit // info("AdvertisementController@edit diakses dengan route: $route"); - return view('data.advertisements.form', compact('title', 'subtitle', 'modelInstance', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions')); + return view('data.advertisements.form', compact('title', 'subtitle', 'modelInstance', 'fields', 'fieldTypes', 'apiUrl', 'dropdownOptions', 'menuId')); } private function getFields() diff --git a/resources/js/customers/create.js b/resources/js/customers/create.js index 23aa7af..f28b7bd 100644 --- a/resources/js/customers/create.js +++ b/resources/js/customers/create.js @@ -6,6 +6,7 @@ class CreateCustomer { initCreateCustomer() { const toastNotification = document.getElementById("toastNotification"); const toast = new bootstrap.Toast(toastNotification); + let menuId = document.getElementById("menuId").value; document .getElementById("btnCreateCustomer") .addEventListener("click", async function () { @@ -41,7 +42,7 @@ class CreateCustomer { result.message; toast.show(); setTimeout(() => { - window.location.href = "/data/customers"; + window.location.href = `/data/customers?menu_id=${menuId}`; }, 2000); } else { let error = await response.json(); diff --git a/resources/js/customers/edit.js b/resources/js/customers/edit.js index 5e1df45..a9aaadf 100644 --- a/resources/js/customers/edit.js +++ b/resources/js/customers/edit.js @@ -6,6 +6,7 @@ class UpdateCustomer { initUpdateCustomer() { const toastNotification = document.getElementById("toastNotification"); const toast = new bootstrap.Toast(toastNotification); + let menuId = document.getElementById("menuId").value; document .getElementById("btnUpdateCustomer") .addEventListener("click", async function () { @@ -41,7 +42,7 @@ class UpdateCustomer { result.message; toast.show(); setTimeout(() => { - window.location.href = "/data/customers"; + window.location.href = `/data/customers?menu_id=${menuId}`; }, 2000); } else { let error = await response.json(); diff --git a/resources/js/customers/index.js b/resources/js/customers/index.js index a19bced..6fdd4ca 100644 --- a/resources/js/customers/index.js +++ b/resources/js/customers/index.js @@ -32,6 +32,7 @@ class Customers { tableContainer.innerHTML = ""; let canUpdate = tableContainer.getAttribute("data-updater") === "1"; let canDelete = tableContainer.getAttribute("data-destroyer") === "1"; + let menuId = tableContainer.getAttribute("data-menuId"); this.table = new Grid({ columns: [ "ID", @@ -45,15 +46,15 @@ class Customers { name: "Action", formatter: (cell) => { let buttons = ""; - + if (canUpdate) { buttons += ` - + `; } - + if (canDelete) { buttons += ` `; } - + if (!canUpdate && !canDelete) { buttons = `No Privilege`; } - - return gridjs.html(`