Merged in bugfix/auditTrail (pull request #245)

Bugfix/auditTrail

app/Http/Controllers/CustomerController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Audit;
 use App\Marhun;
 use App\BankMaster;
 use App\Customer;
@@ -845,4 +846,83 @@ class CustomerController extends Controller
 
         return response()->json($customer);
     }
+
+    public function changepassword(Request $request, $kodcaw, $id) {
+
+        $current = Carbon::now();
+        // log::info ($request->name);
+        $audit = new Audit();
+        $audit->users = $request->nama;
+        $audit->actions = "Tukar Kata Laluan";
+        // $audit->new_data = json_encode($request->new_password);
+        $audit->kodcaw = $kodcaw;
+        $audit->created_at =  $current;
+        $audit->updated_at =  $current;
+        $audit->save();
+    }
+
+    public function TukarCawangan(Request $request, $kodcaw)
+    {
+
+    $current = Carbon::now();
+    $current = new Carbon();
+
+    // Log::info('dalam tukar taraf');
+    $audit = new Audit();
+    $audit->users = $request->namaoperasi;
+    $audit->actions = "Tukar Cawangan";
+    $audit->old_data = json_encode($request->old_data);
+    $audit->new_data = json_encode($request->new_data);
+    $audit->kodcaw = $kodcaw;
+    $audit->created_at = $current;
+    $audit->updated_at = $current;
+    $audit->save();
+
+    return json_encode(['status'=> 'success']);
+
+    }
+
+    public function kakitangan(Request $request, $kodcaw)
+    {
+    $current = Carbon::now();
+
+    // Log::info('pegesahan kakitangan');
+    $audit = new Audit();
+    $audit->users = $request->namaoperasi;
+    $audit->actions = "pengesahan kakitangan";
+    $audit->old_data = json_encode($request->old_data);
+    $audit->new_data = json_encode($request->new_data);
+    $audit->kodcaw = $kodcaw;
+    $audit->created_at = $current;
+    $audit->updated_at = $current;
+    $audit->save();
+
+    return json_encode(['status'=> 'success']);
+
+    }
+    
+    public function TukarTaraf(Request $request, $kodcaw)
+    {
+
+    // return json_encode(['test'=> 'taraf']);
+    //setiap request perlu htr something
+    $current = Carbon::now();
+    $current = new Carbon();
+
+
+    // Log::info('dalam tukar taraf');
+
+    $audit = new Audit();
+    $audit->users = $request->namaoperasi;
+    $audit->actions = "Tukar Taraf";
+    $audit->old_data = json_encode($request->old_data);
+    $audit->new_data = json_encode($request->new_data);
+    $audit->kodcaw = $kodcaw;
+    $audit->created_at = $current;
+    $audit->updated_at = $current;
+    $audit->save();
+
+    return json_encode(['status'=> 'success']);
+
+    }
 }

app/Http/Controllers/GadaiController.php

@@ -398,6 +398,8 @@ class GadaiController extends Controller
     }
 
     public function cetakSAG($kodcaw,$norujukan,Request $request){
+        $harini = Carbon::now();
+
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $gadai = Gadai::on($cawangan['mysql'])
                 ->where('norujukan','=',$norujukan)
@@ -406,6 +408,16 @@ class GadaiController extends Controller
                     'penilai' => $request->penilai
                     ));
 
+        $audit = new Audit();
+        $audit->users = isset($request->penilai) ? $request->penilai : '';
+        $audit->actions = "Cetak SAG";
+        $audit->norujukan = $request->norujukan;
+        // $audit->new_data = $request->norujukan;
+        $audit->kodcaw = $kodcaw;
+        $audit->created_at = $harini;
+        $audit->updated_at = $harini;
+        $audit->save();
+
         return response()->json($gadai,200);
     }
 

app/Http/Controllers/KelulusanController.php

@@ -1,6 +1,8 @@
 <?php
 
 namespace App\Http\Controllers;
+
+use App\Audit;
 use App\Mohon;
 use App\Cawangan;
 use App\Mohonid;
@@ -41,6 +43,15 @@ class KelulusanController extends Controller
          ->where('masalulus','<>','')
          ->get();
 
+        // $audit = new Audit();
+        // $audit->users = $request->teller;
+        // $audit->actions = "test";
+        // $audit->new_data = $kelulusan;
+        // $audit->kodcaw = $kodcaw;
+        // $audit->created_at = $harini;
+        // $audit->updated_at = $harini;
+        // $audit->save();
+
       return response()->json($kelulusan);
    }
 
