diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index 5ba4e3d..108655f 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -83,7 +83,7 @@ class AdminPageController extends Controller
         ->where([['kodcaw','=',$kodcaw],['tarikh','<=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]])
         ->orderBy('tarikh','desc')
         ->paginate(5);
-        
+
         return response()->json($tunai);
 
     }
@@ -107,7 +107,7 @@ class AdminPageController extends Controller
 
     public function getAddTunaiDateKodlaluan($kodcaw,Request $request)
     {
-       
+
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -161,7 +161,7 @@ class AdminPageController extends Controller
 
         return response()->json($lelong,200);
     }
-    
+
 
     public function PetiBesiPaginateforAdmin($kodcaw,Request $request)
     {
@@ -174,16 +174,16 @@ class AdminPageController extends Controller
                 ->where('kodcaw','=',$kodcaw)
                 ->orderby('tarikh','desc')
                 ->paginate(5);
-     
+
         return response()->json($vault);
     }
 
     public function TahunanGadai(Request $request)
     {
-            
+
         $current = Carbon::now();
         $current = new Carbon();
-        
+
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
         $arrayGadai = [];
@@ -199,19 +199,19 @@ class AdminPageController extends Controller
                 ->whereYear('t_gadai',$request->year)
                 ->sum('pinjaman');
 
-                
+
         array_push($arrayGadai,['bajet' => $bajetgroup,'total' => $gadai]);
 
         return response()->json($arrayGadai);
     }
 
     public function TahunanTebus(Request $request)
-    {    
+    {
         $current = Carbon::now();
         $current = new Carbon();
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
-        
+
         $arrayTebus = [];
 
         $bajetgroup = BajetTahunan::on('mysql7')
@@ -226,7 +226,7 @@ class AdminPageController extends Controller
                 ->where('sttebus','!=','')
                 ->sum('pinjaman');
 
-                
+
         array_push($arrayTebus,['bajet' => $bajetgroup,'total' => $tebus]);
 
         return response()->json($arrayTebus);
@@ -234,12 +234,12 @@ class AdminPageController extends Controller
 
     public function TahunanKeuntungan(Request $request)
     {
-            
+
         $current = Carbon::now();
         $current = new Carbon();
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
-        
+
         $arrayKeuntungan = [];
 
         $monthly = Carbon::now();
@@ -252,7 +252,7 @@ class AdminPageController extends Controller
                 ->where('bajettahunan.kodcaw','=', $request->kodcaw)
                 ->where('jenisbajet','=','Keuntungan')
                 ->whereYear('bajettahunan.tahun', '=', $request->year)
-                ->sum('nilaibajet');   
+                ->sum('nilaibajet');
 
         $tebus_arrahn = Tebus::on($cawangan['mysql'])
                 ->rightJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan')
@@ -384,7 +384,7 @@ class AdminPageController extends Controller
         $array_totalup = [];
 
         for($i=0;$i<12;$i++){
-              
+
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
                                 $tarikh = $request->year . '-' . '01';
@@ -427,7 +427,7 @@ class AdminPageController extends Controller
                         case 12: $namabulan = 'Dis';
                                 $tarikh = $request->year . '-' . '12';
                                 break;
-                                                    
+
                     }
                     array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'pembiayaan'=>0,'bajetgadai'=> 0]);
         }
@@ -451,7 +451,7 @@ class AdminPageController extends Controller
         $arrayPembiayaan = array();
         $goals = [['name' => 'Expected','value' => 200000,'strokeHeight' => 5, 'strokeColor' => '#e74c3c']];
 
-          
+
             $gadai = Gadai::on($cawangan['mysql'])
                         ->selectRaw('SUM(pinjaman) AS totalpinjaman')
                         ->addSelect(DB::connection($cawangan['mysql'])
@@ -474,9 +474,9 @@ class AdminPageController extends Controller
                 $goals[0]['value'] = (sizeof($bajetgadai) > 0) ? $bajetgadai[$array_index] : 0;
                 array_push($arrayPembiayaan,['x' => $array_totalup[$array_index]['namabulan'],'y' => $total_gadai,'goals' => (array) $goals]);
                 $total_gadai = 0;
-               
+
             }
-            
+
         return response()->json($arrayPembiayaan);
     }
 
@@ -540,7 +540,7 @@ class AdminPageController extends Controller
                         case 12: $namabulan = 'Dis';
                                 $tarikh = $request->year . '-' . '12';
                                 break;
-                                                    
+
                     }
                     array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'bilgadai'=>0,'bajetgadai'=> 0]);
         }
@@ -564,7 +564,7 @@ class AdminPageController extends Controller
         $arrayPembiayaan = array();
         $goals = [['name' => 'Expected','value' => 200000,'strokeHeight' => 5, 'strokeColor' => '#e74c3c']];
 
-          
+
             $gadai = Gadai::on($cawangan['mysql'])
                         ->selectRaw('COUNT(*) AS bilangangadai')
                         ->addSelect(DB::connection($cawangan['mysql'])
@@ -588,9 +588,9 @@ class AdminPageController extends Controller
                 $goals[0]['value'] = (sizeof($bajetgadai) > 0) ? $bajetgadai[$array_index] : 0;
                 array_push($arrayPembiayaan,['x' => $array_totalup[$array_index]['namabulan'],'y' => $total_gadai,'goals' => (array) $goals]);
                 $total_gadai = 0;
-               
+
             }
