From fd3586cf76125aa7e8968da3b12123a1433e0546 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Mon, 25 Apr 2022 10:40:22 +0800
Subject: [PATCH] update taraf 2504

---
 app/Http/Controllers/PenggunaController.php    |  8 ++++++--
 .../views/pengurusanpengguna/index.blade.php   | 18 +++++++++++-------
 .../views/pengurusanpengguna/show.blade.php    | 11 +----------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php
index dfebf494..b1b0ecb4 100644
--- a/app/Http/Controllers/PenggunaController.php
+++ b/app/Http/Controllers/PenggunaController.php
@@ -36,9 +36,11 @@ class PenggunaController extends Controller
         $alluser = User::with('roles')->get();
         $allroles = Role::all()->pluck('name');
         $caw = Cawangan::all();
+        $user = User::with('roles')->first();
+        $userroles = $user->getRoleNames()->toArray();
         // $user =  Auth::user();
         // $user->assignRole('admin');
-        return view('pengurusanpengguna.index',compact('alluser','allroles','caw'));
+        return view('pengurusanpengguna.index',compact('alluser','allroles','caw','user','userroles'));
     }
 
 
@@ -81,8 +83,10 @@ class PenggunaController extends Controller
         $user->status = 'active';
         $user->t_daftar = $currentdate;
         $user->email = $request->email;
-        $user->password = 123;
+        $user->email_verified_at = $currentdate;
+        $user->password = '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi'; //password
         $user->user_type = 1;
+       // $user->user_type = 1;
         $user->save();
 
         return redirect()->route('pengguna.index')
diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php
index 25a331b0..3041a067 100644
--- a/resources/views/pengurusanpengguna/index.blade.php
+++ b/resources/views/pengurusanpengguna/index.blade.php
@@ -92,10 +92,9 @@
                       </div>
                     </div>
 
-                  <div class="form-row">
+                   <div class="form-row">
                         <div class="form-group col-md-6">
-                        <label for="caw" class="col-sm-1 col-form-label">Cawangan</label>
-                        <div class="col-sm-6">
+                        <label for="name">Cawangan</label>
                             <select class="custom-select" name="caw" id="caw">
                             <option value="">Pilih Cawangan</option>
                             @foreach ($caw as $item)
@@ -104,14 +103,19 @@
         
                             <!-- <option value="all">Select All</option> -->
                             </select>
-                        </div>
-`                   </div>
-
-                    <div class="form-group col-md-6">
+                   </div>
+                     <div class="form-group col-md-6">
                           <label for="email">Email</label>
                           <input type="email" class="form-control" name="email" id="email" >
                         </div>
                       </div>
+
+                    <div class="form-row">
+                    <div class="form-group col-md-9">
+                      
+                    </div>
+                </div>
+               
                   </form>
             </div>
             <div class="modal-footer">
diff --git a/resources/views/pengurusanpengguna/show.blade.php b/resources/views/pengurusanpengguna/show.blade.php
index 2c9bc628..e8b35f4e 100644
--- a/resources/views/pengurusanpengguna/show.blade.php
+++ b/resources/views/pengurusanpengguna/show.blade.php
@@ -33,7 +33,7 @@
                         @endforeach
                     </div>
                 </div>
-                @if($user->user_type == 2)
+                @if($user->user_type == 1)
                 <div class="d-flex form-group">
                     <div class="d-flex col-md-6">
                         <div style="margin-right:2%;">
@@ -44,15 +44,6 @@
                             <label class="custom-control-label" for="customSwitch1" data-status="{{ $user->status }}" id="txtstatus"></lable>
                         </div>
                     </div>
-                    <div class="d-flex col-md-6">
-                    <div style="margin-right:2%;">
-                        <label for="status1">Ban</label>
-                        </div>
-                        <div class="custom-control custom-switch" >
-                            <input type="checkbox" class="custom-control-input" style="background-color:red !important" name="statusban" id="customSwitch2" onchange="showban(this)">
-                            <label class="custom-control-label" for="customSwitch2" id="txtstatusban"></lable>
-                        </div>
-                    </div>
                 </div>
                 @endif
                 <div class="text-right pt-4">