diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index d86cbe7..90e6a79 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -191,12 +191,12 @@ class AdminPageController extends Controller
                 ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
                 ->where('bajettahunan.kodcaw','=', $request->kodcaw)
                 ->where('jenisbajet','=','Gadai')
-                ->whereYear('bajettahunan.tahun', '=', $current->year)
+                ->whereYear('bajettahunan.tahun', '=', $request->year)
                 ->sum('nilaibajet');
 
         $gadai = Gadai::on($cawangan['mysql'])
                 ->selectRaw('SUM(pinjaman) AS totalpinjaman')
-                ->whereYear('t_gadai',$current->year)
+                ->whereYear('t_gadai',$request->year)
                 ->sum('pinjaman');
 
                 
@@ -218,11 +218,11 @@ class AdminPageController extends Controller
                 ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
                 ->where('bajettahunan.kodcaw','=', $request->kodcaw)
                 ->where('jenisbajet','=','Penebusan')
-                ->whereYear('bajettahunan.tahun', '=', $current->year)
+                ->whereYear('bajettahunan.tahun', '=', $request->year)
                 ->sum('nilaibajet');
 
         $tebus = Gadai::on($cawangan['mysql'])
-                ->whereYear('t_update',$current->year)
+                ->whereYear('t_update',$request->year)
                 ->where('sttebus','!=','')
                 ->sum('pinjaman');
 
@@ -251,7 +251,7 @@ class AdminPageController extends Controller
                 ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
                 ->where('bajettahunan.kodcaw','=', $request->kodcaw)
                 ->where('jenisbajet','=','Keuntungan')
-                ->whereYear('bajettahunan.tahun', '=', $current->year)
+                ->whereYear('bajettahunan.tahun', '=', $request->year)
                 ->sum('nilaibajet');   
 
         $tebus_arrahn = Tebus::on($cawangan['mysql'])
