diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 1d2ab0c..43849e5 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -3262,7 +3262,6 @@ class GadaiController extends Controller
         }else{
             $cawangan = Cawangan::on('mysql7')->where('zone',$request->zone)->get();
         }
-        $current = Carbon::now();
 
         foreach($cawangan as $cawangan_mysql){
             $all_gadai = Gadai::on($cawangan_mysql['mysql'])->whereNotIn('sttebus',['L','T'])->get();
@@ -3273,39 +3272,39 @@ class GadaiController extends Controller
                     $tarikh_update = Carbon::parse($gadai['t_update'].' 00:00:00' );
                 }
                 $tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00');
+                $current = Carbon::now();
 
-                $diff_carbon = $tarikh_gadai->diffInDays($current);
+                $tahun_gadai = $tarikh_gadai->year;
+                $bulan_gadai = $tarikh_gadai->month;
+                $hari_gadai = $tarikh_gadai->day;
 
-                $year = floor($diff_carbon/356);
-                $day_year_minus = $year * 356;
-                $diff_carbon = $diff_carbon - $day_year_minus;
+                $tahun_semasa = $current->year;
+                $bulan_semasa = $current->month;
+                $hari_semasa = $current->day;
 
-                $month = floor($diff_carbon/30);
-                $day_month_minus = $month * 30;
-                $diff_carbon = $diff_carbon - $day_month_minus;
+                if($hari_semasa >= $hari_gadai){
+                    $beza_hari = $hari_semasa - $hari_gadai + 1;
+                }else if($hari_semasa < $hari_gadai){
+                    $bulan_semasa = $bulan_semasa - 1;
+                    $beza_hari = ($hari_semasa + 30) - $hari_gadai + 1;
+                }
 
                 $extensivemonth_gadai = 0;
-                if($diff_carbon >= 1 && $diff_carbon <= 15){
-                    $extensivemonth_gadai = 0.5;
-                }
-                else if($diff_carbon >= 16){
-                    $extensivemonth_gadai = 1;
-                }
-                $tempoh_gadai = ($year*12) + $month + $extensivemonth_gadai;
 
-                if($gadai['t_gadai'] == $current->toDateString()){
-                    $tempoh_gadai = 0.5;
-                }
-                if($tempoh_gadai >= 12.0){
-                    if($gadai['t_matang1'] >= $current->toDateString()){
-                        $tempoh_gadai = 12.0;
-                    }
-                }else if($tempoh_gadai >= 6.0){
-                    if($gadai['t_matang'] >= $current->toDateString()){
-                        $tempoh_gadai = 6.0;
-                    }
+                if($beza_hari >= 1 && $beza_hari <= 15){
+                    $extensivemonth_gadai = 0.5;
+                }else if($beza_hari >= 16){
+                    $extensivemonth_gadai = 1;
+                }else{
+                    $extensivemonth_gadai = 0;
                 }
 
+                $beza_tahun = $tahun_semasa - $tahun_gadai;
+
+                $beza_bulan = ($bulan_semasa + ($beza_tahun * 12)) - $bulan_gadai;
+
+                $tempoh_gadai = $beza_bulan + $extensivemonth_gadai;
+
                 $upah_semasa = $this->kiraupahTawarruqStokAudit($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarupah'],$gadai['bakipjm']);
 
                 Gadai::on($cawangan_mysql['mysql'])->where('norujukan','=',$gadai['norujukan'])->update(array(