-            
+
         return response()->json($arrayPembiayaan);
     }
 
@@ -611,7 +611,7 @@ class AdminPageController extends Controller
         $array_totalup = [];
 
         for($i=0;$i<12;$i++){
-               
+
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
                                 $tarikh = $request->year . '-' . '01';
@@ -654,7 +654,7 @@ class AdminPageController extends Controller
                         case 12: $namabulan = 'Dis';
                                 $tarikh = $request->year . '-' . '12';
                                 break;
-                                                    
+
                     }
                     array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'penebusan'=>0,'bajettebus' => 0]);
         }
@@ -705,7 +705,7 @@ class AdminPageController extends Controller
                         ->where('transaction.trans_type','=','A')
                         ->where([['trans.tarikh_bayaran','>=',$monthly_date . ' 00:00:00'],['trans.tarikh_bayaran','<=',$current->toDateString() . ' 23:59:59']])
                         ->where('trans.kodcaw','=',$request->kodcaw)
-                        ->get()->toArray();        
+                        ->get()->toArray();
 
         $total_tebus = 0;
         foreach($array_totalup as $array_index=>$totalup){
@@ -787,7 +787,7 @@ class AdminPageController extends Controller
                         case 12: $namabulan = 'Dis';
                                 $tarikh = $request->year . '-' . '12';
                                 break;
-                                                    
+
                     }
                     array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'bilpenebusan'=>0,'bajettebus' => 0]);
         }
@@ -861,7 +861,7 @@ class AdminPageController extends Controller
         $array_totalup = [];
 
         for($i=0;$i<12;$i++){
-            
+
 
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
@@ -905,7 +905,7 @@ class AdminPageController extends Controller
                         case 12: $namabulan = 'Dis';
                                 $tarikh = $request->year . '-' . '12';
                                 break;
-                                                    
+
                     }
                     array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'keuntungan'=>0,'bajetkeuntungan' => 0]);
         }
@@ -914,7 +914,7 @@ class AdminPageController extends Controller
         // $bajetkeuntungan = array_reverse($bajetkeuntungan);
 
         $bajetkeuntungan = [];
-        
+
         $bajetgroup = BajetTahunan::on('mysql7')
             ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
             ->where('bajettahunan.kodcaw','=', $request->kodcaw)
@@ -932,7 +932,7 @@ class AdminPageController extends Controller
         $goals = [['name' => 'Expected','value' => 0,'strokeHeight' => 5, 'strokeColor' => '#e74c3c']];
 
 
-        
+
         $lelongupahsimpan = Lelong::on($cawangan['mysql'])
                     ->selectRaw('SUM(bakiupah) AS total')
                     ->addSelect(DB::connection($cawangan['mysql'])
@@ -944,7 +944,7 @@ class AdminPageController extends Controller
                     ->orderBy('t_jual','asc')
                     ->get()->toArray();
 
-        
+
 
         $tebus_arrahn = Tebus::on($cawangan['mysql'])
                 ->rightJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan')
@@ -1044,7 +1044,7 @@ class AdminPageController extends Controller
     }
 
     public function showAllGadaiToday(Request $request){
-        
+
         $cawangan_all = Cawangan::on('mysql7')->get();
         $current = Carbon::now();
         $current = new Carbon();
@@ -1056,7 +1056,7 @@ class AdminPageController extends Controller
 
         $monthly = Carbon::now();
         $monthly = new Carbon();
-        
+
         $monthly_date = $monthly->startOfMonth()->toDateString();
 
         $gadailatest = Gadai::on($cawangan['mysql'])
@@ -1067,7 +1067,7 @@ class AdminPageController extends Controller
 
         switch($current->month){
             case 1: $bulan = 'Januari';
-                    break;  
+                    break;
             case 2: $bulan = 'Februari';
                     break;
             case 3: $bulan = 'Mac';
@@ -1112,14 +1112,14 @@ class AdminPageController extends Controller
                 $cummulativegadaian = 0;
                 $percentcum = 0;
         }
-       
+
 
 
         $gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$harini)->sum('pinjaman');
         // $gadai_last_week = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$lastweek)->sum('pinjaman');
         // $gadaiLastweek += $gadai_last_week;
         $gadaiToday += $gadai;
-        
+
         $diffGadaiPercent = 0;
 
         if($bajetcollection)
@@ -1142,12 +1142,12 @@ class AdminPageController extends Controller
         $harini = $current->toDateString();
         $tebusToday = 0;
         $tebusLastWeek = 0;
-        
+
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
         $monthly = Carbon::now();
         $monthly = new Carbon();
-        
+
 
         $monthly_date = $monthly->startOfMonth()->toDateString();
 
@@ -1160,7 +1160,7 @@ class AdminPageController extends Controller
 
         switch($current->month){
             case 1: $bulan = 'Januari';
-                    break;  
+                    break;
             case 2: $bulan = 'Februari';
                     break;
             case 3: $bulan = 'Mac';
@@ -1209,16 +1209,16 @@ class AdminPageController extends Controller
 
         $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('pinjaman');
         $lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$harini)->sum('pinjaman');
-        
+
         $tebusToday = $tebus + $lelong;
-        
+
         $diffTebusPercent = 0;
-        
+
         if($bajetcollection)
                 $diffTebusPercent = (($tebusToday - $bajetharian)/$bajetharian)*100;
         else
                 $diffTebusPercent = 0;
