diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index ac8f36a..8ccf0f9 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -920,18 +920,25 @@ class GadaiController extends Controller
 
         $dateans = new Carbon($request->tarikh);
 
-        $gadai = Transaction::on('mysql7')
+        $ansuran = Transaction::on('mysql7')
                 ->leftJoin('transaksi_keuntungan as trans', function($join)
                 {
                     $join->on('transaction.norujukan', '=', 'trans.norujukan');
                     $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
                 })
+                ->leftJoin('customer as cust', function($join)
+                {
+                    $join->on('transaction.nokp', '=', 'cust.kpbaru');
+                    $join->orOn('transaction.nokp', '=', 'cust.kplama');
+                })
+                ->leftJoin($cawangan['db_name'].'.gadai as db2','transaction.norujukan','=','db2.norujukan')
                 ->where('transaction.kodcaw','=',$kodcaw)
                 ->where('transaction.trans_type','=','A')
                 ->whereDate('transaction.created_at','=',$dateans)
+                ->orderBy('transaction.teller')
                 ->get();
         
-        return response()->json($gadai);
+        return response()->json($ansuran);
     }
 
     public function getAnsuranSummary($kodcaw,Request $request){
@@ -947,16 +954,12 @@ class GadaiController extends Controller
                 })
                 ->where('transaction.kodcaw','=',$kodcaw)
                 ->where('transaction.trans_type','=','A')
-                ->whereDate('transaction.created_at','=',$dateans)
-                ->sum('trans.bayaran_keuntungan');
+                ->whereDate('transaction.created_at','=',$dateans);
 
-        $transaksi = TransaksiKeuntungan::on('mysql7')
-                ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-                ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]])
-                ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]])
-                ->sum('bayaran_pembiayaan');
+        $keuntungan = $ansurans->sum('trans.bayaran_keuntungan');
+        $pendahuluan = $ansurans->sum('trans.bayaran_pembiayaan');
 
-        $arrayansuran = ['totalpendahuluan' => $transaksi, 'totalkeuntungan' => $ansurans];
+        $arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan];
         
         return response()->json($arrayansuran,200);
     }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 7570541..a1fca9c 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -494,13 +494,14 @@ class TebusController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $tebus = Tebus::on($cawangan['mysql'])
-                ->select('tebus.t_tebus', 'gad.t_gadai','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
+                ->select('tebus.t_tebus', 'gad.t_gadai','trans.tarikh_bayaran','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
                 ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
                 ->join('online_arrahn.customer as cust', function($join)
                 {
                     $join->on('gad.nokp', '=', 'cust.kpbaru');
                     $join->orOn('gad.nokp', '=', 'cust.kplama');
                 })
+                ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan')
                 ->where('tebus.t_tebus','=',$tarikh)
                 ->orderBy('tebus.teller')
                 ->orderBy('tebus.sirit')