Merge branch 'master' of https://gitlab.com/online-sistem1/kaunter into pipi

app/Http/Controllers/KhazanahController.php

@@ -10,8 +10,6 @@ use App\Events\PendahuluanSerahan;
 use App\Events\NotifikasiKelulusan;
 use App\Events\NotifikasiUbahHapus;
 
-
-
 use App\User;
 use App\Cawangan;
 
@@ -2148,7 +2146,7 @@ class KhazanahController extends Controller
         $api_url = config('api.url');
     
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('Khazanah.laporan.datalejer_am',  compact('cawangan_info', 'api_url'));
+        return view('khazanah.laporan.datalejer_am',  compact('cawangan_info', 'api_url'));
     }
 
     //print lejer_AM

resources/views/khazanah/kakitangan.blade.php

@@ -82,7 +82,7 @@
                             <td>{{ $loop->iteration }}</td>
                             <td>{{ $t['name'] }}</td>
                             <td>{{ $t['cawangan'] }}</td>
-                            <td>{{ $t['roles'] }}</td>
+                            <td>{{ $t['role_harian'] }}</td>
                             </tr>
                             @endforeach
                         </tbody>