-                
+
         $dataTebus = [];
         array_push($dataTebus,['tebusToday'=>$tebusToday,'percentDiff'=>$diffTebusPercent,'bajetharian' => $bajetharian,'bulan' => $bulan,'percentcum' => abs(round($percentcum)),'remaining' => $cummulativepenebusan]);
         return response()->json($dataTebus);
@@ -1238,7 +1238,7 @@ class AdminPageController extends Controller
         $monthly = Carbon::now();
         $monthly = new Carbon();
         $monthly_date = $monthly->startOfMonth()->toDateString();
-        
+
         $lelongupahsimpan = Lelong::on($cawangan['mysql'])
                     ->selectRaw('SUM(bakiupah) AS totalupahlelong')
                     ->whereYear('t_jual',$current->year)
@@ -1287,13 +1287,13 @@ class AdminPageController extends Controller
                 ->where([['trans.tarikh_bayaran','>=',$monthly_date . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini . ' 23:59:59']])
                 ->where('trans.kodcaw','=',$request->kodcaw)
                 ->sum('trans.keuntungan_rebet');
-    
+
 
         $upahlatest = $lelongupahsimpan + $tebus + $ansuran + $advansur + $tebus_upah_tawarruq;
 
         switch($current->month){
             case 1: $bulan = 'Januari';
-                    break;  
+                    break;
             case 2: $bulan = 'Februari';
                     break;
             case 3: $bulan = 'Mac';
@@ -1338,13 +1338,13 @@ class AdminPageController extends Controller
                 $cummulativekeuntungan = 0;
                 $percentcum = 0;
         }
-     
-       
+
+
         $upah_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakiupah');
         $upah_today = Advansur::on($cawangan['mysql'])->where('tarikh',$harini)->sum('upahDibayar');
-        
+
         $upahToday += $upah_today;
