update revisi 1

app/Http/Controllers/Backend/AdminsController.php

@@ -17,6 +17,8 @@ use App\Models\FormEntertaimentPresentation;
 use App\Models\FormVehicleRunningCost;
 use App\Models\FormOthers;
 use App\Models\FormMeetingSeminar;
+use App\Models\UserHasCabang;
+use App\Models\Cabang;
 
 class AdminsController extends Controller
 {
@@ -24,6 +26,7 @@ class AdminsController extends Controller
     public function index(): Renderable
     {
         $this->checkAuthorization(auth()->user(), ['admin.view']);
+        session()->put('redirect_url', route('admin.admins.index'));
 
         $pageInfo = [
             'title' => 'User Access List',
@@ -33,7 +36,7 @@ class AdminsController extends Controller
 
         return view('backend.pages.admins.index', [
             'admins' => Admin::all(),
-            'pageInfo' => $pageInfo
+            'pageInfo' => $pageInfo,
         ]);
     }
 
@@ -49,7 +52,8 @@ class AdminsController extends Controller
 
         return view('backend.pages.admins.create', [
             'roles' => Role::all(),
-            'pageInfo' => $pageInfo
+            'pageInfo' => $pageInfo,
+            'cabangs' => Cabang::all()
         ]);
     }
 
@@ -65,6 +69,14 @@ class AdminsController extends Controller
         $admin->phone = $request->phone;
         $admin->save();
 
+        // Assign the user to a cabang
+        if($request->cabang_id) {
+            UserHasCabang::create([
+                'user_id' => $admin->id,
+                'cabang_id' => $request->cabang_id
+            ]);
+        }
+
         if ($request->roles) {
             $admin->assignRole($request->roles);
         }
@@ -81,7 +93,7 @@ class AdminsController extends Controller
         // }
 
         session()->flash('success', 'Admin has been created.');
-        return redirect()->route('admin.admins.index');
+        return redirect()->back();
     }
 
     public function edit(int $id): Renderable
@@ -99,7 +111,8 @@ class AdminsController extends Controller
         return view('backend.pages.admins.edit', [
             'admin' => $admin,
             'roles' => Role::all(),
-            'pageInfo' => $pageInfo
+            'pageInfo' => $pageInfo,
+            'cabangs' => Cabang::all()
         ]);
     }
 
@@ -122,8 +135,14 @@ class AdminsController extends Controller
             $admin->assignRole($request->roles);
         }
 
+        // Update the user's cabang
+        if($request->cabang_id) {
+            $userHasCabang = UserHasCabang::where('user_id', $admin->id)->first();
+            $userHasCabang ? $userHasCabang->update(['cabang_id' => $request->cabang_id]) : UserHasCabang::create(['user_id' => $admin->id, 'cabang_id' => $request->cabang_id]);
+        }
+
         session()->flash('success', 'Admin has been updated.');
-        return redirect()->route('admin.admins.index');
+        return redirect()->back();
     }
 
     public function expense($user_id)
@@ -162,6 +181,6 @@ class AdminsController extends Controller
         $admin = Admin::findOrFail($id);
         $admin->delete();
         session()->flash('success', 'Admin has been deleted.');
-        return redirect()->route('admin.admins.index');
+        return redirect()->back();
     }
 }

app/Http/Controllers/Backend/RolesController.php

@@ -17,6 +17,8 @@ class RolesController extends Controller
     public function index(): Renderable
     {
         $this->checkAuthorization(auth()->user(), ['role.view']);
+        session()->put('redirect_url', route('admin.roles.index'));
+
         $pageInfo = [
             'title' => 'List Roles',
             'sub_title' => 'List All User Roles',
@@ -59,7 +61,7 @@ class RolesController extends Controller
         }
 
         session()->flash('success', 'Role has been created.');
-        return redirect()->route('admin.roles.index');
+        return redirect()->back();
     }
 
     public function edit(int $id): Renderable|RedirectResponse
@@ -104,7 +106,7 @@ class RolesController extends Controller
         }
 
         session()->flash('success', 'Role has been updated.');
-        return redirect()->route('admin.roles.index');
+        return redirect()->back();
     }
 
     public function destroy(int $id): RedirectResponse
@@ -119,6 +121,6 @@ class RolesController extends Controller
 
         $role->delete();
         session()->flash('success', 'Role has been deleted.');
-        return redirect()->route('admin.roles.index');
+        return redirect()->back();
     }
 }