@@ -145,6 +156,15 @@ class KelulusanController extends Controller
                      'khazanah' => $request->namakhazanah
             ));
          }
+
+         $audit = new Audit();
+         $audit->users = (isset($request->namaoperasi) ? $request->namaoperasi : '');
+         $audit->actions = "pengesahan kelulusan 75%";
+         $audit->new_data = json_encode($kelulusan);
+         $audit->kodcaw = $kodcaw;
+         $audit->created_at = $harini;
+         $audit->updated_at = $harini;
+         $audit->save();
       }
 
       if($request->sahkan === 1)
@@ -170,6 +190,14 @@ class KelulusanController extends Controller
          ));
       }
 
+      $audit = new Audit();
+      $audit->users = (isset($request->namakhazanah) ? $request->namakhazanah : '');
+      $audit->actions = "Pengesahan Kelulusan 75%";
+      $audit->kodcaw = $kodcaw;
+      $audit->created_at = $harini;
+      $audit->updated_at = $harini;
+      $audit->save();
+
       return response()->json($kelulusan,201);
    }
 
@@ -192,10 +220,9 @@ class KelulusanController extends Controller
 
    }
 
-   public function create(REQUEST $request,$kodcaw,$norujukan,$roles)
+public function create(REQUEST $request,$kodcaw,$norujukan,$roles)
    {
       $harini = Carbon::now();
-      $harini = new Carbon;
 
       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
@@ -245,6 +272,14 @@ class KelulusanController extends Controller
          ]);
       }
 
+      $audit = new Audit();
+      $audit->users = (isset($request->teller) ? $request->teller : '');
+      $audit->actions = "Minta Pengesahan kelulusan 75%";
+      $audit->new_data = json_encode($kelulusan);
+      $audit->kodcaw = $kodcaw;
+      $audit->created_at = $harini;
+      $audit->updated_at = $harini;
+      $audit->save();
 
       return response()->json($kelulusan);
    }

app/Http/Controllers/KomuditiController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Audit;
 use App\Komuditi;
 use App\KomuditiPurchase;
 use App\KomuditiTransaksi;
@@ -41,7 +42,6 @@ class KomuditiController extends Controller
 
     public function beliKomuditi(Request $request){
         $current = Carbon::now();
-        $current = new Carbon();
 
         $komuditi_purchase = KomuditiPurchase::on('mysql7')->create([
             'unit_komuditi' => $request->unit_komuditi,
@@ -64,12 +64,20 @@ class KomuditiController extends Controller
             'harga'=> $request->nilai
         ]);
 
+        $audit = new Audit();
+        $audit->users = $request->purchased_by;
+        $audit->actions = "pembelian komuditi";
+        $audit->new_data = $komuditi_purchase;
+        $audit->kodcaw = $request->kodcaw;
+        $audit->created_at = $current;
+        $audit->updated_at = $current;
+        $audit->save();
+
         return response()->json($komuditi_purchase);
     }
 
     public function jualKomuditi(Request $request){
         $current = Carbon::now();
-        $current = new Carbon();
 
         $komuditi_asal = KomuditiPurchase::on('mysql7')->where('no_sijil','=',$request->nosijil)->latest()->first();
 
@@ -86,6 +94,15 @@ class KomuditiController extends Controller
             'harga'=> $komuditi_asal['nilai']
         ]);
 
+        $audit = new Audit();
+        $audit->users = $request->purchased_by;
+        $audit->actions = "penjualan komuditi";
+        $audit->new_data = $komuditi_asal;
+        $audit->kodcaw = $request->kodcaw;
+        $audit->created_at = $current;
+        $audit->updated_at = $current;
+        $audit->save();
+        
         return response()->json('berjaya');
     }
 

app/Http/Controllers/LelongController.php

@@ -71,11 +71,14 @@ class LelongController extends Controller
         return response()->json($lelong);
     }
 
-    public function showBakiLelong($noic,$jenislelong)
+    public function showBakiLelong($noic,$jenislelong, $kodcaw, Request $request)
+
     {
         $cawangan_all = Cawangan::on('mysql7')->get();
         $bakilelongtotal = 0;
         $rugilelongtotal = 0;
+        $current = Carbon::now();
+        $current = new Carbon();
 
         if($jenislelong == 'baki')
         {
@@ -91,6 +94,20 @@ class LelongController extends Controller
                     }
         }
 
