diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index e03324d..15b7659 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -1025,9 +1025,7 @@
                     }
                 });
             }
-
         }
-
     }
 
 
diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php
index a4e5a8d..b1670d8 100644
--- a/resources/views/khazanah/gadaian.blade.php
+++ b/resources/views/khazanah/gadaian.blade.php
@@ -224,6 +224,8 @@
     })
 
     function checkserah(func){
+        event.preventDefault();
+        return false;
         var norujukan = $('#norujukan_barcode').val();
         $.ajax({
             method:'get',
@@ -235,6 +237,8 @@
             },
             success:function(data){
                 if(data == 'true'){
+                    event.preventDefault();
+                    return false;
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran',
@@ -248,11 +252,5 @@
             }
         });
     }
-
-    $('#norujukan_barcode').keyup(function(){
-        if(this.value.length >= 14){
-            $('#submit_button').submit();
-        }
-    });
 </script>
 @endsection
diff --git a/resources/views/khazanah/tebus.blade.php b/resources/views/khazanah/tebus.blade.php
index a9fad55..d4c8eb3 100644
--- a/resources/views/khazanah/tebus.blade.php
+++ b/resources/views/khazanah/tebus.blade.php
@@ -52,13 +52,11 @@
                         <a href="{{ url('menu') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a>
                         </div>
                         <div class="col-8 justify-content-center">
-                        <form action="{{ route('barcodetebus.scanned') }}" method="post">
+                        <form action="{{ route('barcodetebus.scanned') }}" onsubmit="return checkserah(this)" method="post">
                                 @csrf
-
                             <label>Scan Barcode Keluar Marhun Dari Peti Besi </label>
                             <input type="text" class="form-control col-6 mx-auto" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode"  placeholder="SILA SCAN BARCODE PADA SAG"/>
                             <input type="submit" id="submit_button" name="submit_button" hidden>
-
                         </form>
 
                         </div>
@@ -75,12 +73,6 @@
                         <li class="nav-item">
                             <a class="nav-link" id="gadaian-belum-serah-tab" data-toggle="tab" href="#gadaian-belum-serah" role="tab" aria-controls="gadaian-belum-serah" aria-selected="false">Telah Scan</a>
                         </li>
-                        {{-- <li class="nav-item">
-                        <div class="row">
-                        <input type="checkbox"/><span>Auto Refresh</span>
-                        <input type="checkbox"/><span>Semak Marhun Lain</span>
-                        </div>
-                        </li> --}}
                     </ul>
 
                     <div class="tab-content" id="myTabContent">
@@ -203,8 +195,37 @@ var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
                 });
             });
         });
-
     });
 
+    function checkserah(func){
+        event.preventDefault();
+        return false;
+        var norujukan = $('#norujukan_barcode').val();
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/check/serah/gadai',
+            datatype:'json',
+            data:{
+                'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                'norujukan': norujukan
+            },
+            success:function(data){
+                if(data == 'true'){
+                    event.preventDefault();
+                    return false;
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran',
+                        text: 'Gadaian Sudah Scan'
+                    });
+                }else if(data == 'false'){
+                    $(func).attr("onSubmit","return true;");
+                    $(func).submit();
+                    return true;
+                }
+            }
+        });
+    }
+
 </script>
 @endsection