@@ -261,7 +261,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(t_tebus, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
-                ->whereYear('t_tebus',$current->year)
+                ->whereYear('t_tebus',$request->year)
                 ->where([['tebus.jenistebus','=','T'],['gadai.hargajualan','=',null],['t_tebus','<=',$current->toDateString()]])
                 ->orderBy('t_tebus','asc')
                 ->get()->toArray();
@@ -272,7 +272,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(tarikh, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(tarikh,'%Y%m')"))
-                ->whereYear('tarikh',$current->year)
+                ->whereYear('tarikh',$request->year)
                 ->where([['tarikh','<=',$current->toDateString()]])
                 ->get()->toArray();
 
@@ -282,7 +282,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
-                ->whereYear('transaction.created_at',$current->year)
+                ->whereYear('transaction.created_at',$request->year)
                 ->leftJoin('transaksi_keuntungan as trans', function($join)
                 {
                         $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -299,7 +299,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
-                ->whereYear('transaction.created_at',$current->year)
+                ->whereYear('transaction.created_at',$request->year)
                 ->leftJoin('transaksi_keuntungan as trans', function($join)
                 {
                         $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -317,7 +317,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(t_jual, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(t_jual,'%Y%m')"))
-                ->whereYear('t_jual',$current->year)
+                ->whereYear('t_jual',$request->year)
                 ->orderBy('t_jual','asc')
                 ->get()->toArray();
 
@@ -387,45 +387,45 @@ class AdminPageController extends Controller
               
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
-                                $tarikh = $current->year . '-' . '01';
+                                $tarikh = $request->year . '-' . '01';
                                 break;
                         case 2: $namabulan = 'Feb';
-                                $tarikh = $current->year . '-' . '02';
+                                $tarikh = $request->year . '-' . '02';
                                 break;
                         case 3: $namabulan = 'Mac';
-                                $tarikh = $current->year . '-' . '03';
+                                $tarikh = $request->year . '-' . '03';
                                 break;
                         case 4: $namabulan = 'Apr';
-                                $tarikh = $current->year . '-' . '04';
+                                $tarikh = $request->year . '-' . '04';
                                 break;
                         case 5: $namabulan = 'Mei';
-                                $tarikh = $current->year . '-' . '05';
+                                $tarikh = $request->year . '-' . '05';
                                 break;
                         case 6: $namabulan = 'Jun';
-                                $tarikh = $current->year . '-' . '06';
+                                $tarikh = $request->year . '-' . '06';
                                 break;
                         case 7: $namabulan = 'Jul';
-                                $tarikh = $current->year . '-' . '07';
+                                $tarikh = $request->year . '-' . '07';
 
                                 break;
                         case 8: $namabulan = 'Aug';
-                                $tarikh = $current->year . '-' . '08';
+                                $tarikh = $request->year . '-' . '08';
 
                                 break;
                         case 9: $namabulan = 'Sep';
-                                $tarikh = $current->year . '-' . '09';
+                                $tarikh = $request->year . '-' . '09';
 
                                 break;
                         case 10: $namabulan = 'Okt';
-                                $tarikh = $current->year . '-' . '10';
+                                $tarikh = $request->year . '-' . '10';
 
                                 break;
                         case 11: $namabulan = 'Nov';
-                                $tarikh = $current->year . '-' . '11';
+                                $tarikh = $request->year . '-' . '11';
 
                                 break;
                         case 12: $namabulan = 'Dis';
-                                $tarikh = $current->year . '-' . '12';
+                                $tarikh = $request->year . '-' . '12';
                                 break;
                                                     
                     }
@@ -440,7 +440,7 @@ class AdminPageController extends Controller
             ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
             ->where('bajettahunan.kodcaw','=', $request->kodcaw)
             ->where('jenisbajet','=','Gadai')
-            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->whereYear('bajettahunan.tahun', '=', $request->year)
             ->get();
 
         foreach($bajetgroup as $index1=>$bj)
@@ -458,7 +458,7 @@ class AdminPageController extends Controller
                         ->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))
                         ->groupBy(DB::connection($cawangan['mysql'])
                         ->raw("DATE_FORMAT(t_gadai,'%Y%m')"))
-                        ->whereYear('t_gadai',$current->year)
+                        ->whereYear('t_gadai',$request->year)
                         ->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]])
                         ->orderBy('t_gadai','asc')
                         ->get();
@@ -500,45 +500,45 @@ class AdminPageController extends Controller
 
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
-                                $tarikh = $current->year . '-' . '01';
+                                $tarikh = $request->year . '-' . '01';
                                 break;
                         case 2: $namabulan = 'Feb';
-                                $tarikh = $current->year . '-' . '02';
+                                $tarikh = $request->year . '-' . '02';
                                 break;
                         case 3: $namabulan = 'Mac';
-                                $tarikh = $current->year . '-' . '03';
+                                $tarikh = $request->year . '-' . '03';
                                 break;
                         case 4: $namabulan = 'Apr';
-                                $tarikh = $current->year . '-' . '04';
+                                $tarikh = $request->year . '-' . '04';
                                 break;
                         case 5: $namabulan = 'Mei';
-                                $tarikh = $current->year . '-' . '05';
+                                $tarikh = $request->year . '-' . '05';
                                 break;
                         case 6: $namabulan = 'Jun';
-                                $tarikh = $current->year . '-' . '06';
+                                $tarikh = $request->year . '-' . '06';
                                 break;
                         case 7: $namabulan = 'Jul';
-                                $tarikh = $current->year . '-' . '07';
+                                $tarikh = $request->year . '-' . '07';
 
                                 break;
                         case 8: $namabulan = 'Aug';
-                                $tarikh = $current->year . '-' . '08';
+                                $tarikh = $request->year . '-' . '08';
 
                                 break;
                         case 9: $namabulan = 'Sep';
-                                $tarikh = $current->year . '-' . '09';
+                                $tarikh = $request->year . '-' . '09';
 
                                 break;
                         case 10: $namabulan = 'Okt';
-                                $tarikh = $current->year . '-' . '10';
+                                $tarikh = $request->year . '-' . '10';
 
                                 break;
                         case 11: $namabulan = 'Nov';
-                                $tarikh = $current->year . '-' . '11';
+                                $tarikh = $request->year . '-' . '11';
 
                                 break;
                         case 12: $namabulan = 'Dis';
-                                $tarikh = $current->year . '-' . '12';
+                                $tarikh = $request->year . '-' . '12';
                                 break;
                                                     
                     }
@@ -553,7 +553,7 @@ class AdminPageController extends Controller
             ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
             ->where('bajettahunan.kodcaw','=', $request->kodcaw)
             ->where('jenisbajet','=','Bilangan-Gadai')
-            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->whereYear('bajettahunan.tahun', '=', $request->year)
             ->get();
 
         foreach($bajetgroup as $index1=>$bj)
@@ -571,7 +571,7 @@ class AdminPageController extends Controller
                         ->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))
                         ->groupBy(DB::connection($cawangan['mysql'])
                         ->raw("DATE_FORMAT(t_gadai,'%Y%m')"))