-        
+
         $ansuran_today = Transaction::on('mysql7')
                         ->leftJoin('transaksi_keuntungan as trans', function($join)
                         {
@@ -1384,28 +1384,28 @@ class AdminPageController extends Controller
     public function getpetibesiSebelumbyTarikh($kodcaw,Request $request)
     {
       $current = Carbon::now();
-      $current = new Carbon();    
-   
+      $current = new Carbon();
+
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
        $vault=Vault::on($cawangan['mysql'])
                ->where('kodcaw','=',$kodcaw)
                ->where('tarikh','<',$request->tarikh)
                ->orderby('tarikh','desc')->limit(1)->get();
-   
+
        return response()->json($vault);
-       
+
     }
 
     public function getGldetailbyTarikh($kodcaw,Request $request)
     {
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
- 
+
        $gldetail=GlDetail::on($cawangan['mysql'])
                 ->where('kodcaw','=',$kodcaw)
                 ->where('tarikh','=',$request->tarikh)
                 ->where('descpt','NOT LIKE','SERAHAN BAYAR ONLINE%')
                 ->orderby('tarikh','desc')->get();
- 
+
        return response()->json($gldetail,200);
     }
 
@@ -1414,24 +1414,24 @@ class AdminPageController extends Controller
     {
        $harini = Carbon::now();
        $harini = new Carbon;
- 
+
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
- 
+
        $panjar=Panjar::on($cawangan['mysql'])
                 ->where('tarikh','=',$request->tarikh)
                 ->get();
- 
+
        return response()->json($panjar);
     }
 
     public function updatePetiBesiAdmin(Request $request)
     {
       $current = Carbon::now();
-      $current = new Carbon();     
-      
+      $current = new Carbon();
+
       $cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $request->kodcaw)->first();
       $updateVault=Vault::on($cawangan['mysql'])->where('tarikh', '=', $request->tarikh)->update(array(
-   
+
          'bakiawal' => $request->bakiawal,
          'keluar' => $request->keluar,
          'masuk' => $request->masuk,
@@ -1440,9 +1440,9 @@ class AdminPageController extends Controller
          'totpanjar' => $request->panjar,
          'bakiakhir' => $request->bakiakhir,
          'bakieod' => $request->bakiakhir
-   
+
       ) );
-   
+
       return response()->json($updateVault, 200);
     }
 
@@ -1521,7 +1521,7 @@ class AdminPageController extends Controller
     {
 
         $current = Carbon::now();
-        $current = new Carbon();  
+        $current = new Carbon();
 
         $bajettahunan = new BajetTahunan();
 
@@ -1556,7 +1556,7 @@ class AdminPageController extends Controller
 
     public function KemaskiniBajet(Request $request)
     {
-       
+
         $bajetjanuari = Bajet::on('mysql7')
                         ->where('bajetid','=',$request->bajetid)
                         ->where('bulan','=','Januari')
@@ -1571,12 +1571,12 @@ class AdminPageController extends Controller
                         ->where('bajetid','=',$request->bajetid)
                         ->where('bulan','=','Mac')
                         ->update(['nilaibajet' => $request->bajetmarch]);
-                        
+
         $bajetapril = Bajet::on('mysql7')
                         ->where('bajetid','=',$request->bajetid)
                         ->where('bulan','=','April')
                         ->update(['nilaibajet' => $request->bajetapril]);
-                        
+
         $bajetmei = Bajet::on('mysql7')
                         ->where('bajetid','=',$request->bajetid)
                         ->where('bulan','=','Mei')
@@ -1634,14 +1634,14 @@ class AdminPageController extends Controller
                 ->orderBy('tarikhdaftar','desc')
                 ->paginate(5);
         }
-       
+
 
         return response()->json($blacklist);
     }
 
     public function AddSenaraiHitam(Request $request)
     {
-            
+
         $customer = Customer::on('mysql7')
                 ->where('kpbaru','=', $request->nokp)
                 ->orWhere('kplama','=', $request->nokp)
@@ -1676,13 +1676,13 @@ class AdminPageController extends Controller
         return response()->json($blacklist, 201);
     }
 
-    
+
     public function UpdateTunaiByTarikh($kodcaw, Request $request)
     {
 
         $current = Carbon::now();
         $current = new Carbon();
-       
+
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $updatetunai = Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $request->tarikh],['kodlaluan','=', $request->kodlaluan] ])->
         update(array(
@@ -1735,17 +1735,17 @@ class AdminPageController extends Controller
     {
        $harini = Carbon::now();
        $harini = new Carbon;
- 
+
        $cawangan_all = Cawangan::on('mysql7')->get();
        $arraykelulusan = [];
- 
-       foreach($cawangan_all as $index=>$cawangan){ 
+
+       foreach($cawangan_all as $index=>$cawangan){
            $kelulusan=Mohon::on($cawangan['mysql'])
                 ->where('tarikh','=',$harini->toDateString())
                 ->where('masalulus','=','')
                 ->where('pelulus','=','operasi')
                 ->get()->toArray();
- 
+
           if(sizeof($kelulusan) != 0){
                 foreach($kelulusan as $index=>$kel)
                 {
@@ -1761,29 +1761,29 @@ class AdminPageController extends Controller
       }
 
       $data = $this->paginate($arraykelulusan,3);
- 
+
        return response()->json($data,200);
     }
- 
+
     public function listoperasikelulusan()
     {
        $harini = Carbon::now();
        $harini = new Carbon;
- 
+
        $cawangan_all = Cawangan::on('mysql7')->get();
        $arraykelulusan = [];
- 
+
        foreach($cawangan_all as $index=>$cawangan){
           $kelulusan=Mohon::on($cawangan['mysql'])
                 ->where('peloperasi','=','operasi')
                 ->where('operasi','!=','')
                 ->get();
- 
+
           if(sizeof($kelulusan) != 0){
               array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]);
           }
-      }      
- 
+      }
+
        return response()->json($arraykelulusan,200);
     }
 
@@ -1803,7 +1803,7 @@ class AdminPageController extends Controller
         {
                 foreach($cawangan_all as $index=>$cawangan){
                         if($status == 'belum_tebus' || $status == 'sudah_tebus'){
-                                
+
                                 if($status == 'sudah_tebus')
                                 {
                                         $gadai = Gadai::on($cawangan['mysql'])
@@ -1817,7 +1817,7 @@ class AdminPageController extends Controller
                                                 ->orderBy('t_gadai','desc')
                                                 ->get()->toArray();
                                 }
-                                
+
                                 if(sizeof($gadai) != 0){
                                         $gadai_all += $gadai;
                                 }
@@ -1835,7 +1835,7 @@ class AdminPageController extends Controller
         }else{
                 foreach($cawangan_all as $index=>$cawangan){
                         if($status == 'belum_tebus' || $status == 'sudah_tebus'){
-                                
+
                                 if($status == 'sudah_tebus')
                                 {
                                         $gadai = Gadai::on($cawangan['mysql'])
@@ -1849,7 +1849,7 @@ class AdminPageController extends Controller
                                                 ->orderBy('t_gadai','desc')
                                                 ->get()->toArray();
                                 }
-                                
+
                                 if(sizeof($gadai) != 0){
                                         $gadai_all += $gadai;
                                 }
@@ -1864,7 +1864,7 @@ class AdminPageController extends Controller
                         }
                 }
         }
-      
+
         $data = $this->paginate($gadai_all);
 
         return response()->json($data);
@@ -1898,7 +1898,7 @@ class AdminPageController extends Controller
                 $status = new Status;
 
                 $nopermohonan = 'AR' . strtoupper($kodcaw) . $curent_year . $curent_month . $current_day . '-' . $transbaru;
-                
+
                 $permohonan->mohonid = $mohonid;
                 $permohonan->kodcaw = $kodcaw;
                 $permohonan->jenismohon = $request->jenismohon;
@@ -1910,11 +1910,11 @@ class AdminPageController extends Controller
                 $permohonan->outstandingsemasa = $request->outstanding;
                 $permohonan->nopermohonan = $nopermohonan;
                 $permohonan->save();
-            
+
                 $pengesahan->nopermohonan = $permohonan->nopermohonan;
                 $pengesahan->kodcaw = $kodcaw;
                 $pengesahan->save();
-                
+
                 $status->nopermohonan = $permohonan->nopermohonan;
                 $status->statusid = 1;
                 $status->tarikhmasa = $timeloni->toDateTimeString();
@@ -1960,7 +1960,7 @@ class AdminPageController extends Controller
 
     public function GetPermohonanCawangan($kodcaw,Request $request)
     {
-        
+
         if($kodcaw === 'admin')
         {
                 $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
@@ -2002,7 +2002,7 @@ class AdminPageController extends Controller
         $permohonanstatus = [];
         $listpermohonan = Permohonan::join('pengesahan', 'permohonan.nopermohonan', '=', 'pengesahan.nopermohonan')
         ->where([['permohonan.kodcaw', $kodcaw],['permohonan.nopermohonan',$mohonid]])->first()->toArray();
-        
+
         $status = Status::where('nopermohonan',$mohonid)->get()->toArray();
 
         array_push($listpermohonan,(["status" => $status]));
@@ -2042,7 +2042,7 @@ class AdminPageController extends Controller
                 case 8: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jenisbank' => $stat['bank_cit'],'invoicefiles' => $stat['invoicefiles_id'],'resitfiles' => $stat['resitfiles_id']]);
                         break;
                 }
-                
+
                 array_push($statusarray,$status_lookup);
         }
 
@@ -2102,7 +2102,7 @@ class AdminPageController extends Controller
 
     }
 
-    
+
     public function KelulusanPermohonanByAkaun(Request $request)
     {
         $timeloni = Carbon::now();
@@ -2149,7 +2149,7 @@ class AdminPageController extends Controller
                 }
 
                 return response()->json($pengesahan);
-                
+
 
         }catch (\Throwable $e){
                 return response($e);
@@ -2194,7 +2194,7 @@ class AdminPageController extends Controller
                         $ar_files->filename = $request->imagename;
                         $ar_files->tarikhmasa = $timeloni->toDateTimeString();
                         $ar_files->save();
-                        
+
                         $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagpb',0]])
                         ->update(array(
                                 'tagpb' => 1,
@@ -2220,7 +2220,7 @@ class AdminPageController extends Controller
                 }
 
                 return response()->json(1);
-                
+
 
         }catch (\Throwable $e){
                 return response($e);
@@ -2264,7 +2264,7 @@ class AdminPageController extends Controller
                 }
 
                 return response()->json(1);
-                
+
 
         }catch (\Throwable $e){
                 return response($e);
@@ -2291,7 +2291,7 @@ class AdminPageController extends Controller
                 ));
 
                 return response()->json(1);
-                
+
 
         }catch (\Throwable $e){
                 return response($e);
@@ -2334,7 +2334,7 @@ class AdminPageController extends Controller
                 ));
 
                 return response()->json(1);
