diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index dc1f026..ba23a9b 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1937,9 +1937,9 @@ class GadaiController extends Controller
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
-            if($request->tarikh > '2021-02-25')
+            if($request->tarikh > '2021-04-13')
             {
-                $request->tarikh = '2021-02-25';
+                $request->tarikh = '2021-04-13';
             }
         
             $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
@@ -1959,10 +1959,10 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        if($request->tarikh > '2021-02-25'){
+        if($request->tarikh > '2021-04-14'){
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
         ->where('tagpalsu','=',0)
-        ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-02-25'],['sttebus','=','']])
+        ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-14'],['sttebus','=','']])
         // ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
         ->sum('pinjaman');
         }
@@ -1974,15 +1974,15 @@ class GadaiController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        $datetawarruq = new Carbon('2021-02-25');
+        $datetawarruq = new Carbon('2021-04-14');
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
         $keuntungan = Gadai::on($cawangan['mysql'])
         ->where('t_gadai','<=',$request->tarikh)
-        ->where('t_gadai','>=','2021-03-14')
+        ->where('t_gadai','>=','2021-04-14')
         // ->where('sttebus','=','')
-        ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-03-14']])
+        ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
         ->whereNotNull('upah12')
         ->sum('upah12');
 
@@ -2000,7 +2000,7 @@ class GadaiController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        $datetawarruq = new Carbon('2021-02-25');
+        $datetawarruq = new Carbon('2021-04-14');
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
@@ -2008,7 +2008,7 @@ class GadaiController extends Controller
         $current = new Carbon();
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
-                    ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->where('db2.sttebus','=','')
                     ->where('tarikh_bayaran' ,'>=', $datetawarruq)
                     ->where('tarikh_bayaran' ,'<=', $daterequest)