+        $audit = new Audit();
+        $audit->users = $request->teller;
+        $audit->actions = "test2";
+        // $audit->new_data = $bakilelongtotal;
+        $audit->new_data = json_encode([
+            'bakilelongtotal' => $bakilelongtotal,
+            'rugilelongtotal' => $rugilelongtotal,
+        ]);
+        $audit->kodcaw = $kodcaw;
+        $audit->created_at = $current;
+        $audit->updated_at = $current;
+        $audit->save();
+
+
         return response()->json($bakilelongtotal, 200);
 
         }

app/Http/Controllers/LogController.php

@@ -10,6 +10,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
 use Carbon\Carbon;
+use App\Audit;
 
 class LogController extends Controller
 {
@@ -20,7 +21,8 @@ class LogController extends Controller
 
     public function logSession($kodcaw, Request $request)
     {
-            //  dd($request->all());
+        $current = Carbon::now();
+        $current = new Carbon();
 
         $logsession = Logsession::on('mysql7')->where('kodcaw', '=', $kodcaw)
         ->create([
@@ -32,6 +34,18 @@ class LogController extends Controller
 
         ]);
 
+        $audit = new Audit();
+            $audit->users = $request->nama;
+            $audit->actions = "Log Masuk";
+            // $audit->norujukan = $norujukan;
+            // $audit->old_data = $old_data;
+            $audit->kodcaw =  $kodcaw;
+            $audit->created_at = $current;
+            $audit->updated_at = $current;
+            $audit->save();
+
+
+        
         
         return response()->json($logsession);
     }
@@ -55,5 +69,36 @@ class LogController extends Controller
         return response()->json($newnokp);
     }
 
+    public function logoutSession($kodcaw, Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $logoutsession = Logsession::on('mysql7')->where('kodcaw', '=', $kodcaw)
+        ->create([
+            'nama' => $request->nama,
+            'nokp' => $request->nokp,
+            'kodcaw' => $request->kodcaw,
+            'email' => $request->email,
+            'taraf' => $request->taraf,
+
+        ]);
+
+        $audit = new Audit();
+            $audit->users = $request->nama;
+            $audit->actions = "Log Keluar";
+            // $audit->norujukan = $norujukan;
+            // $audit->old_data = $old_data;
+            $audit->kodcaw =  $kodcaw;
+            $audit->created_at = $current;
+            $audit->updated_at = $current;
+            $audit->save();
+
+
+        
+        
+        return response()->json($logsession);
+    }
+
     
 }

app/Http/Controllers/TebusController.php

@@ -486,7 +486,9 @@ class TebusController extends Controller
 
     }
 
-    public function tagterimaupdate($kodcaw,$norujukan){
+    public function tagterimaupdate($kodcaw,$norujukan,Request $request){
+        $current = Carbon::now();
+
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $dahscan = Tebus::on($cawangan['mysql'])->where([['norujukan','=',$norujukan],['tagterima',1]])->first();
 
@@ -500,6 +502,15 @@ class TebusController extends Controller
                     'tagterima' => 1
                 ));
 
+                $audit = new Audit();
+                $audit->users = $request->nama;
+                $audit->actions = "Khazanah Scan Barcode Tebus";
+                $audit->norujukan = $norujukan;
+                $audit->kodcaw = $kodcaw;
+                $audit->created_at = $current;
+                $audit->updated_at = $current;
+                $audit->save();
+
                 return response()->json('success');
             }else{
                 return response()->json('unavailable');

app/Http/Controllers/TunaiController.php

@@ -6,9 +6,11 @@ use App\Cawangan;
 use App\Tunai;
 use App\Gadai;
 use App\AddTunai;
+use App\Audit;
 use App\RequestTeller;
 use App\Denominasi;
 use App\Vault;
+use Auth0\SDK\API\Management\Users;
 use Illuminate\Http\Request;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
@@ -150,6 +152,17 @@ class TunaiController extends Controller
                                 'Expires' => 'Mon, 01 Jan 1990 00:00:00 GMT',
                             ]);
 
+        $audit = new Audit();
+        $audit->users = $request->teller;
+        $audit->actions = "test";
+        $audit->new_data = $tunai;
+        $audit->kodcaw = $kodcaw;
+        $audit->created_at = $current;
+        $audit->updated_at = $current;
+        $audit->save();
+
+        return response()->json();
+
     }
 
     public function getTunaiPast($kodcaw,Request $request)
