diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index e71a418..45b53e2 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -3141,7 +3141,23 @@ class AdminPageController extends Controller
         $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;
+        /* Ansuran masuk dalam ni */
+
+        $get_norujukan_ansuran = 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','=','')
+        ->pluck('norujukan');
+
+        $summation_ansuran = TransaksiKeuntungan::on('mysql7')
+        ->whereIn('norujukan',$get_norujukan_ansuran)->sum('bayaran_keuntungan');
+
+
+
+        $total = $sum_keuntungan + $sum_bayaran + $summation_ansuran;
         return response()->json($total);
     }
 
diff --git a/app/Support/v2/GadaiV2.php b/app/Support/v2/GadaiV2.php
index 0aa048a..68bdebc 100644
--- a/app/Support/v2/GadaiV2.php
+++ b/app/Support/v2/GadaiV2.php
@@ -312,8 +312,7 @@ class GadaiV2
                         $margin_updated = ($baki_pinjaman / $gadai['nilaimarhun']) * 100;
                         
                         $tempoh_gadai = $this->tempohTransactionGadai($gadai);
-                        $akrual = $this->kiraupahTawarruqStokAuditUjrahOnePercent($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarujrah'],$gadai['bakipjm'],$gadai['nilaimarhun'],$margin_semasa);
-
+                        $akrual = $this->kiraupahTawarruqStokAuditUjrahOnePercent($tempoh_gadai,$gadai['tempoh'],$gadai['kadarujrah'],$gadai['bakipjm'],$gadai['nilaimarhun'],$margin_semasa);
                         $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
                             'bakipjm' => $baki_pinjaman,
                             'jbg' => 0,
@@ -449,7 +448,13 @@ public function kiraupahTawarruqStokAuditUjrahOnePercent($tempoh,$tempohbayar,$k
     return $arraypendapatan;
 }
 
-private function tempohTransactionGadai($gadai){
+public function tempohTransactionGadai($gadai) : Float{
+    if($gadai['t_update'] == null){
+        Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
+    }else{
+        Carbon::parse($gadai['t_update'].' 00:00:00' );
+    }
+
     $tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00');
     $current = Carbon::now();
     $tahun_gadai = $tarikh_gadai->year;