diff --git a/app/Http/Controllers/Auth/User/LoginController.php b/app/Http/Controllers/Auth/User/LoginController.php deleted file mode 100644 index e69de29..0000000 diff --git a/app/Http/Controllers/Backend/AdminsController.php b/app/Http/Controllers/Backend/AdminsController.php index ee7517d..bea6fa7 100644 --- a/app/Http/Controllers/Backend/AdminsController.php +++ b/app/Http/Controllers/Backend/AdminsController.php @@ -56,6 +56,7 @@ class AdminsController extends Controller $admin->password = Hash::make($request->password); $admin->username = $request->username; $admin->email = $request->email; + $admin->phone = $request->phone; $admin->save(); if ($request->roles) { @@ -93,6 +94,7 @@ class AdminsController extends Controller $admin->name = $request->name; $admin->email = $request->email; $admin->username = $request->username; + $admin->phone = $request->phone; if ($request->password) { $admin->password = Hash::make($request->password); @@ -104,7 +106,7 @@ class AdminsController extends Controller } session()->flash('success', 'Admin has been updated.'); - return back(); + return redirect()->route('admin.admins.index'); } public function destroy(int $id): RedirectResponse @@ -114,6 +116,6 @@ class AdminsController extends Controller $admin = Admin::findOrFail($id); $admin->delete(); session()->flash('success', 'Admin has been deleted.'); - return back(); + return redirect()->route('admin.admins.index'); } } \ No newline at end of file diff --git a/app/Http/Controllers/Backend/RolesController.php b/app/Http/Controllers/Backend/RolesController.php index 4755215..07affb2 100644 --- a/app/Http/Controllers/Backend/RolesController.php +++ b/app/Http/Controllers/Backend/RolesController.php @@ -104,7 +104,7 @@ class RolesController extends Controller } session()->flash('success', 'Role has been updated.'); - return back(); + return redirect()->route('admin.roles.index'); } public function destroy(int $id): RedirectResponse diff --git a/app/Http/Controllers/Forms/FormUpCountryController.php b/app/Http/Controllers/Forms/FormUpCountryController.php new file mode 100644 index 0000000..e28fa01 --- /dev/null +++ b/app/Http/Controllers/Forms/FormUpCountryController.php @@ -0,0 +1,45 @@ + Rayon::all() + ]); + } + + public function store() + { + + } + + public function edit() + { + return view('backend.pages.forms.upcountry.edit', [ + 'rayons' => Rayon::all() + ]); + } + + public function update() + { + + } + + public function destroy() + { + + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Master/CategoryController.php b/app/Http/Controllers/Master/CategoryController.php new file mode 100644 index 0000000..32f3d1c --- /dev/null +++ b/app/Http/Controllers/Master/CategoryController.php @@ -0,0 +1,69 @@ + Kategori::all() + ]); + } + + public function create() + { + return view('backend.pages.master.category.create'); + } + + public function store(Request $request) + { + $request->validate([ + 'name' => 'required|unique:kategori,name', + 'account_number' => 'required|unique:kategori,account_number' + ]); + + Kategori::create([ + 'name' => $request->name, + 'account_number' => $request->account_number + ]); + + session()->flash('success', 'Category has been created.'); + return redirect()->route('admin.category.index'); + } + + public function edit($id) + { + return view('backend.pages.master.category.edit', [ + 'category' => Kategori::findOrfail($id) + ]); + } + + public function update(Request $request, $id) + { + $request->validate([ + 'name' => 'required|unique:kategori,name,' . $id . ',id', + 'account_number' => 'required|unique:kategori,account_number,' . $id . ',id' + ]); + + Kategori::findOrfail($id)->update([ + 'name' => $request->name, + 'account_number' => $request->account_number + ]); + + session()->flash('success', 'Category has been updated.'); + return redirect()->route('admin.category.index'); + } + + public function destroy($id) + { + Kategori::findOrfail($id)->delete(); + + session()->flash('success', 'Category has been deleted.'); + return redirect()->route('admin.category.index'); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Master/CostCentreController.php b/app/Http/Controllers/Master/CostCentreController.php new file mode 100644 index 0000000..1c9bb54 --- /dev/null +++ b/app/Http/Controllers/Master/CostCentreController.php @@ -0,0 +1,69 @@ + CostCentre::all() + ]); + } + + public function create() + { + return view('backend.pages.master.cost.create'); + } + + public function store(Request $request) + { + $request->validate([ + 'code' => 'required|unique:cost_centre,code', + 'name' => 'required|unique:cost_centre,name' + ]); + + CostCentre::create([ + 'code' => $request->code, + 'name' => $request->name + ]); + + session()->flash('success', 'Cost Centre has been created.'); + return redirect()->route('admin.cost.index'); + } + + public function edit($id) + { + return view('backend.pages.master.cost.edit', [ + 'cost' => CostCentre::findOrfail($id) + ]); + } + + public function update(Request $request, $id) + { + $request->validate([ + 'code' => 'required|unique:cost_centre,code,' . $id . ',id', + 'name' => 'required|unique:cost_centre,name,' . $id . ',id' + ]); + + CostCentre::findOrfail($id)->update([ + 'code' => $request->code, + 'name' => $request->name + ]); + + session()->flash('success', 'Cost has been updated.'); + return redirect()->route('admin.cost.index'); + } + + public function destroy($id) + { + CostCentre::findOrfail($id)->delete(); + + session()->flash('success', 'Cost has been deleted.'); + return redirect()->route('admin.cost.index'); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Master/RayonController.php b/app/Http/Controllers/Master/RayonController.php new file mode 100644 index 0000000..9bdcda0 --- /dev/null +++ b/app/Http/Controllers/Master/RayonController.php @@ -0,0 +1,69 @@ + Rayon::all() + ]); + } + + public function create() + { + return view('backend.pages.master.rayon.create'); + } + + public function store(Request $request) + { + $request->validate([ + 'code' => 'required|unique:rayon,code', + 'name' => 'required|unique:rayon,name' + ]); + + Rayon::create([ + 'code' => $request->code, + 'name' => $request->name + ]); + + session()->flash('success', 'Rayon has been created.'); + return redirect()->route('admin.rayon.index'); + } + + public function edit($id) + { + return view('backend.pages.master.rayon.edit', [ + 'rayon' => Rayon::findOrfail($id) + ]); + } + + public function update(Request $request, $id) + { + $request->validate([ + 'code' => 'required|unique:rayon,code,' . $id . ',id', + 'name' => 'required|unique:rayon,name,' . $id . ',id' + ]); + + Rayon::findOrfail($id)->update([ + 'code' => $request->code, + 'name' => $request->name + ]); + + session()->flash('success', 'Rayon has been updated.'); + return redirect()->route('admin.rayon.index'); + } + + public function destroy($id) + { + Rayon::findOrfail($id)->delete(); + + session()->flash('success', 'Rayon has been deleted.'); + return redirect()->route('admin.rayon.index'); + } +} \ No newline at end of file diff --git a/app/Http/Middleware/MenuMiddleware.php b/app/Http/Middleware/MenuMiddleware.php index 18c8d57..14e0c69 100644 --- a/app/Http/Middleware/MenuMiddleware.php +++ b/app/Http/Middleware/MenuMiddleware.php @@ -7,7 +7,6 @@ use Spatie\Menu\Laravel\Facades\Menu; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Auth; - class MenuMiddleware { @@ -42,9 +41,7 @@ class MenuMiddleware WHERE m.parent_id IS NULL AND rm.role_id = '".$currentRoleId."' ORDER BY m.id "); - - - + foreach ($menus as $item) { // Ambil submenu jika ada $children = DB::select(" @@ -77,7 +74,7 @@ class MenuMiddleware '
' . $item->title . '
' . + '' . $item->title . '
' . '' . $submenu->render() . '| # | +Code | +Nama | +Aksi | +
|---|---|---|---|
| {{ $loop->index + 1 }} | +{{ $cost->code }} | +{{ $cost->name }} | ++ @if (auth()->user()->can('admin.edit')) + Edit + @endif + @if (auth()->user()->can('admin.delete')) + + {{ __('Delete') }} + + + + @endif + | +
| # | +Code | +Nama | +Aksi | +
|---|---|---|---|
| {{ $loop->index + 1 }} | +{{ $rayon->code }} | +{{ $rayon->name }} | ++ @if (auth()->user()->can('admin.edit')) + Edit + @endif + @if (auth()->user()->can('admin.delete')) + + {{ __('Delete') }} + + + + @endif + | +