update save pengguna

app/Http/Controllers/PenggunaController.php

@@ -33,29 +33,33 @@ class PenggunaController extends Controller
     public function index()
     {
         // $alluser = User::all();
-        $alluser = User::with('roles')->orderBy('id')->get();
+        $alluser = User::with('roles','cawangan')->whereHas("roles", function($q) {
+            $q->where("id",'!=', 8);})
+            ->get();
+        // dd($alluser);
         $allroles = Role::all();
         $allRolesPluck= $allroles->pluck('name');
         $caw = Cawangan::all();
-        $user = User::with('roles')->first();
-        $userroles = $user->getRoleNames()->toArray();
+        // $user = User::with('roles')->first();
+        // // dd($user);
+        // $userroles = $user->getRoleNames()->toArray();
         // $user =  Auth::user();
         // $user->assignRole('admin');
-        return view('pengurusanpengguna.index',compact('alluser','allroles','caw','user','userroles', 'allRolesPluck'));
+        return view('pengurusanpengguna.index',compact('alluser','allroles','caw', 'allRolesPluck'));
     }
 
 
     public function show(Request $request, $userid)
     {
         // dd($userid);
-        $user = User::where('id','=',$userid)->with('roles')->first();
+        $user = User::where('id','=',$userid)->with('roles','cawangan')->first();
         $userroles = $user->getRoleNames()->toArray();
-        
+        $caw = Cawangan::all();
         $allroles = Role::all()->pluck('name');
         
         // $active = User::where('id','=',$userid)->update('status', 1);
 
-        return view('pengurusanpengguna.show',compact('user','allroles','userroles'));
+        return view('pengurusanpengguna.show',compact('user','allroles','userroles','caw'));
     }
 
     public function storepengguna(Request $request)
@@ -142,10 +146,12 @@ class PenggunaController extends Controller
         }
 
         $user = User::where('id','=',$request->userid)->first();
-        // dd($user);
+        // dd($request->caw);
+        $user->name = $request->name;
         $user->email = $request->emel;
-        $user->notelbimbit = $request->notelbimbit;
-        $user->nokp = $request->nokp;
+        $user->kodcaw = $request->caw;
+        // $user->notelbimbit = $request->notelbimbit;
+        // $user->nokp = $request->nokp;
         $user->updated_at = $currentdate;
         $user->status = $status;
         
@@ -298,7 +304,11 @@ class PenggunaController extends Controller
         {
             if($request->type == 'User')
             {
-                $data = $model_name::with('roles')->get();
+                // $data = $model_name::with('roles')->get();
+                $data = User::with('roles','cawangan')->whereHas("roles", function($q) {
+                    $q->where("id",'!=', 8);})
+                    ->get();
+
             }
             else{
                 $data = $model_name::all();