-                        ->whereYear('t_gadai',$current->year)
+                        ->whereYear('t_gadai',$request->year)
                         ->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]])
                         ->orderBy('t_gadai','asc')
                         ->get();
@@ -614,45 +614,45 @@ class AdminPageController extends Controller
                
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
-                                $tarikh = $current->year . '-' . '01';
+                                $tarikh = $request->year . '-' . '01';
                                 break;
                         case 2: $namabulan = 'Feb';
-                                $tarikh = $current->year . '-' . '02';
+                                $tarikh = $request->year . '-' . '02';
                                 break;
                         case 3: $namabulan = 'Mac';
-                                $tarikh = $current->year . '-' . '03';
+                                $tarikh = $request->year . '-' . '03';
                                 break;
                         case 4: $namabulan = 'Apr';
-                                $tarikh = $current->year . '-' . '04';
+                                $tarikh = $request->year . '-' . '04';
                                 break;
                         case 5: $namabulan = 'Mei';
-                                $tarikh = $current->year . '-' . '05';
+                                $tarikh = $request->year . '-' . '05';
                                 break;
                         case 6: $namabulan = 'Jun';
-                                $tarikh = $current->year . '-' . '06';
+                                $tarikh = $request->year . '-' . '06';
                                 break;
                         case 7: $namabulan = 'Jul';
-                                $tarikh = $current->year . '-' . '07';
+                                $tarikh = $request->year . '-' . '07';
 
                                 break;
                         case 8: $namabulan = 'Aug';
-                                $tarikh = $current->year . '-' . '08';
+                                $tarikh = $request->year . '-' . '08';
 
                                 break;
                         case 9: $namabulan = 'Sep';
-                                $tarikh = $current->year . '-' . '09';
+                                $tarikh = $request->year . '-' . '09';
 
                                 break;
                         case 10: $namabulan = 'Okt';
-                                $tarikh = $current->year . '-' . '10';
+                                $tarikh = $request->year . '-' . '10';
 
                                 break;
                         case 11: $namabulan = 'Nov';
-                                $tarikh = $current->year . '-' . '11';
+                                $tarikh = $request->year . '-' . '11';
 
                                 break;
                         case 12: $namabulan = 'Dis';
-                                $tarikh = $current->year . '-' . '12';
+                                $tarikh = $request->year . '-' . '12';
                                 break;
                                                     
                     }
@@ -665,7 +665,7 @@ class AdminPageController extends Controller
             ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
             ->where('bajettahunan.kodcaw','=', $request->kodcaw)
             ->where('jenisbajet','=','Penebusan')
-            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->whereYear('bajettahunan.tahun', '=', $request->year)
             ->get();
 
         foreach($bajetgroup as $index1=>$bj)
@@ -685,7 +685,7 @@ class AdminPageController extends Controller
                         ->raw('DATE_FORMAT(t_update, "%Y-%m") as t_update'))
                         ->groupBy(DB::connection($cawangan['mysql'])
                         ->raw("DATE_FORMAT(t_update,'%Y%m')"))
-                        ->whereYear('t_update',$current->year)
+                        ->whereYear('t_update',$request->year)
                         ->where([['sttebus','!=',''],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]])
                         ->orderBy('t_update','asc')
                         ->get()->toArray();
