diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 007343a..0125752 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2725,7 +2725,7 @@ class GadaiController extends Controller
             ->join('tebus as teb','teb.norujukan','=','gadai.norujukan')
             ->where('gadai.tagpalsu','=',0)
             ->where([['gadai.t_gadai','<=',$tarikhtawarruq],['gadai.sttebus','=','T']])
-            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
+	    ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
             ->sum('teb.pinjaman');
 
        $pembiayaanlelong = Lelong::on($cawangan['mysql'])
@@ -2922,29 +2922,31 @@ class GadaiController extends Controller
                             ->pluck('norujukan');
 
         $transaksi_kredit_gadai =  Gadai::on($cawangan['mysql'])
-                            ->whereIn('gadai.norujukan',$transaksi_data)
-                            ->join('tebus as t','gadai.norujukan','=','t.norujukan')
+			    ->whereIn('norujukan',$transaksi_data)
+			    //->join('tebus as t','gadai.norujukan','=','t.norujukan')
                             ->where([['hargajualan','<>','null']])
-                            ->pluck('gadai.norujukan');
+			    //->orWhere([['sttebus','!=',''],['hargajualan','<>','null'],['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga]])
+                            ->pluck('norujukan');
 
         $transaksi_kredit = TransaksiKeuntungan::on('mysql7')
-        ->leftJoin('transaction as trans', function($join)
-                    {
-                        $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
-                        $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
-                    })
-        ->whereIn('transaksi_keuntungan.norujukan',$transaksi_kredit_gadai)
-        ->where('trans.trans_type','=','A')
-        ->whereDate('tarikh_bayaran','<=', $request->hingga)
-        ->whereDate('tarikh_bayaran','>=', $request->mula)
-        // ->whereBetween('tarikh_bayaran',[$from,$to])
-        ->sum('bayaran_pembiayaan');
+	      ->leftJoin('transaction as trans', function($join)
+                            {
+                                $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                                $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                            })
+            ->whereIn('transaksi_keuntungan.norujukan',$transaksi_kredit_gadai)
+            ->where('trans.trans_type','=','A')
+	    ->whereDate('tarikh_bayaran','<=', $request->hingga)
+            ->whereDate('tarikh_bayaran','>=', $request->mula)
+            // ->whereBetween('tarikh_bayaran',[$from,$to])
+            ->sum('bayaran_pembiayaan');
 
-        // $transaksi_kredit = TransaksiKeuntungan::on('mysql7')
-        //                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-        //                     ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
-        //                     ->sum('bayaran_pembiayaan');
 
+         //$transaksi_kredit = TransaksiKeuntungan::on('mysql7')
+         //                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+         //                    ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+         //                    ->sum('bayaran_pembiayaan');
+	//dd($transaksi_kredit);
 
         $tebus = Gadai::on($cawangan['mysql'])
                     ->select('gadai.norujukan','gadai.hargajualan','gadai.bakihargajualan')
@@ -2964,7 +2966,7 @@ class GadaiController extends Controller
             }
         }
 
-        // dd($arraytebus);
+        //dd($arraytebus);
 
         $transaksi_debit = TransaksiKeuntungan::on('mysql7')
                             ->leftJoin('transaction as trans', function($join)
@@ -2973,7 +2975,7 @@ class GadaiController extends Controller
                                 $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                             })
                             ->where('trans.trans_type','=','A')
-                            ->where('trans.norujukan',$arraytebus)
+                            ->whereIn('trans.norujukan',$arraytebus)
                             ->sum('bayaran_pembiayaan');
 
         $arraylejer = ["keluar" => $transaksi_debit,"masuk" => $transaksi_kredit];