diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index faf7af2..f7b41eb 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -3120,12 +3120,6 @@ class AdminPageController extends Controller
         $year = $current->year;
         $month = $tarikh->month;
 
-        // $test = Gadai::on($cawangan['mysql'])
-        // ->whereBetween('tempoh',[0.5,1])
-        // ->where('sttebus','<>','')
-        // ->whereYear('t_gadai',$current->year())
-        // ->pluck('norujukan');
-
         $get_norujukan = Gadai::on($cawangan['mysql'])
         ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
         ->whereNotNull('hargajualan')
@@ -3135,53 +3129,19 @@ class AdminPageController extends Controller
         ->where('sttebus','<>','')
         ->pluck('norujukan');
 
-        $sum_keun_tebus = Transaction::on('mysql7')
+        $sum_keun = Transaction::on('mysql7')
+        ->selectRaw("trans.norujukan,SUM(CASE WHEN (transaction.trans_type) = 'T' THEN (trans.keuntungan_rebet) ELSE 0 END) AS sum_keun,SUM(CASE WHEN (transaction.trans_type) = 'A' THEN (trans.bayaran_keuntungan) ELSE 0 END) AS sum_bayaran")
         ->leftJoin('transaksi_keuntungan as trans', function($join)
         {
-                $join->on('transaction.norujukan', '=', 'trans.norujukan');
-                $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+            $join->on('transaction.norujukan', '=', 'trans.norujukan');
+            $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
         })
-        ->whereIn('trans.norujukan',$get_norujukan)
-        ->where('transaction.trans_type','T')
-        ->where('margin_semasa','=',0)
-        ->sum('keuntungan_rebet');
-
-        $sum_keun_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');
-        })
-        ->whereIn('trans.norujukan',$get_norujukan)
-        ->where('transaction.trans_type','A')
-        ->where('margin_semasa','=',0)
-        ->sum('bayaran_keuntungan');
-
-
-        $sagbaru_norujukan = Gadai::on($cawangan['mysql'])
-        ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
-        ->whereNotNull('hargajualan')
-        ->having('result','=',1)
-        ->whereYear('t_gadai','=',$year)
-        ->whereMonth('t_gadai','<=',$month)
-        ->where('sttebus','=','')
-        ->where('tagbaru',1)
-        ->pluck('norujukan');
-
-        $keuntungan_baru = Transaction::on('mysql7')
-        ->leftJoin('transaksi_keuntungan as trans', function($join)
-        {
-                $join->on('transaction.norujukan', '=', 'trans.norujukan');
-                $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
-        })
-        ->whereIn('trans.norujukan',$sagbaru_norujukan)
-        ->where('transaction.trans_type','A')
-        ->sum('bayaran_keuntungan');
-
-
-        $total = $sum_keun_tebus + $sum_keun_ansuran + $keuntungan_baru;
+        ->whereIn('trans.norujukan',$get_norujukan)->get()->toArray();
 
+        $sum_keuntungan = ($sum_keun) ? $sum_keun[0]['sum_keun'] : 0;
+        $sum_bayaran = ($sum_keun) ? $sum_keun[0]['sum_bayaran'] : 0;
 
+        $total = $sum_keuntungan + $sum_bayaran;
         return response()->json($total);
     }