@@ -696,7 +696,7 @@ class AdminPageController extends Controller
                         ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
                         ->groupBy(DB::connection($cawangan['mysql'])
                         ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
-                        ->whereYear('transaction.created_at',$current->year)
+                        ->whereYear('transaction.created_at',$request->year)
                         ->leftJoin('transaksi_keuntungan as trans', function($join)
                         {
                                 $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -747,45 +747,45 @@ class AdminPageController extends Controller
 
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
-                                $tarikh = $current->year . '-' . '01';
+                                $tarikh = $request->year . '-' . '01';
                                 break;
                         case 2: $namabulan = 'Feb';
-                                $tarikh = $current->year . '-' . '02';
+                                $tarikh = $request->year . '-' . '02';
                                 break;
                         case 3: $namabulan = 'Mac';
-                                $tarikh = $current->year . '-' . '03';
+                                $tarikh = $request->year . '-' . '03';
                                 break;
                         case 4: $namabulan = 'Apr';
-                                $tarikh = $current->year . '-' . '04';
+                                $tarikh = $request->year . '-' . '04';
                                 break;
                         case 5: $namabulan = 'Mei';
-                                $tarikh = $current->year . '-' . '05';
+                                $tarikh = $request->year . '-' . '05';
                                 break;
                         case 6: $namabulan = 'Jun';
-                                $tarikh = $current->year . '-' . '06';
+                                $tarikh = $request->year . '-' . '06';
                                 break;
                         case 7: $namabulan = 'Jul';
-                                $tarikh = $current->year . '-' . '07';
+                                $tarikh = $request->year . '-' . '07';
 
                                 break;
                         case 8: $namabulan = 'Aug';
-                                $tarikh = $current->year . '-' . '08';
+                                $tarikh = $request->year . '-' . '08';
 
                                 break;
                         case 9: $namabulan = 'Sep';
-                                $tarikh = $current->year . '-' . '09';
+                                $tarikh = $request->year . '-' . '09';
 
                                 break;
                         case 10: $namabulan = 'Okt';
-                                $tarikh = $current->year . '-' . '10';
+                                $tarikh = $request->year . '-' . '10';
 
                                 break;
                         case 11: $namabulan = 'Nov';
-                                $tarikh = $current->year . '-' . '11';
+                                $tarikh = $request->year . '-' . '11';
 
                                 break;
                         case 12: $namabulan = 'Dis';
-                                $tarikh = $current->year . '-' . '12';
+                                $tarikh = $request->year . '-' . '12';
                                 break;
                                                     
                     }
@@ -800,7 +800,7 @@ class AdminPageController extends Controller
             ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
             ->where('bajettahunan.kodcaw','=', $request->kodcaw)
             ->where('jenisbajet','=','Bilangan-Tebus')
-            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->whereYear('bajettahunan.tahun', '=', $request->year)
             ->get();
 
         foreach($bajetgroup as $index1=>$bj)
@@ -820,7 +820,7 @@ class AdminPageController extends Controller
                         ->raw('DATE_FORMAT(t_update, "%Y-%m") as t_update'))
                         ->groupBy(DB::connection($cawangan['mysql'])
                         ->raw("DATE_FORMAT(t_update,'%Y%m')"))
-                        ->whereYear('t_update',$current->year)
+                        ->whereYear('t_update',$request->year)
                         ->where([['sttebus','=','T'],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]])
                         ->orderBy('t_update','asc')
                         ->get();
@@ -865,45 +865,45 @@ class AdminPageController extends Controller
 
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
-                                $tarikh = $current->year . '-' . '01';
+                                $tarikh = $request->year . '-' . '01';
                                 break;
                         case 2: $namabulan = 'Feb';
-                                $tarikh = $current->year . '-' . '02';
+                                $tarikh = $request->year . '-' . '02';
                                 break;
                         case 3: $namabulan = 'Mac';
-                                $tarikh = $current->year . '-' . '03';
+                                $tarikh = $request->year . '-' . '03';
                                 break;
                         case 4: $namabulan = 'Apr';
-                                $tarikh = $current->year . '-' . '04';
+                                $tarikh = $request->year . '-' . '04';
                                 break;
                         case 5: $namabulan = 'Mei';
-                                $tarikh = $current->year . '-' . '05';
+                                $tarikh = $request->year . '-' . '05';
                                 break;
                         case 6: $namabulan = 'Jun';
-                                $tarikh = $current->year . '-' . '06';
+                                $tarikh = $request->year . '-' . '06';
                                 break;
                         case 7: $namabulan = 'Jul';
-                                $tarikh = $current->year . '-' . '07';
+                                $tarikh = $request->year . '-' . '07';
 
                                 break;
                         case 8: $namabulan = 'Aug';
-                                $tarikh = $current->year . '-' . '08';
+                                $tarikh = $request->year . '-' . '08';
 
                                 break;
                         case 9: $namabulan = 'Sep';
-                                $tarikh = $current->year . '-' . '09';
+                                $tarikh = $request->year . '-' . '09';
 
                                 break;
                         case 10: $namabulan = 'Okt';
-                                $tarikh = $current->year . '-' . '10';
+                                $tarikh = $request->year . '-' . '10';
 
                                 break;
                         case 11: $namabulan = 'Nov';
-                                $tarikh = $current->year . '-' . '11';
+                                $tarikh = $request->year . '-' . '11';
 
                                 break;
                         case 12: $namabulan = 'Dis';
-                                $tarikh = $current->year . '-' . '12';
+                                $tarikh = $request->year . '-' . '12';
                                 break;
                                                     
                     }
@@ -919,7 +919,7 @@ class AdminPageController extends Controller
             ->join('bajet', 'bajettahunan.id', '=', 'bajet.bajetid')
             ->where('bajettahunan.kodcaw','=', $request->kodcaw)
             ->where('jenisbajet','=','Keuntungan')
