diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 9aeaaaa..ccb4722 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -3432,9 +3432,9 @@ class GadaiController extends Controller
     public function calculateAkru(Request $request){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
         $akru_by_cawangan = [];
-        $date_request = Carbon::parse($request->date. ' 00:00:00');
-        $gadai_all = Gadai::on($cawangan['mysql'])->where([['sttebus',''],['t_gadai','<=',$request->date]])->get();
-        $akru_cawangan = 0;
+        $date_request = Carbon::parse($request->date_end. ' 00:00:00');
+        $gadai_all = Gadai::on($cawangan['mysql'])->where([['sttebus',''],['t_gadai','<=',$request->date_end]])->get();
+        $akru_cawangan_masih_aktif = 0;
         foreach($gadai_all as $index_gadai=>$gadai){
             if($gadai['t_update'] == null){
                 $tarikh_update = Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
@@ -3457,9 +3457,65 @@ class GadaiController extends Controller
             }
             $tempoh_gadai = $year_gadai + $month_gadai + $extensivemonth_gadai;
 
-            $akru_cawangan = $akru_cawangan + ($gadai['pinjaman'] * ($gadai['kadarupah']/100) * $tempoh_gadai);
+            if($gadai['hargajualan'] > 0){
+                $upah = $gadai['pinjaman'] * ($gadai['kadarupah']/100) * $tempoh_gadai;
+            }else{
+                $upah_asal = $gadai['nilaimarhun'] / 100 * $gadai['kadarupah'];
+                $margin_pinjaman = $gadai['pinjaman'] / $gadai['nilaimarhun'] * 100;
+                $margin_kadarupah = 80;
+                $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
+                $upah_sebenar = $upah_asal - $rebet;
+                $upah = $upah_sebenar * $tempoh_gadai;
+            }
+
+            $akru_cawangan_masih_aktif = $akru_cawangan_masih_aktif + $upah;
         }
 
-        return response()->json(number_format($akru_cawangan,2));
+        $tebus_all = Gadai::on($cawangan['mysql'])->join('tebus','tebus.norujukan','=','gadai.norujukan')->where([['gadai.t_gadai','<=',$request->date_end],['gadai.t_gadai','>=',$request->date_start]])->get();
+
+        // dd($tebus_all[0]);
+        $akru_cawangan_tebus = 0;
+        foreach($tebus_all as $index_tebus=>$tebus){
+            // dd($tebus['n']);
+            if($tebus['t_tebus'] > $request->date_end){
+                $date_compare = Carbon::parse($request->date_end. ' 00:00:00');
+            }else{
+                $date_compare = Carbon::parse($tebus['t_tebus']. ' 00:00:00');
+            }
+
+            $tarikh_gadai = Carbon::parse($tebus['t_gadai']. ' 00:00:00');
+
+            $diff_gadai = date_diff($tarikh_gadai,$date_compare);
+            $year_gadai = $diff_gadai->format("%y") * 12;
+            $month_gadai = $diff_gadai->format("%m");
+            $days_gadai = $diff_gadai->format("%d");
+            $days_gadai = $days_gadai + 1;
+
+            if($days_gadai >= 1 && $days_gadai <= 15){
+                $extensivemonth_gadai = 0.5;
+            }
+            else if($days_gadai >= 16){
+                $extensivemonth_gadai = 1;
+            }
+            $tempoh_gadai = $year_gadai + $month_gadai + $extensivemonth_gadai;
+
+            if($tebus['hargajualan'] > 0){
+                $upah = $tebus['pinjaman'] * ($tebus['kadarupah']/100) * $tempoh_gadai;
+            }else{
+                $upah_asal = $tebus['nilaimarhun'] / 100 * $tebus['kadarupah'];
+                $margin_pinjaman = $tebus['pinjaman'] / $tebus['nilaimarhun'] * 100;
+                $margin_kadarupah = 80;
+                $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
+                $upah_sebenar = $upah_asal - $rebet;
+                $upah = $upah_sebenar * $tempoh_gadai;
+            }
+
+            $akru_cawangan_tebus = $akru_cawangan_tebus + $upah;
+        }
+
+        $total = $akru_cawangan_tebus + $akru_cawangan_masih_aktif;
+        
+
+        return response()->json(number_format($total,2));
     }
 }