-                
+
 
         }catch (\Throwable $e){
                 return response($e);
@@ -2344,7 +2344,7 @@ class AdminPageController extends Controller
     public function downloadFile(Request $request) {
         $kp = ARFiles::where('files_id',$request->files_id)
                 ->first();
-        
+
         return response($kp,200);
     }
 
@@ -2358,7 +2358,7 @@ class AdminPageController extends Controller
 
         $batch_old_noruj = WTDDraft::on('mysql7')->where('batchno_serah',0)->where('kodcaw',$request->kodcaw)->pluck('norujukan');
         $lelong_data = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$batch_old_noruj)->get();
-  
+
         foreach($batch_old as $index=>$bo)
         {
                 array_push($latestbatch,['recno' => 0,'norujukan' => 'lama','batchno' => 0,'baki' => $lelong_data->sum('baki'),'aktif' => 1]);
@@ -2393,8 +2393,8 @@ class AdminPageController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
-        
-        
+
+
         $mula = explode('-', $request->mula);
         $hingga = explode('-', $request->hingga);
 
@@ -2427,7 +2427,7 @@ class AdminPageController extends Controller
                 return response()->json($dummy,200);
         }else{
                 $dif = array_diff($lelongpluck->toArray(),$draftpluck->toArray());
-                
+
                 $lelongbaru =  Lelong::on($cawangan['mysql'])
                 ->whereIn('norujukan',$dif)
                 ->get()->toArray();
@@ -2459,7 +2459,7 @@ class AdminPageController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
         $norujukan = $request->norujukan;
-       
+
 
         try{
                 $lelong = Lelong::on($cawangan['mysql'])
@@ -2487,7 +2487,7 @@ class AdminPageController extends Controller
                 }
 
 
-                $serahbaki = SerahBaki::on($cawangan['mysql'])->create([ 
+                $serahbaki = SerahBaki::on($cawangan['mysql'])->create([
                         'batchno' => $latestbatch + 1,
                         'norujukan' => 'baru',
                         'hargajual' => 0.00,
@@ -2508,8 +2508,8 @@ class AdminPageController extends Controller
         }catch (\Throwable $e){
                 return response($e);
         }
-       
-      
+
+
     }
 
     public function RemoveDraftWTD(Request $request){
@@ -2532,7 +2532,7 @@ class AdminPageController extends Controller
                 DB::connection($cawangan['mysql'])->rollback();
 
                 return response()->json($e->getMessage(),400);
-            }    
+            }
 
     }
 
@@ -2548,7 +2548,7 @@ class AdminPageController extends Controller
         $selectnorujukan =  $lelong = WTDDraft::on('mysql7')
                                 ->where('batchno_serah',$batchno)
                                 ->pluck('norujukan');
-        
+
 
         $lelong = Lelong::on($cawangan['mysql'])
                 ->select('lelong.batchno','lelong.kodcaw','gadai.nokp','lelong.t_jual','gadai.pinjaman','gadai.nopelanggan','lelong.norujukan','gadai.bakipjm','gadai.bakiupah','lelong.cajlain','lelong.cajlelong','lelong.baki','lelong.hargajual','lelong.gst_cl')
@@ -2558,7 +2558,7 @@ class AdminPageController extends Controller
         try{
                 foreach($lelong as $lel)
                 {
-                        $tuntutbaki = TuntutBaki::on($cawangan['mysql'])->create([ 
+                        $tuntutbaki = TuntutBaki::on($cawangan['mysql'])->create([
                                 'batchno' => $lel['batchno'],
                                 'jenis' => "T",
                                 'kodcaw' => $lel['kodcaw'],
@@ -2596,7 +2596,7 @@ class AdminPageController extends Controller
                                 'rugi' => 0.00,
                                 'ansrugi' => 0.00,
                                 'wtd' => $lel['baki'],
-                        
+
                         ]);
 
                         $lelong=Lelong::on($cawangan['mysql'])
@@ -2613,9 +2613,9 @@ class AdminPageController extends Controller
         }catch (\Throwable $e){
                 return response($e);
         }
-        
 
-      
+
+
     }
 
     public function PenjanaanPC(Request $request){
@@ -2639,20 +2639,20 @@ class AdminPageController extends Controller
                         $ar_files->tarikhmasa = $timeloni->toDateTimeString();
                         $ar_files->save();
 
-                        
+
                         $pengesahan = Permohonan::where('nopermohonan',$request->mohonid)
                         ->update(array(
                                 'tagjanapc' => 2,
                                 'files_permohonan_id' => $ar_files->id
                         ));
                 }
-               
+
 
                 return response()->json($pengesahan);
         }catch (\Throwable $e){
                 return response($e);
         }
-       
+
     }
 
     public function KeuntunganSebenarExport(Request $request){
@@ -2717,7 +2717,7 @@ class AdminPageController extends Controller
                         ->whereYear('t_lelong','=',$year)
                         ->get();
 
-                return response()->json($upahlelong,200);    
+                return response()->json($upahlelong,200);
         }
      }
 
