diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index d42f5d1..007343a 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2728,6 +2728,12 @@ class GadaiController extends Controller
             ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
             ->sum('teb.pinjaman');
 
+       $pembiayaanlelong = Lelong::on($cawangan['mysql'])
+            ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]])
+            ->sum('pinjaman');
+
+        $tebus = $tebus + $pembiayaanlelong;
+
         $array_rekodemas = ['Gadai' => $gadai,'Tebus' => $tebus];
 
         return response()->json($array_rekodemas);
@@ -2915,16 +2921,24 @@ class GadaiController extends Controller
                             ->where('kodcaw',$kodcaw)
                             ->pluck('norujukan');
 
-        $transaksi_kredit_gadai =  Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
-                            ->where([['sttebus',''],['hargajualan','<>','null']])
-                            ->pluck('norujukan');
+        $transaksi_kredit_gadai =  Gadai::on($cawangan['mysql'])
+                            ->whereIn('gadai.norujukan',$transaksi_data)
+                            ->join('tebus as t','gadai.norujukan','=','t.norujukan')
+                            ->where([['hargajualan','<>','null']])
+                            ->pluck('gadai.norujukan');
 
         $transaksi_kredit = TransaksiKeuntungan::on('mysql7')
-            ->whereIn('norujukan',$transaksi_kredit_gadai)
-            ->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')
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 5edc06f..3fcd8cf 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -63,14 +63,38 @@ class TransactionController extends Controller
     }
 
     public function getTransactionByid($id){
-        $transaction = Transaction::on('mysql7')->where('id','=',$id)->get();
+        $transaction = Transaction::on('mysql7')
+        ->leftJoin('transaksi_keuntungan as tk', function($join){
+            $join->on('tk.norujukan', '=', 'transaction.norujukan');
+            $join->on('tk.tarikh_bayaran', '=', 'transaction.created_at');
+        })
+        ->where('transaction.id','=',$id)->get();
 
         return response()->json($transaction);
     }
 
     public function getTransactionByRujukanOne($norujukan){
         
-        $transaction = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('created_at','desc')->first();
+        $transaction = Transaction::on('mysql7')
+        ->leftJoin('transaksi_keuntungan as tk', function($join){
+            $join->on('tk.norujukan', '=', 'transaction.norujukan');
+            $join->on('tk.tarikh_bayaran', '=', 'transaction.created_at');
+        })
+        ->where('transaction.norujukan','=',$norujukan)
+        ->orderBy('transaction.created_at','desc')->first();
+
+        return response()->json($transaction);
+    }
+
+    public function getTotalBayaranAnsuran(Request $request){
+        $transaction = Transaction::on('mysql7')
+        ->leftJoin('transaksi_keuntungan as tk', function($join){
+            $join->on('tk.norujukan', '=', 'transaction.norujukan');
+            $join->on('tk.tarikh_bayaran', '=', 'transaction.created_at');
+        })
+        ->where('transaction.norujukan','=',$request->norujukan)
+        ->where('transaction.trans_type','A')
+        ->sum('tk.bayaran_pembiayaan');
 
         return response()->json($transaction);
     }
diff --git a/routes/web.php b/routes/web.php
index a7dd751..cd9f759 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -196,6 +196,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('transaction/one/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanOne']);
     $router->get('transaction/id/{id}',['uses'=>'TransactionController@getTransactionByid']);
     $router->get('transaction/norujukan/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanAll']);
+    $router->get('transaction/norujukan/total/ansuran',['uses'=>'TransactionController@getTotalBayaranAnsuran']);
 
     
     $router->get('maxpinjaman',['uses'=>'MaxPinjamanController@getAllMaxPinjaman']);