diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index cffdc2f..de1f920 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -621,20 +621,38 @@ class LelongController extends Controller
             foreach($lelongList as $index=>$lelongData){
                 $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$lelongData['norujukan'])->first();
                 $tarikh_gadai = Carbon::parse($gadaiData['t_gadai']. ' 00:00:00');
+                $current = Carbon::now();
 
-                $diff_gadai = date_diff($tarikh_gadai,$current);
-                $year_gadai = $diff_gadai->format("%y") * 12;
-                $month_gadai = $diff_gadai->format("%m");
-                $days_gadai = $diff_gadai->format("%d");
-                $days_gadai = $days_gadai + 1;
+                $tahun_gadai = $tarikh_gadai->year;
+                $bulan_gadai = $tarikh_gadai->month;
+                $hari_gadai = $tarikh_gadai->day;
 
-                if($days_gadai >= 1 && $days_gadai <= 15){
+                $tahun_semasa = $current->year;
+                $bulan_semasa = $current->month;
+                $hari_semasa = $current->day;
+
+                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($beza_hari >= 1 && $beza_hari <= 15){
                     $extensivemonth_gadai = 0.5;
-                }
-                else if($days_gadai >= 16){
+                }else if($beza_hari >= 16){
                     $extensivemonth_gadai = 1;
+                }else{
+                    $extensivemonth_gadai = 0;
                 }
-                $tempoh_gadai = $year_gadai + $month_gadai + $extensivemonth_gadai;
+
+                $beza_tahun = $tahun_semasa - $tahun_gadai;
+
+                $beza_bulan = ($bulan_semasa + ($beza_tahun * 12)) - $bulan_gadai;
+
+                $tempoh_gadai = $beza_bulan + $extensivemonth_gadai;
 
                 $lelong = Lelong::on($cawangan['mysql'])->where('norujukan',$lelongData['norujukan'])->update([
                     'jbg' => $tempoh_gadai
@@ -669,7 +687,7 @@ class LelongController extends Controller
                 ->groupBy('batchno')
                 ->get();
         }
-        
+
 
         return response()->json($lelong);
     }
@@ -704,7 +722,7 @@ class LelongController extends Controller
                 ->orderBy('gadai.sirig','asc')
                 ->where('gadai.taglel','=', 1);
         }
-        
+
 
         $batchlel = BatchLel::on($cawangan['mysql'])
                     ->where('batchno','=',$request->batchno)
@@ -758,7 +776,7 @@ class LelongController extends Controller
         foreach($cawangan_all as $index=>$cawangan){
             $list_lelong = Lelong::on($cawangan['mysql'])->where('t_jual',null)->pluck('norujukan')->toArray();
 
-            $gadai_lelong = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_lelong)->where('lelong_tawarruq',0)->pluck('norujukan')->toArray();
+            $gadai_lelong = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_lelong)->where('lelong_tawarruq',0)->where('tempoh','<=',10.5)->pluck('norujukan')->toArray();
 
             $delete_lelong = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$gadai_lelong)->delete();