diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index b532906..7124be4 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -28,6 +28,7 @@ use App\KomuditiPurchase;
 use App\KomuditiTransaksi;
 use App\Advansur;
 use App\HistoryEmasSandaran;
+use App\InOutMar;
 
 use Illuminate\Http\Request;
 
@@ -2250,15 +2251,16 @@ class GadaiController extends Controller
                     'baki' => $bakiakhir
                     ));
 
-
-                    Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
-
                     Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
 
+                    InOutMar::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+
                     TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
 
                     Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
 
+                    Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
+
                     return response('Deleted Successfully', 200);
                 }
                 else
@@ -2277,14 +2279,18 @@ class GadaiController extends Controller
                     'baki' => $bakiakhir
                     ));
 
-                    Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
+
 
                     Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
 
+                    InOutMar::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+
                     TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
 
                     Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
 
+                    Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
+
                     return response('Deleted Successfully', 200);
                 }
                 else
@@ -3196,8 +3202,11 @@ class GadaiController extends Controller
         $totalrekod = $audit->sum('pinjaman');
         $totalberat = $audit->sum('berat');
         $totalnilaimarhun = $audit->sum('nilaimarhun');
+        $totalpinjaman = $audit->sum('pinjaman');
+        $totalbakipjm = $audit->sum('bakipjm');
+        $totaltunggakan = $audit->sum('tunggakan');
 
-        $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' =>  $totalnilaimarhun];
+        $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' =>  $totalnilaimarhun,'totalpinjaman'=>$totalpinjaman,'totalbakipjm'=>$totalbakipjm,'totaltunggakan'=>$totaltunggakan];
 
         return response()->json($arrayrekod,200);
     }
@@ -3222,6 +3231,21 @@ class GadaiController extends Controller
         return response()->json($arrayrekod,200);
     }
 
+    public function kiraupahTawarruqStokAudit($tempoh,$tempohbayar,$kadarupah,$bakipinjaman){
+
+        $bilang_bln = $tempoh - $tempohbayar;
+
+        $upahsemasa_raw = $bilang_bln * (($kadarupah/100 )* $bakipinjaman);
+
+        $upah_semasa_round = number_format($upahsemasa_raw,2);
+        $upah_semasa = substr($upah_semasa_round, 0, -1);
+	    // $upah_semasa = floatval(preg_replace('/[^\d.]/', '', $upah_semasa));
+        if(strpos($upah_semasa,',')){
+            $upah_semasa = str_replace(',','',$upah_semasa);
+        }
+        return $upah_semasa;
+    }
+
     public function updateJBGsemasa(){
         $cawangan = Cawangan::on('mysql7')->get();
         $current = Carbon::now();
@@ -3261,10 +3285,12 @@ class GadaiController extends Controller
                 else if($days >= 16){
                     $extensivemonth = 1;
                 }
+                $upah_semasa = $this->kiraupahTawarruqStokAudit($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarupah'],$gadai['bakipjm']);
                 $tempoh_update = $year + $month + $extensivemonth;
                 Gadai::on($cawangan_mysql['mysql'])->where('norujukan','=',$gadai['norujukan'])->update(array(
                     'jbg' => $tempoh_gadai,
-                    'tempoh' => $tempoh_gadai
+                    'tempoh' => $tempoh_gadai,
+                    'tunggakan' => $upah_semasa
                 ));
             }
         }
diff --git a/app/TransactionOnline.php b/app/TransactionOnline.php
index 61f3dab..6b180c7 100644
--- a/app/TransactionOnline.php
+++ b/app/TransactionOnline.php
@@ -15,7 +15,7 @@ class TransactionOnline extends Model
      * @var array
      */
     protected $fillable = [
-      'nokp','reference_no','nosiri','total_payment','tarikh','masa','status','billplz_id','kodcaw','norujukan','paid_at','customer_name','update_status','update_serahan'
+      'nokp','reference_no','nosiri','total_payment','tarikh','masa','status','billplz_id','kodcaw','norujukan','paid_at','customer_name','update_status','update_serahan','tempohbayar'
     ];
 
     /**
@@ -24,4 +24,4 @@ class TransactionOnline extends Model
      * @var array
      */
     // protected $hidden = [];
-}
\ No newline at end of file
+}