@@ -2772,7 +2772,7 @@ class AdminPageController extends Controller
         $arraysum = [];
         $arrayall = [];
 
-        for ($i = 1; $i <= 13; $i++) 
+        for ($i = 1; $i <= 13; $i++)
         {
           ${"tempoh".$i} = clone $audit;
           if($i == 13)
@@ -2803,7 +2803,7 @@ class AdminPageController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        
+
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -2815,8 +2815,8 @@ class AdminPageController extends Controller
         {
                 $audit = Gadai::on($cawangan['mysql'])
                 ->where(function ($query) use ($harini) {
-                        $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=','']]) 
-                        ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini]]); 
+                        $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=','']])
+                        ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini]]);
                 });
 
         }elseif($jenislaporan === 'datalelong')
@@ -2825,15 +2825,15 @@ class AdminPageController extends Controller
                 // ->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',1]])
                 // ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',1]]);
                 ->where(function ($query) use ($harini) {
-                        $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',1]]) 
-                        ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',1]]); 
+                        $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',1]])
+                        ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',1]]);
                 });
 
         }else{
                 $audit = Gadai::on($cawangan['mysql'])
                 ->where(function ($query) use ($harini) {
-                        $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',0]]) 
-                        ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',0]]); 
+                        $query->where([['tagpalsu','=',0],['t_gadai','<=',$harini],['sttebus','=',''],['lelong_tawarruq',0]])
+                        ->orWhere([['tagpalsu','=',0],['t_update','>',$harini],['sttebus','!=',''],['t_gadai','<=',$harini],['lelong_tawarruq',0]]);
                 });
         }
 
@@ -2844,7 +2844,7 @@ class AdminPageController extends Controller
         $arraycount = [];
         $arraysum = [];
 
-        for ($i = 1; $i <= 13; $i++) 
+        for ($i = 1; $i <= 13; $i++)
         {
           ${"tempoh".$i} = clone $audit;
           if($i == 13)
@@ -2868,9 +2868,9 @@ class AdminPageController extends Controller
         return response()->json($arrayall,200);
      }
 
-     
+
      public function Laporan_SerahPetiBesiGadai(Request $request){
-        
+
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
         $current = Carbon::now();
@@ -2947,7 +2947,7 @@ class AdminPageController extends Controller
                     ['semakbarcode','<>','Lulus'],
                     ])
                     ->paginate(5);
-        
+
         return response()->json($gadai,200);
     }
 
@@ -2959,7 +2959,7 @@ class AdminPageController extends Controller
         $gadai = Gadai::on($cawangan['mysql'])
                 ->where('norujukan',$request->norujukan)
                 ->update(['semakbarcode'=>'Lulus']);
-                
+
         return response()->json($gadai);
     }
 
@@ -2979,7 +2979,7 @@ class AdminPageController extends Controller
         ->where('sttebus','<>','')
         ->whereYear('t_gadai',$current->year())
         ->pluck('norujukan');
-   
+
         $get_norujukan = Gadai::on($cawangan['mysql'])
         ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
         ->whereNotNull('hargajualan')
@@ -3010,7 +3010,7 @@ class AdminPageController extends Controller
         ->sum('bayaran_keuntungan');
 
         $total = $sum_keun_tebus + $sum_keun_ansuran;
-        
+
 
         return response()->json($total);
     }
@@ -3019,23 +3019,23 @@ class AdminPageController extends Controller
 
         $cawangan_all = Cawangan::on('mysql7')->get();
         $arraygadai = [];
