diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index 805a5e2..41e5590 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -540,26 +540,7 @@
         minimumFractionDigits: 2
     });
 
-    function checkCanChangeGadaianDetail(norujukan){
-        let gadai_tawarruq = fetch(api_url + '/api/gadai/norujukan/' + norujukan );
 
-        gadai_tawarruq
-            .then(response => response.json())
-            .then(response => response[0][0])
-            .then(gadaian => {
-               return gadaian.historygadaian;
-            })
-            .then(historygadaian => {
-                let button_edit_gadaian = document.querySelector('#button-edit-gadaian');
-
-                if(historygadaian === '0' || historygadaian === null || historygadaian.length === 0) {
-                    button_edit_gadaian.disabled = false;
-                    return;
-                }
-
-                button_edit_gadaian.disabled = true;
-            })
-    }
 
     function checkserah(data){
         var urlpenebusan = $(data).data("url");
@@ -815,11 +796,8 @@
                                 var taglel = '';
                             }
 
-                            let table_norujukan = gadai_detail["norujukan"];
-                            let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
-
                             xtawarruq.row.add([
-                                '<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
+                                '<input type="radio" value='+ gadai_detail["norujukan"] + ' name="belum"/>',
                                 '<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
                                 gadai_detail['t_gadai'],
                                 tarikh_matang,
@@ -859,11 +837,8 @@
                                 }
                             }
 
-                            let table_norujukan = gadai_detail["norujukan"];
-                            let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
-
                             tablegadai.row.add([
-                                '<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
+                                '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
                                 '<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
                                 gadai_detail['t_gadai'],
                                 tarikh_matang,
@@ -1546,8 +1521,25 @@
         });
     }
 
+    function getIsGadaianTawarruq(norujukan){
+        return fetch(api_url + '/api/gadai/norujukan/' + norujukan )
+            .then(response => response.json())
+            .then(response => response[0][0])
+            .then(gadaian => {
+               return gadaian.historygadaian;
+            })
+            .then(historygadaian => {
 
-    function ubahfunc(e){
+                if(historygadaian === '0' || historygadaian === null || historygadaian.length === 0) {
+                    return false;
+                }
+
+               return true;
+            })
+
+    }
+
+    async function ubahfunc(e){
 
         let ubahid = $('input[name="belum"]:checked').val();
         let harini = new Date();harini.setHours(0, 0, 0, 0);
@@ -1563,6 +1555,20 @@
                 });
                 return false;
             }
+
+           // Handle cannot change detail on gadaian tawarruq
+           $norujukan_selected = document.querySelector('#myTable input[name="belum"]:checked').value;
+           let isGadaianTawarruq = await getIsGadaianTawarruq($norujukan_selected);
+
+           if(isGadaianTawarruq){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran',
+                    text: 'Gadaian adalah gadaian Tawarruq. Ubah Gadai Tidak Dibenarkan'
+                });
+                return false;
+           }
+
         }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
 
             let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();