diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index e00ed96..154e086 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -349,22 +349,34 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-        $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
+        // $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
-        Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
-        Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+        // Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+        // Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
 
-        $audit = new Audit();
-        $audit->users = $request->teller;
-        $audit->actions = $request->transaction;
-        $audit->norujukan = $norujukan;
-        $audit->old_data = $old_data;
-        $audit->kodcaw = $request->kodcaw;
-        $audit->created_at = $current;
-        $audit->updated_at = $current;
-        $audit->save();
+        // $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
+        $old_data = Gadai::on($cawangan['mysql'])->where([['norujukan','=',$norujukan],['pinjaman','=','NULL']])->orWhere([['norujukan','=',$norujukan],['pinjaman','=',0.00]])->first();
+        
+        
+        if($old_data){
+            Gadai::on($cawangan['mysql'])->where([['norujukan','=',$norujukan],['pinjaman','=','NULL']])->delete();
+            Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
 
-        return response('Batal Berjaya', 200);
+            $audit = new Audit();
+            $audit->users = $request->teller;
+            $audit->actions = $request->transaction;
+            $audit->norujukan = $norujukan;
+            $audit->old_data = $old_data;
+            $audit->kodcaw = $request->kodcaw;
+            $audit->created_at = $current;
+            $audit->updated_at = $current;
+            $audit->save();
+
+            //return response('Batal Berjaya', 200);
+            return response('Batal Berjaya', 200);
+        } else {
+            return response()->json('false');
+        }
     }
 
     public function pembelianKomuditi($kodcaw,$norujukan){