-        
+
         foreach($cawangan_all as $index=>$cawangan){
-            
-            
+
+
             // gadaian
             $gadai=Gadai::on($cawangan['mysql'])
             ->where([['t_gadai','>=',$request->mula_date],['t_gadai','<=',$request->hingga_date]]);
 
                 $jumlah_gadai = $gadai->sum('pinjaman');
-                
+
                 $data_gadai = $gadai->get();
-                
+
                 $nokp_gadai = $gadai->distinct('nokp') ;
                 $jum_org_gadai = $nokp_gadai->count('nokp');
-                
+
                 $jum_surat_gadai = $data_gadai->count('norujukan');
-                
+
             //penebusan (Tebus + Lelong + Ansuran)
 
             $myDateTime = DateTime::createFromFormat('Y-m-d', $request->hingga_date);
@@ -3046,7 +3046,7 @@ class AdminPageController extends Controller
                     ->where('sttebus','!=','')
                     ->where([['t_update','>=',$request->mula_date],['t_update','<=',$request->hingga_date]]);
 
-                    $jum_tebus = $tebus->sum('bakipjm');  
+                    $jum_tebus = $tebus->sum('bakipjm');
                     // dd($jum_tebus)  ;
 
             $orgtebus = Gadai::on($cawangan['mysql'])
@@ -3054,11 +3054,11 @@ class AdminPageController extends Controller
                     ->where([['t_update','>=',$request->mula_date],['t_update','<=',$request->hingga_date]]);
 
                     $jum_surat_t = $orgtebus->count('norujukan');
-                    
+
                     $nokp_tebus = $orgtebus->distinct('nokp') ;
                     $jum_org_tebus = $nokp_tebus->count('nokp');
-                    
-                    
+
+
                     $ansuran = Transaction::on('mysql7')
                     ->leftJoin('transaksi_keuntungan', function($join)
                     {
@@ -3068,39 +3068,39 @@ class AdminPageController extends Controller
                     ->where('trans_type','=','A')
                     ->where('transaksi_keuntungan.kodcaw','=',$cawangan['kodcaw'])
                     ->where([['tarikh_bayaran','>=',$request->mula_date],['tarikh_bayaran','<=', $datez]]);
-                    
-                    $jum_ansuran = $ansuran->sum('transaksi_keuntungan.bayaran_pembiayaan');
-                    
-                    $jum_penebusan = $jum_tebus + $jum_ansuran ; 
 
-          
+                    $jum_ansuran = $ansuran->sum('transaksi_keuntungan.bayaran_pembiayaan');
+
+                    $jum_penebusan = $jum_tebus + $jum_ansuran ;
+
+
 
 
             //Upah tebus (KEUNTUNGAN)
-            
+
             $myDateTime = DateTime::createFromFormat('Y-m-d', $request->hingga_date);
             $datez = $myDateTime->modify('+1 day')->format('Y-m-d');
 
-                          
+
             $lelongupahsimpan = Lelong::on($cawangan['mysql'])
-                            
+
                                 ->where([['t_jual','>=',$request->mula_date],['t_jual','<=',$request->hingga_date]]);
 
             $jum_lelongupahsimpan = $lelongupahsimpan->sum('bakiupah');
 
-            
-            
+
+
             $upahtebus = Tebus::on($cawangan['mysql'])
                         ->rightJoin('gadai', 'gadai.norujukan', '=', 'tebus.norujukan')
                         ->where([['tebus.jenistebus','=','T'],['gadai.hargajualan','=',NULL]])
                         ->where([['t_tebus','>=',$request->mula_date],['t_tebus','<=',$request->hingga_date]]);
-            
+
             $jum_upahtebus = $upahtebus->sum('tebus.bakiupah');
 
 
             $advansur = Advansur::on($cawangan['mysql'])
                         ->where([['tarikh','>=',$request->mula_date],['tarikh','<=',$request->hingga_date]]);
-            
+
             $jum_advansur = $advansur->sum('upahDibayar');
 
 
@@ -3114,10 +3114,10 @@ class AdminPageController extends Controller
                             ->where('trans_type','=','A')
                             ->where('transaksi_keuntungan.kodcaw','=',$cawangan['kodcaw'])
                             ->where([['tarikh_bayaran','>=',$request->mula_date],['tarikh_bayaran','<=',$datez]]);
-                            
+
                             $jum_ansuranupah = $ansuranupah->sum('transaksi_keuntungan.bayaran_keuntungan');
 
-               
+
             $upahtawarruq = Transaction::on('mysql7')
                                     ->leftJoin('transaksi_keuntungan', function($join)
                                     {
@@ -3127,26 +3127,26 @@ class AdminPageController extends Controller
                                     ->where('trans_type','!=','A')
                                     ->where('transaksi_keuntungan.kodcaw','=',$cawangan['kodcaw'])
                                     ->where([['tarikh_bayaran','>=',$request->mula_date],['tarikh_bayaran','<=',$datez]]);
-                   
+
             $jum_upahtawarruq = $upahtawarruq->sum('transaksi_keuntungan.keuntungan_rebet');
-                
+
 
             $jumlah_upah = $jum_lelongupahsimpan + $jum_upahtebus + $jum_advansur + $jum_upahtawarruq;
             $jum_keseluruhan_upah = $jumlah_upah + $jum_ansuranupah;
 
             $jum_pinjaman_semasa = $jumlah_gadai - $jum_penebusan;
 
-            
+
             //baki awal dan baki akhir
 
                    $myDateMonth = DateTime::createFromFormat('Y-m-d', $request->mula_date);
                    $month = $myDateMonth->modify('-1 day')->format('m');
                    // dd($month);
-       
+
                    $myDateYear = DateTime::createFromFormat('Y-m-d', $request->mula_date);
                    $year = $myDateYear->format('Y');
                    // dd($year);
-       
+
                    if($month == 1){
                        $audit = StokAudit1::on($cawangan['mysql'])->where('tahun',$year);
                    }elseif($month == 2){
@@ -3172,7 +3172,7 @@ class AdminPageController extends Controller
                    }elseif($month == 12){
                        $audit = StokAudit12::on($cawangan['mysql'])->where('tahun',$year);
                    }
-           
+
                    $rekodaudit = $audit->get();
                    $bakiawal = $audit->sum('bakipjm');
                    $bakiakhir = $bakiawal + $jumlah_gadai - $jum_penebusan;
@@ -3183,7 +3183,7 @@ class AdminPageController extends Controller
             ->where([['tarikhdaftar','>=',$request->mula_date],['tarikhdaftar','<=',$request->hingga_date]]);
 
             $bil_pelanggan_baru = $pelanggan_baru->count('id');
-  
+
 
                 array_push($arraygadai,[
                 "data_gadai" => $data_gadai,
@@ -3194,7 +3194,7 @@ class AdminPageController extends Controller
                 "jum_surat_gadai"=>$jum_surat_gadai,
                 "jum_surat_t" => $jum_surat_t,
                 "jum_org_tebus" => $jum_org_tebus,
-                "jum_penebusan" => $jum_penebusan,               
+                "jum_penebusan" => $jum_penebusan,
                 "jum_pinjaman_semasa" => $jum_pinjaman_semasa,
                 "bil_pelanggan_baru" => $bil_pelanggan_baru,
                 "jumlah_upah" => $jumlah_upah,
@@ -3203,10 +3203,10 @@ class AdminPageController extends Controller
                 "bakiawal" => $bakiawal,
                 "bakiakhir" => $bakiakhir
             ]);
-            
-       }   
+
+       }
                 //    dd($jum_lelongupahsimpan, $jum_upahtebus, $jum_advansur, $jum_ansuranupah, $jum_upahtawarruq  );
-   
+
 
         return response()->json($arraygadai,200);
 
@@ -3214,7 +3214,7 @@ class AdminPageController extends Controller
     }
 
     public function getLaporanAkruBulan(Request $request){
-     
+
         $array_akru = [];
         $cawangan = Cawangan::on('mysql7')->get();
 
@@ -3230,7 +3230,7 @@ class AdminPageController extends Controller
     public function LaporanOnline(Request $request){
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
- 
+
         if($request->jenis == 'portal')
         {
              $online=GlDetail::on($cawangan['mysql'])
@@ -3241,7 +3241,7 @@ class AdminPageController extends Controller
                  ->orderby('tarikh','desc')
                  ->get();
         }else if($request->jenis == 'mobile'){
- 
+
              $online=GlDetail::on($cawangan['mysql'])
                  ->where('kodcaw','=',$request->kodcaw)
                  ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
@@ -3253,14 +3253,14 @@ class AdminPageController extends Controller
              $online=GlDetail::on($cawangan['mysql'])
                  ->where('kodcaw','=',$request->kodcaw)
                  ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
-                 ->where('descpt','LIKE','SERAHAN LELONG ONLINE%')                 
+                 ->where('descpt','LIKE','SERAHAN LELONG ONLINE%')
                  ->where('teller','=','LELONG ONLINE')
                  ->where('serahan','>',0)
                  ->orderby('tarikh','desc')
                  ->get();
         }
-       
-  
+
+
         return response()->json($online,200);
     }
 
@@ -3405,7 +3405,6 @@ class AdminPageController extends Controller
                         $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                     })
                     ->where('trans.trans_type','!=','A')
-                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', '2022')
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
                     ->whereYear('tarikh_bayaran','<','2022')
                     ->where('trans.kodcaw',$kodcaw)
@@ -3453,7 +3452,6 @@ class AdminPageController extends Controller
                 $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
             })
             ->where('trans.trans_type','=','A')
