Merge branch 'atie' into 'main'

update taraf

See merge request online-sistem1/lelong!18

app/Http/Controllers/PenggunaController.php

@@ -11,6 +11,8 @@ use App\Models\User;
 use Carbon\Carbon;
 use PDF;
 
+use App\Models\Cawangan;
+
 class PenggunaController extends Controller
 {
     /**
@@ -33,9 +35,10 @@ class PenggunaController extends Controller
         // $alluser = User::all();
         $alluser = User::with('roles')->get();
         $allroles = Role::all()->pluck('name');
+        $caw = Cawangan::all();
         // $user =  Auth::user();
         // $user->assignRole('admin');
-        return view('pengurusanpengguna.index',compact('alluser','allroles'));
+        return view('pengurusanpengguna.index',compact('alluser','allroles','caw'));
     }
 
 

resources/views/pengurusanpengguna/index.blade.php

@@ -94,13 +94,18 @@
 
                   <div class="form-row">
                         <div class="form-group col-md-6">
-                          <label for="kodcaw">Kod Cawangan</label>
-                          <label for="kodcaw"></label>
-                            <select id="kodcaw" name="kod cawangan">
-                                 <option>Choose Kod Cawangan</option>
-                                 <option id = "kodcaw" >X0301</option>
-                            </select> 
+                        <label for="caw" class="col-sm-1 col-form-label">Cawangan</label>
+                        <div class="col-sm-6">
+                            <select class="custom-select" name="caw" id="caw">
+                            <option value="">Pilih Cawangan</option>
+                            @foreach ($caw as $item)
+                            <option value="{{$item->id}}">{{$item->caw_name}}</option>
+                            @endforeach
+        
+                            <!-- <option value="all">Select All</option> -->
+                            </select>
                         </div>
+`                   </div>
 
                     <div class="form-group col-md-6">
                           <label for="email">Email</label>