@@ -374,6 +387,17 @@ class TunaiController extends Controller
 
     public function updateRequestTeller($kodcaw,Request $request)
     {
+        $harini = Carbon::now();
+
+        $audit = new Audit();
+        $audit->users = isset($request->khazanah) ? $request->khazanah : '' ;
+        $audit->norujukan = null;
+        $audit->actions = ($request->jenis == 'pendahuluan') ? "Pendahuluan Peti Besi" : "Serahan Peti Besi";
+        $audit->kodcaw = $kodcaw;
+        $audit->created_at = $harini;
+        $audit->updated_at = $harini;
+        $audit->save();
+
         $requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]])->update(array(
 
             'update' => 1
@@ -428,6 +452,16 @@ class TunaiController extends Controller
              'update' => '0'
         ]);
 
+        $audit = new Audit();
+        $audit->users = $request->kodlaluan;
+        $audit->actions = ($request->modal == 0) ? "Serahan Modal" : "Pendahuluan Modal";
+        $audit->new_data = $reqteller;
+        $audit->kodcaw = $kodcaw;
+        $audit->created_at = $current;
+        $audit->updated_at = $current;
+        $audit->save();
+
+
         return response()->json($reqteller,200);
     }
 

app/Http/Controllers/VaultController.php

@@ -5,6 +5,7 @@ use App\Vault;
 use App\Cawangan;
 use App\Tunai;
 use App\AddTunai;
+use App\Audit;
 use App\GlDetail;
 use App\imbangdugalama;
 use App\GlCode;
@@ -326,11 +327,22 @@ class VaultController extends Controller
    public function listgldetail($kodcaw,Request $request)
    {
       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+      $current = Carbon::now();
+      $current = new Carbon();
 
       $gldetail=GlDetail::on($cawangan['mysql'])
       ->where('kodcaw','=',$kodcaw)
       ->orderby('tarikh','desc')->get();
 
+      $audit = new Audit();
+        $audit->users = $request->teller;
+        $audit->actions = "test3";
+        $audit->new_data = $gldetail;
+        $audit->kodcaw = $kodcaw;
+        $audit->created_at = $current;
+        $audit->updated_at = $current;
+        $audit->save();
+
       return response()->json($gldetail,200);
    }
 

app/Http/Controllers/WakilController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Audit;
 use App\WakilSurat;
 use App\Cawangan;
 
@@ -44,6 +45,7 @@ class WakilController extends Controller
 
     public function createSuratWakil($kodcaw, Request $request)
     {
+        $harini = Carbon::now();
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $kodcaw)->first();
 
@@ -55,6 +57,16 @@ class WakilController extends Controller
 
         ]);
 
+        $audit = new Audit();
+        $audit->users = $request->nama;
+        $audit->actions = "Cetak Surat Wakil";
+        $audit->norujukan = $request->norujukan;
+        $audit->new_data = $wakil;
+        $audit->kodcaw = $kodcaw;
+        $audit->created_at = $harini;
+        $audit->updated_at = $harini;
+        $audit->save();
+
         return response()->json($wakil);
     }
 

routes/web.php

@@ -61,6 +61,18 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('customer/blacklist',['uses'=>'CustomerController@blacklistCustomer']);
     $router->get('customer/eachcawangan/{ic}',['uses'=>'CustomerController@showCustomerByEachCawangan']);
 
+    //Change Password
+    $router->post('changepassword/{kodcaw}/{id}',['uses'=>'CustomerController@changepassword']);
+
+    //tukar cawangan
+    $router->post('/tukarcawangan/{kodcaw}', ['uses'=>'CustomerController@TukarCawangan']);
+
+    //pengesahan kakitangan
+    $router->post('/kakitangan/{kodcaw}', ['uses' => 'CustomerController@kakitangan']);
+
+    //tukar taraf
+    $router->get('tukartaraf/{kodcaw}/{role}',['uses'=>'CustomerController@TukarTaraf']);
+
     //Gadai API
     $router->get('gadai',['uses'=>'GadaiController@showAllGadais']);
     $router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadai']);
@@ -119,6 +131,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     ///Log session
     $router->post('logsession/{kodcaw}',['uses'=>'LogController@logSession']);
     $router->get('checknokp/{kodcaw}/{nokp}/{tarikh}',['uses'=>'LogController@checkNokpSession']);
+    $router->post('logoutsession/{kodcaw}',['uses'=>'LogController@logoutSession']);
 
     //Tebus API
     $router->get('tebustawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusTawarruq']);