diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 7498b05..7f8e5bd 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2178,6 +2178,8 @@ class GadaiController extends Controller
             ->where('tagpalsu','=',0)
             ->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
             ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
+            // ->where([['hargajualan','=','NULL'],['sttebus','=','']])
+            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','=','NULL']])
             ->sum('pinjaman');
 
             // $gadaibaru = Gadai::on($cawangan['mysql'])
@@ -2197,15 +2199,16 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        if($request->tarikh > '2021-04-13'){
+        // if($request->tarikh > '2021-04-13'){
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             // ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]])
             ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
+            // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['hargajualan','<>','null']])
             ->sum('pinjaman');
-        }
+        // }
 
         return response()->json($rekod_pinjamandiberi);
     }
@@ -2223,7 +2226,8 @@ class GadaiController extends Controller
 
         $keuntungan = Gadai::on($cawangan['mysql'])
         ->where('t_gadai','<=',$request->tarikh)
-        ->where('t_gadai','>=','2021-04-14')
+        // ->where('t_gadai','>=','2021-04-14')
+        ->where('hargajualan','<>','null')
         // ->where('sttebus','=','')
         ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
         ->whereNotNull('upah12')
@@ -2261,7 +2265,8 @@ class GadaiController extends Controller
         $transaksi = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->where('db2.sttebus','=','')
-                    ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+                    // ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+                    ->where('db2.hargajualan','<>','null')
                     ->where('tarikh_bayaran' ,'<=', $daterequest)
                     ->sum('bayaran_pembiayaan');
 
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index efda1e5..418a456 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -864,7 +864,7 @@ class TebusController extends Controller
 
         $rebet = Tebus::on($cawangan['mysql'])
                 ->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
-                ->where('tebus.t_tebus','>','2021-04-13')
+                // ->where('tebus.t_tebus','>','2021-04-13')
                 ->where('tebus.t_tebus','<=',$request->tarikh)
                 ->whereNotNull('db2.hargajualan')
                 ->sum('rebate');