-            ->whereYear('bajettahunan.tahun', '=', $current->year)
+            ->whereYear('bajettahunan.tahun', '=', $request->year)
             ->get();
 
         foreach($bajetgroup as $index1=>$bj)
@@ -939,7 +939,7 @@ class AdminPageController extends Controller
                     ->raw('DATE_FORMAT(t_jual, "%Y-%m") as tarikh'))
                     ->groupBy(DB::connection($cawangan['mysql'])
                     ->raw("DATE_FORMAT(t_jual,'%Y%m')"))
-                    ->whereYear('t_jual',$current->year)
+                    ->whereYear('t_jual',$request->year)
                     ->where([['t_jual','<=',$current->toDateString()],['t_jual','>=',$monthly_date]])
                     ->orderBy('t_jual','asc')
                     ->get()->toArray();
@@ -953,7 +953,7 @@ class AdminPageController extends Controller
                     ->raw('DATE_FORMAT(t_tebus, "%Y-%m") as tarikh'))
                     ->groupBy(DB::connection($cawangan['mysql'])
                     ->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
-                    ->whereYear('t_tebus',$current->year)
+                    ->whereYear('t_tebus',$request->year)
                     ->where([['tebus.jenistebus','=','T'],['gadai.hargajualan','=',null],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
                     ->orderBy('t_tebus','asc')
                     ->get()->toArray();
@@ -964,7 +964,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(tarikh, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(tarikh,'%Y%m')"))
-                ->whereYear('tarikh',$current->year)
+                ->whereYear('tarikh',$request->year)
                 ->where([['tarikh','<=',$current->toDateString()],['tarikh','>=',$monthly_date]])
                 ->get()->toArray();
 
@@ -974,7 +974,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
-                ->whereYear('transaction.created_at',$current->year)
+                ->whereYear('transaction.created_at',$request->year)
                 ->leftJoin('transaksi_keuntungan as trans', function($join)
                 {
                         $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -991,7 +991,7 @@ class AdminPageController extends Controller
                 ->raw('DATE_FORMAT(transaction.created_at, "%Y-%m") as tarikh'))
                 ->groupBy(DB::connection($cawangan['mysql'])
                 ->raw("DATE_FORMAT(transaction.created_at,'%Y%m')"))
-                ->whereYear('transaction.created_at',$current->year)
+                ->whereYear('transaction.created_at',$request->year)
                 ->leftJoin('transaksi_keuntungan as trans', function($join)
                 {
                         $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -1686,9 +1686,10 @@ class AdminPageController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $updatetunai = Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $request->tarikh],['kodlaluan','=', $request->kodlaluan] ])->
         update(array(
-             'keluar'=>$request->keluar,
-              'masuk'=>$request->masuk,
-              'baki'=>$request->bakiakhir
+                'bakiawal'=>$request->bakiawal,
+                'keluar'=>$request->keluar,
+                'masuk'=>$request->masuk,
+                'baki'=>$request->bakiakhir
         ));
 
         return response()->json($updatetunai, 200);
@@ -3474,4 +3475,16 @@ class AdminPageController extends Controller
 
         return response()->json($total,200);
     }
+
+    public function getTarikhTunaiSebelum($kodcaw,Request $request){
+        $current = Carbon::now();
+        $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);
+    }
 }
diff --git a/routes/web.php b/routes/web.php
index 84f862e..57c8eed 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -652,6 +652,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){
     $router->get('getTunaiPaginate/{kodcaw}',['uses' => 'AdminPageController@TunaiPaginateforAdmin']);
     $router->get('getPetiBesiPaginate/{kodcaw}',['uses' => 'AdminPageController@PetiBesiPaginateforAdmin']);
     $router->get('GetTunaiByTarikh/{kodcaw}',['uses' =>'AdminPageController@getTarikhTunai']);
+    $router->get('GetTunaiByTarikhSebelum/{kodcaw}',['uses' =>'AdminPageController@getTarikhTunaiSebelum']);
     $router->get('getAddTunaiDateKodlaluan/{kodcaw}/',['uses' =>'AdminPageController@getAddTunaiDateKodlaluan']);
     $router->get('AdvansurSearchByTarikh/{kodcaw}',['uses'=>'AdminPageController@SenaraiAdvansurTarikh']);
     $router->get('TuntutBakiTarikhTeller/{kodcaw}',['uses'=>'AdminPageController@showTuntutBakiTarikhTeller']);