Merged in bugfix/auditTrail (pull request #224)

Bugfix/auditTrail

app/Http/Controllers/Auth/LoginController.php

@@ -13,6 +13,7 @@ use Illuminate\Support\Facades\Http;
 
 use App\Dashboard;
 use App\User;
+use Carbon\Carbon;
 
 class LoginController extends Controller
 {
@@ -62,6 +63,7 @@ class LoginController extends Controller
         $credentials = $request->only('email', 'password');
 
         if (Auth::guard('web')->attempt($credentials)) {
+
             $auth_user = Auth::guard('web')->user();
             $api_url = config('api.url');
             if($auth_user['roles'] == 'teller'){
@@ -147,8 +149,23 @@ class LoginController extends Controller
     }
 
     public function logout(){
+        $current = Carbon::now();
+        $current = new Carbon();
+        $current = $current->toDateString();
+        $auth_user = Auth::guard('web')->user();
         Auth::logout();
         Session::flush();
+        $session = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/logoutsession/' . $auth_user['cawangan'], [
+            'id' => $auth_user['id'],
+            'nama' => $auth_user['name'],
+            'nokp' => $auth_user['no_kp'],
+            'email' => $auth_user['email'],
+            'taraf' => $auth_user['role_harian'],
+            'tarikh' => $current,
+            
+
+        ]);
+
         return Redirect::to('/');
     }
 

app/Http/Controllers/ChangePasswordController.php

@@ -8,6 +8,7 @@ use App\Rules\MatchOldPassword;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Http;
 use App\User;
+use Carbon\Carbon;
 
 class ChangePasswordController extends Controller
 {
@@ -28,7 +29,10 @@ class ChangePasswordController extends Controller
      */
     public function index()
     {
+
+
         $auth_user = Auth::user();
+        // dd($cawangan_info);
         $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
         return view('user.update_password',compact('cawangan_info'));
     }
@@ -40,12 +44,19 @@ class ChangePasswordController extends Controller
      */
     public function store(Request $request)
     {
+        $auth_user = Auth::user();
         $request->validate([
             'current_password' => ['required', new MatchOldPassword],
             'new_password' => ['required'],
             'new_confirm_password' => ['same:new_password'],
         ]);
 
+        $id = auth()->user()->id;
+        
+        // dd($auth_user['name']);
+
+        $auth_user = Http::withOptions(['verify' => config('app.api_verify')]) ->post(config('api.url') . '/api/changepassword/' . $auth_user['cawangan'] . '/' . $id, ['nama' => $auth_user['name']])->json();
+
         User::find(auth()->user()->id)->update(['password'=> Hash::make($request->new_password)]);
 
         return redirect()->route('profile');

app/Http/Controllers/HomeController.php

@@ -75,10 +75,30 @@ class HomeController extends Controller
     
                 $countkhazanah = sizeof($gadai) + sizeof($listserah);
     
+                $session = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/logsession/' . $auth_user['cawangan'], [
+                    'id' => $auth_user['id'],
+                    'nama' => $auth_user['name'],
+                    'nokp' => $auth_user['no_kp'],
+                    'email' => $auth_user['email'],
+                    'taraf' => $auth_user['role_harian'],
+                    'tarikh' => $current,
+                    
+        
+                ]);
                 return view('homepage.khazanah.home',compact('cawangan_info','api_url','countkhazanah'));
             }
             else{
                 $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+                $session = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/logsession/' . $auth_user['cawangan'], [
+                    'id' => $auth_user['id'],
+                    'nama' => $auth_user['name'],
+                    'nokp' => $auth_user['no_kp'],
+                    'email' => $auth_user['email'],
+                    'taraf' => $auth_user['role_harian'],
+                    'tarikh' => $current,
+                    
+        
+                ]);
                 return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
             }
 

app/Http/Controllers/KakitanganController.php

@@ -199,12 +199,21 @@ class KakitanganController extends Controller
     }
 
     public function tukarcawanganUpdate(Request $request){
+
+        $auth_user = Auth::user();
         $user = User::find($request->user_id);
+
+        $old_data = $user->toArray();
         $user->cawangan = $request->cawangan;
         $user->roles = $request->role;
         $user->role_harian = $request->role;
         $user->save();
         $auth_user = Auth::user();
+        $new_data = $user->toArray();
+
+        $id = auth()->user()->id;
+
+        Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/tukarcawangan/'. $auth_user['cawangan'],['namaoperasi' => $auth_user['name'],'old_data' =>  $old_data,'new_data' => $new_data ])->json();
 
         if($auth_user->roles == 'operasi'){
             return redirect()->route('daftar.kakitangan');

app/Http/Controllers/KhazanahController.php

@@ -389,7 +389,7 @@ class KhazanahController extends Controller
     {
         $auth_user = Auth::user();
 
-        $update=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
+        $update=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode,['nama' => Auth::user()->name])->json();
 
         if($update == 'success')
         {
@@ -951,7 +951,9 @@ class KhazanahController extends Controller
 
           $updaterequest=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[
             'kodlaluan' => $request->teller,
-            'no' => $request->no
+            'no' => $request->no,
+            'jenis' =>'pendahuluan',
+            'khazanah' => Auth::user()->name
 
         ]);
 
@@ -1031,8 +1033,9 @@ class KhazanahController extends Controller
 
           $updaterequest=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[
             'kodlaluan' => $request->teller,
-            'no' => $request->no
+            'no' => $request->no,
-
+            'jenis' => 'serahan',
+            'khazanah' => Auth::user()->name
         ]);
 
         return redirect()->route('khazanah.serahan');
@@ -1936,6 +1939,22 @@ class KhazanahController extends Controller
         $ppc = User::where([['roles','=','ppc'],['cawangan','=',$auth_user['cawangan']]])->first();
         $pc = User::where([['roles','=','pc'],['cawangan','=',$auth_user['cawangan']]])->first();
 
+        $old_data = [
+            'teller' => $teller->pluck('name')->toArray(),
+            'khazanah' => $khazanah->pluck('name')->toArray(),
+            'pc'=> $pc ? $pc->name : null,
+            'ppc' => $ppc ? $ppc->name : null,
+        ];
+
+        $new_data = [
+            'teller' => $teller->pluck('name')->toArray(),
+            'khazanah' => $khazanah->pluck('name')->toArray(),
+            'pc' => $pc ? $pc->name : null,
+            'ppc' => $ppc ? $ppc->name : null,
+        ];
+
+        Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url'). '/api/kakitangan/'. $auth_user['cawangan'], ['namaoperasi' => $auth_user['name'],'new_data' => $new_data])->json();
+
         return view('khazanah.kakitangan',compact('cawangan_info','api_url','teller','khazanah','pc','ppc'));
     }
 

app/Http/Controllers/WakilController.php

@@ -166,6 +166,7 @@ class WakilController extends Controller
                 'no_surat' => $no_surat,
                 'norujukan' => $norujukan,
                 't_cetak' => $t_cetak,
+                'nama' => Auth::user()->name,
 
             ]);
 
@@ -257,6 +258,7 @@ class WakilController extends Controller
                 'no_surat' => $no_surat,
                 'norujukan' => $norujukan,
                 't_cetak' => $t_cetak,
+                'nama' => Auth::user()->name,
 
             ]);