-            ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', '2022')
             ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
             ->whereYear('transaksi_keuntungan.tarikh_bayaran','<','2022')
             ->sum('transaksi_keuntungan.bayaran_keuntungan');
@@ -3463,7 +3461,7 @@ class AdminPageController extends Controller
         $get_norujukan = Gadai::on($cawangan['mysql'])
         ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
         ->whereNotNull('hargajualan')->having('result','=',1)->whereYear('t_gadai','=','2022')->where('sttebus','<>','')->pluck('norujukan');
-        
+
         $sum_keun = Transaction::on('mysql7')
         ->selectRaw("trans.norujukan,SUM(CASE WHEN (transaction.trans_type) = 'T' THEN (trans.keuntungan_rebet) ELSE 0 END) AS sum_keun,SUM(CASE WHEN (transaction.trans_type) = 'A' THEN (trans.bayaran_keuntungan) ELSE 0 END) AS sum_bayaran")
         ->leftJoin('transaksi_keuntungan as trans', function($join)
@@ -3494,13 +3492,13 @@ class AdminPageController extends Controller
 
     public function getTarikhTunaiSebelum($kodcaw,Request $request){
         $current = Carbon::now();
-        $current = new Carbon();    
-     
+        $current = new Carbon();
+
          $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
          $tunai = Tunai::on($cawangan['mysql'])
                 ->where([['kodcaw','=',$kodcaw],['tarikh','<',$request->tarikh],['kodlaluan','=',$request->kodlaluan]])
                  ->orderby('tarikh','desc')->limit(1)->first();
-     
+
          return response()->json($tunai);
     }
 }