diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index c133a66..6bb5896 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -325,8 +325,8 @@
 
     bilmarhun();
 
-    var tarikhtawarruq = new Date("2021/02/31");
-    var tarikhgadai = new Date("{{ $gadai['t_gadai'] }}");
+    
+    var hargajualan = "{{ $gadai['hargajualan'] }}";
 
 
     var kodcaw = "{{ $gadai['kodcaw'] }}";
@@ -350,7 +350,7 @@
     });
 
     function tebusan(){
-        if(tarikhgadai >= tarikhtawarruq){   
+        if(hargajualan != null ){   
             let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm'] }}";
                                 
             $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));                            
@@ -382,7 +382,7 @@
             });
 
 
-        }else if(tarikhgadai < tarikhtawarruq){
+        }else if(hargajualan == null){
             let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['pinjaman'] }}";
 
             $('#tambahpinjamsebenar').val(formatter.format(Number(maxgadaila).toFixed(2)));
@@ -443,7 +443,7 @@
 
     }
 
-    if(tarikhgadai >= tarikhtawarruq){
+    if(hargajualan != null){
 
         //checked box
         var checkboxes = document.querySelectorAll('input[type="checkbox"]');
@@ -519,7 +519,7 @@
         });
 
     }
-    else if(tarikhgadai < tarikhtawarruq){
+    else if(hargajualan == null){
         //Separuh Bayar Bukan Tawarruq
         $(document).on('click', '#checkmarhun', function(e) {
 
@@ -703,7 +703,7 @@
 
     function bayartambahan(e){
         if($('#sltjenistebus').find(":selected").val() == 'A'){
-            if(tarikhgadai < tarikhtawarruq){
+            if(hargajualan == null){
         
                 let byr = $(e).val();
                 let total = 0;
@@ -752,14 +752,14 @@
         $("#terima_transaksi").prop('disabled', true);
         if($('#sltjenistebus').find(":selected").val() == 'T'){
             let jenisbayarantebus = '';
-            if(tarikhgadai < tarikhtawarruq)
+            if(hargajualan == null)
             {
                 jenisbayarantebus = "nottawarruq";
 
                 var urlroute = '{{ route("resit.belumtebus", ":id") }}';
                 urlroute = urlroute.replace(':id', norujukan);
             }
-            else if (tarikhgadai >= tarikhtawarruq){
+            else if (hargajualan != null){
                 jenisbayarantebus = "tawarruq";
 
                 var urlroute = '{{ route("resit.tebus", ":id") }}';
@@ -838,13 +838,13 @@
             let jenisbayarantebus = '';
             let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
 
-            if(tarikhgadai < tarikhtawarruq){
+            if(hargajualan == null){
                 jenisbayarantebus = "nottawarruq";
-            }else if (tarikhgadai >= tarikhtawarruq){
+            }else if (hargajualan != null){
                 jenisbayarantebus = "tawarruq";
             }
 
-            if(tarikhgadai >= tarikhtawarruq){
+            if(hargajualan != null){
                 var bayar = $('#bayaran').val(); 
                 var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;                
 
@@ -884,7 +884,7 @@
                 });
 
             }
-            else if(tarikhgadai < tarikhtawarruq){
+            else if(hargajualan == null){
                 // if($('#bayaran').val() > 0 && $('#bayaran').val() <= parseFloat($('#jumlahupah').val())){
                 //     Swal.fire(
                 //         'Amaran!',
@@ -987,11 +987,11 @@
 
         }else if($('#sltjenistebus').find(":selected").val() == 'S'){
             let jenisbayarantebus = '';
-            if(tarikhgadai < tarikhtawarruq)
+            if(hargajualan == null)
             {
                 jenisbayarantebus = "nottawarruq";
             }
-            else if (tarikhgadai >= tarikhtawarruq){
+            else if (hargajualan != null){
                 jenisbayarantebus = "tawarruq";
             }
 
@@ -1172,9 +1172,9 @@
         }else if($('#sltjenistebus').find(":selected").val() == 'P'){
             let pinjamanbaru = $('#pinjamanbaru').val();
             let jenisbayarantebus = '';
-            if(tarikhgadai < tarikhtawarruq){
+            if(hargajualan == null){
                 jenisbayarantebus = "nottawarruq";
-            }else if (tarikhgadai >= tarikhtawarruq){
+            }else if (hargajualan != null){
                 jenisbayarantebus = "tawarruq";
             }
 
@@ -1444,9 +1444,9 @@
     function tambahpinjamanfunc()
     {
         let jenisbayarantebus = '';
-        if(tarikhgadai < tarikhtawarruq){
+        if(hargajualan == null){
             jenisbayarantebus = "nottawarruq";
-        }else if (tarikhgadai >= tarikhtawarruq){
+        }else if (hargajualan != null){
             jenisbayarantebus = "tawarruq";
         }