diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 84d01fd..5d23143 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2542,19 +2542,19 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        $Gadai = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',0)
-            ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']])
-            ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
-            ->sum('pinjaman');
+        // $Gadai = Gadai::on($cawangan['mysql'])
+        //     ->where('tagpalsu','=',0)
+        //     ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']])
+        //     ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
+        //     ->sum('pinjaman');
+
+        $Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman');
 
         $Tebus = Tebus::on($cawangan['mysql'])
-            ->join('Gadai as gad','gad.norujukan','=','Tebus.norujukan')
+            ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
             ->where('gad.tagpalsu','=',0)
-            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']])
-            ->sum('teb.pinjaman');
-
-        dd($Tebus);
+            ->where([['tebus.t_tebus','>=',$request->mula],['tebus.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']])
+            ->sum('tebus.pinjaman');
 
             $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus];
 
@@ -2676,29 +2676,15 @@ class GadaiController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        $rekodaudit = Gadai::on($cawangan['mysql'])
+        $audit = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
-            ->get();
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
 
-        $totalrekod = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',0)
-            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
-            ->sum('pinjaman');
-
-        $totalberat = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',0)
-            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
-            ->sum('berat');
-
-        $totalnilaimarhun = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',0)
-            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
-            ->sum('nilaimarhun');
+        $rekodaudit = $audit->get();
+        $totalrekod = $audit->sum('pinjaman');
+        $totalberat = $audit->sum('berat');
+        $totalnilaimarhun = $audit->sum('nilaimarhun');
 
         $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' =>  $totalnilaimarhun];
 
@@ -2709,29 +2695,15 @@ class GadaiController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        $rekodaudit = Gadai::on($cawangan['mysql'])
+        $audit = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',1)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
-            ->get();
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
 
-        $totalrekod = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',1)
-            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
-            ->sum('pinjaman');
-
-        $totalberat = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',1)
-            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
-            ->sum('berat');
-
-        $totalnilaimarhun = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',1)
-            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
-            ->sum('nilaimarhun');
+        $rekodaudit = $audit->get();
+        $totalrekod = $audit->sum('pinjaman');
+        $totalberat = $audit->sum('berat');
+        $totalnilaimarhun = $audit->sum('nilaimarhun');
 
         $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' =>  $totalnilaimarhun];
 
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 425d2b2..08e1499 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -1051,29 +1051,24 @@ class TebusController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
-
         if($request->tarikh < '2021-06-09')
         {
             $keuntungan = TransaksiKeuntungan::on('mysql7')
                 ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-                ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<', $request->tarikh)
-                ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
+                ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
+                ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
                 ->whereYear('tarikh_bayaran','=',$current->year)
                 ->whereNotNull('db2.hargajualan')
                 ->sum('bayaran_keuntungan');
 
-
             $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
                 ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-                ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $request->tarikh)
+                ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
                 ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
                 ->whereYear('tarikh_bayaran','=',$current->year)
                 ->whereNotNull('db2.hargajualan')
                 ->sum('keuntungan_rebet');
 
-
-            // dd($keuntungan,$keuntunganreducing);
-
             $total = ($keuntungan + $keuntunganreducing);