diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index 370379d..963c7e4 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -901,8 +901,8 @@
                 }, 3000);
             }else if (result.dismiss === Swal.DismissReason.cancel) {
                 swalWithBootstrapButtons.fire(
-                    'Cancelled',
-                    'Your imaginary file is safe :)',
+                    'Batal',
+                    'Maklumat Gadaian Tidak Berjaya Dihapuskan',
                     'error'
                 )
             }
diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php
index 2abe66b..3c59b05 100644
--- a/resources/views/gadaian/edit.blade.php
+++ b/resources/views/gadaian/edit.blade.php
@@ -222,30 +222,28 @@
 </div>
 <script>
     var api_url = "<?php echo $api_url ?>";
-
+    $('form input').keydown(function (e) {
+        if (e.keyCode == 13) {
+            e.preventDefault();
+            return false;
+        }
+    });
     function disableF5(e) { if ((e.which || e.keyCode) == 116) e.preventDefault(); };
     $(document).ready( function () {
-
-        
         $.ajax({
             method: 'get',
             url: api_url + '/api/marhun/' + "{{ $norujukan }}",
-            success:function(data)
-            {
+            success:function(data){
                 let count = 0;
                 let jumlah = 0;
-                $.each(data,function(index,marhun)
-                {
-                    $.each(marhun,function(index,mar)
-                    {
+                $.each(data,function(index,marhun){
+                    $.each(marhun,function(index,mar){
                         jumlah += Number(mar['n_marhun']);
                         count++;
                     })
                 })
-
                 $('#bilangan_marhun').val(count);
                 $('#jumlah_nilai_marhun').val(formatter.format(jumlah));
-
             }
         });
 
@@ -387,11 +385,9 @@
             });
         });
 
-        if (count == 1)
-        {
+        if (count == 1){
             $('.buttonpunya').html("<button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button>");
         }
-    
         
         if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
             kadarupah = 1.25/100;
@@ -438,8 +434,7 @@
         });
     }
 
-    function deletemarhun(e)
-    {
+    function deletemarhun(e){
         let marhun = $(e).closest('tr').children('td:eq(1)').text();let selectedrow = $(e).closest('tr');let recnozz = tablemarhun.row(selectedrow).data();
         let norujuk = $('#norujukan').val();
 
@@ -451,24 +446,20 @@
                 "norujukan" : norujuk,
                 "recno" : recnozz[1]
             },
-            success:function(data)
-            {
-                console.log(data);
+            success:function(data){
                 location.reload();
             },error: function(xhr, status, error) {
-                        var err = eval("(" + xhr.responseText + ")");
-                        alert(xhr.responseText);
+                var err = eval("(" + xhr.responseText + ")");
+                alert(xhr.responseText);
             }
         });
     }
 
-    function editmarhun(e)
-    {
+    function editmarhun(e){
         let norujuk = $('#norujukan').val();let selectedrow = $(e).closest('tr');let recno = tablemarhun.row(selectedrow).data();
         let nm = recno[3];let karat = recno[4];let berat = recno[5];
         let harga = recno[7];
 
-
         $('#sltkarat').val(karat);
         $('#berat').val(berat);
         $('#nilaimarhun').val(nm.substring(2));
@@ -488,8 +479,7 @@
         $('#harga1').val(hargaref);
     });
 
-    function calculationharga(e)
-    {
+    function calculationharga(e){
         let berat = $(e).val();
         let total = 0;
         let harga = $('#harga1').val();
@@ -497,7 +487,6 @@
         total = berat * harga;
 
         $('#nilaimarhun').val(total.toFixed(2));
-        
     }
 
     $('#pinjaman').on('input',function(){
@@ -757,16 +746,8 @@
         }
         else{
             if(pinjaman > Number(pembiyaan_max_pelulus)+10){
-                // Swal.fire({
-                //     icon: 'error',
-                //     title: 'Amaran!',
-                //     text: 'Pembiayaan Memerlukan Kelulusan Operasi'
-                // });
-                // event.preventDefault();
-                // return false;
 
-                const swalWithBootstrapButtons = Swal.mixin
-                ({
+                const swalWithBootstrapButtons = Swal.mixin({
                     customClass: {
                         confirmButton: 'btn btn-success',
                         cancelButton: 'btn btn-danger'
@@ -775,111 +756,101 @@
                 })
 
                 swalWithBootstrapButtons.fire({
-                title: 'Dapatkan Pengesahan Daripada Operasi?',
-                text: "Tetapan margin melebihi 75% untuk Operasi!",
-                icon: 'info',
-                showCancelButton: true,
-                confirmButtonText: 'Setuju!',
-                cancelButtonText: 'Batal',
-                reverseButtons: true
+                    title: 'Dapatkan Pengesahan Daripada Operasi?',
+                    text: "Tetapan margin melebihi 75% untuk Operasi!",
+                    icon: 'info',
+                    showCancelButton: true,
+                    confirmButtonText: 'Setuju!',
+                    cancelButtonText: 'Batal',
+                    reverseButtons: true
                 }).then((result) => {
-                if (result.isConfirmed) {
-                    
-                    let norujukan = $('#norujukan').val();
+                    if (result.isConfirmed) {
+                        
+                        let norujukan = $('#norujukan').val();
 
-                    Swal.fire({
-                        title: 'Tunggu Pengesahan Daripada Operasi.',
-                        icon: 'info',
-                        width: 600,
-                        padding: '3em',
-                        background: '#fffff',
-                        showCancelButton: false,
-                        showConfirmButton: false,
-                        allowOutsideClick: false,
-                        allowEscapeKey: false,
-                        allowEnterKey: false
+                        Swal.fire({
+                            title: 'Tunggu Pengesahan Daripada Operasi.',
+                            icon: 'info',
+                            width: 600,
+                            padding: '3em',
+                            background: '#fffff',
+                            showCancelButton: false,
+                            showConfirmButton: false,
+                            allowOutsideClick: false,
+                            allowEscapeKey: false,
+                            allowEnterKey: false
                         })
 
                         $.ajax({
-                                method:'post',
-                                url: "{{ route('operasi.createkelulusan') }}",
-                                data: {
-                                    "_token": "{{ csrf_token() }}",
-                                    "norujukan" : norujukan
-                                    // "teller" : teller,
-                                    // "dategadai" : dategadai,
-                                    // "bilgadai" : noic,
-                                    // "jumpinjam" : jumpinjam,
-                                    // "teller" : teller
+                            method:'post',
+                            url: "{{ route('operasi.createkelulusan') }}",
+                            data: {
+                                "_token": "{{ csrf_token() }}",
+                                "norujukan" : norujukan
+                                // "teller" : teller,
+                                // "dategadai" : dategadai,
+                                // "bilgadai" : noic,
+                                // "jumpinjam" : jumpinjam,
+                                // "teller" : teller
 
+                            },
+                            success:function(data){
+                            
+                            console.log(data);
+
+                            },error: function(xhr, status, error) {
+                            var err = eval("(" + xhr.responseText + ")");
+                            alert(xhr.responseText);
+                            }
+                        });    
+
+                                //TIME INTERVAL
+                        let timerInterval;
+                
+                        timerInterval = setInterval(function(){
+                            $.ajax({
+                                method:'get',
+                                url: "{{ route('operasi.getkelulusan') }}",
+                                data: {
+                                    "norujukan" : norujukan
                                 },
                                 success:function(data){
-                                  
-                                   console.log(data);
+                                    
+                                    if(data != '')
+                                    {
+                                        clearInterval(timerInterval);
+                                        Swal.fire({
+                                            icon: 'success',
+                                            title: 'Anda Berjaya Menerima Pengesahan'
+                                        }).then(function(){
+
+                                            $(func).attr("onSubmit","return true;");
+                                            $(func).submit();
+                                            return true;
+
+                                        });
+                                    }
 
                                 },error: function(xhr, status, error) {
                                 var err = eval("(" + xhr.responseText + ")");
                                 alert(xhr.responseText);
                                 }
                             });    
-
-                            //TIME INTERVAL
-                            let timerInterval;
-                  
-                            timerInterval = setInterval(function()
-                            {
-                                $.ajax({
-                                        method:'get',
-                                        url: "{{ route('operasi.getkelulusan') }}",
-                                        data: {
-                                            "norujukan" : norujukan
-                                        },
-                                        success:function(data){
-                                            
-                                            if(data != '')
-                                            {
-                                                clearInterval(timerInterval);
-                                                Swal.fire({
-                                                    icon: 'success',
-                                                    title: 'Anda Berjaya Menerima Pengesahan'
-                                                }).then(function(){
-
-                                                    $(func).attr("onSubmit","return true;");
-                                                    $(func).submit();
-                                                    return true;
-
-                                                });
-                                            }
-
-                                        },error: function(xhr, status, error) {
-                                        var err = eval("(" + xhr.responseText + ")");
-                                        alert(xhr.responseText);
-                                        }
-                                    });
-                                
-                            }, 3000);
-                   
-                       
-                } else if (
-                    /* Read more about handling dismissals below */
-                    result.dismiss === Swal.DismissReason.cancel
-                ) {
-                    swalWithBootstrapButtons.fire(
-                    'Cancelled',
-                    'Your imaginary file is safe :)',
-                    'error'
-                    )
-                }
+                        }, 3000);
+                    } else if (result.dismiss === Swal.DismissReason.cancel){
+                        swalWithBootstrapButtons.fire(
+                            'Batal',
+                            'Malumat Gadaian Tidak Berjaya Disimpan',
+                            'error'
+                        )
+                    }
                 });
                
-                    event.preventDefault();
-                    return false;
+                event.preventDefault();
+                return false;
 
             }else if(pinjaman > Number(pembiayaan_max_teller)+10){
-                
-
-                const swalWithBootstrapButtons = Swal.mixin
-                ({
+                const swalWithBootstrapButtons = Swal.mixin({
                     customClass: {
                         confirmButton: 'btn btn-success',
                         cancelButton: 'btn btn-danger'
@@ -888,107 +859,99 @@
                 })
 
                 swalWithBootstrapButtons.fire({
-                title: 'Dapatkan Pengesahan Daripada Khazanah?',
-                text: "Tetapan margin melebihi 70% untuk Khazanah!",
-                icon: 'info',
-                showCancelButton: true,
-                confirmButtonText: 'Setuju!',
-                cancelButtonText: 'Batal',
-                reverseButtons: true
+                    title: 'Dapatkan Pengesahan Daripada Khazanah?',
+                    text: "Tetapan margin melebihi 70% untuk Khazanah!",
+                    icon: 'info',
+                    showCancelButton: true,
+                    confirmButtonText: 'Setuju!',
+                    cancelButtonText: 'Batal',
+                    reverseButtons: true
                 }).then((result) => {
-                if (result.isConfirmed) {
+                    if (result.isConfirmed) {
                     
-                    let norujukan = $('#norujukan').val();
+                        let norujukan = $('#norujukan').val();
 
-                    Swal.fire({
-                        title: 'Tunggu Pengesahan Daripada Khazanah.',
-                        icon: 'info',
-                        width: 600,
-                        padding: '3em',
-                        background: '#fffff',
-                        showCancelButton: false,
-                        showConfirmButton: false,
-                        allowOutsideClick: false,
-                        allowEscapeKey: false,
-                        allowEnterKey: false
+                        Swal.fire({
+                            title: 'Tunggu Pengesahan Daripada Khazanah.',
+                            icon: 'info',
+                            width: 600,
+                            padding: '3em',
+                            background: '#fffff',
+                            showCancelButton: false,
+                            showConfirmButton: false,
+                            allowOutsideClick: false,
+                            allowEscapeKey: false,
+                            allowEnterKey: false
                         })
 
                         $.ajax({
-                                method:'post',
-                                url: "{{ route('khazanah.createkelulusan') }}",
-                                data: {
-                                    "_token": "{{ csrf_token() }}",
-                                    "norujukan" : norujukan
-                                    // "teller" : teller,
-                                    // "dategadai" : dategadai,
-                                    // "bilgadai" : noic,
-                                    // "jumpinjam" : jumpinjam,
-                                    // "teller" : teller
+                            method:'post',
+                            url: "{{ route('khazanah.createkelulusan') }}",
+                            data: {
+                                "_token": "{{ csrf_token() }}",
+                                "norujukan" : norujukan
+                                // "teller" : teller,
+                                // "dategadai" : dategadai,
+                                // "bilgadai" : noic,
+                                // "jumpinjam" : jumpinjam,
+                                // "teller" : teller
+                            },
+                            success:function(data){
+                                
+                                console.log(data);
 
+                            },error: function(xhr, status, error) {
+                            var err = eval("(" + xhr.responseText + ")");
+                            alert(xhr.responseText);
+                            }
+                        });    
+
+                        //TIME INTERVAL
+                        let timerInterval;
+                
+                        timerInterval = setInterval(function(){
+                            $.ajax({
+                                method:'get',
+                                url: "{{ route('khazanah.getkelulusan') }}",
+                                data: {
+                                    "norujukan" : norujukan
                                 },
                                 success:function(data){
-                                  
-                                   console.log(data);
+                                    
+                                    if(data != '')
+                                    {
+                                        clearInterval(timerInterval);
+                                        Swal.fire({
+                                            icon: 'success',
+                                            title: 'Anda Berjaya Menerima Pengesahan'
+                                        }).then(function(){
+
+                                            $(func).attr("onSubmit","return true;");
+                                            $(func).submit();
+                                            return true;
+
+                                        });
+                                    }
 
                                 },error: function(xhr, status, error) {
                                 var err = eval("(" + xhr.responseText + ")");
                                 alert(xhr.responseText);
                                 }
-                            });    
-
-                            //TIME INTERVAL
-                            let timerInterval;
-                  
-                            timerInterval = setInterval(function()
-                            {
-                                $.ajax({
-                                        method:'get',
-                                        url: "{{ route('khazanah.getkelulusan') }}",
-                                        data: {
-                                            "norujukan" : norujukan
-                                        },
-                                        success:function(data){
-                                            
-                                            if(data != '')
-                                            {
-                                                clearInterval(timerInterval);
-                                                Swal.fire({
-                                                    icon: 'success',
-                                                    title: 'Anda Berjaya Menerima Pengesahan'
-                                                }).then(function(){
-
-                                                    $(func).attr("onSubmit","return true;");
-                                                    $(func).submit();
-                                                    return true;
-
-                                                });
-                                            }
-
-                                        },error: function(xhr, status, error) {
-                                        var err = eval("(" + xhr.responseText + ")");
-                                        alert(xhr.responseText);
-                                        }
-                                    });
-                                
-                            }, 3000);
-                   
+                            });
+                            
+                        }, 3000);
                        
-                } else if (
-                    /* Read more about handling dismissals below */
-                    result.dismiss === Swal.DismissReason.cancel
-                ) {
-                    swalWithBootstrapButtons.fire(
-                    'Cancelled',
-                    'Your imaginary file is safe :)',
-                    'error'
-                    )
-                }
+                    } else if (result.dismiss === Swal.DismissReason.cancel) {
+                        swalWithBootstrapButtons.fire(
+                            'Batal',
+                            'Maklumat Gadaian Tidak Berjaya Disimpan',
+                            'error'
+                        )
+                    }
                 });
                
-                    event.preventDefault();
-                    return false;
-             
-                
+                event.preventDefault();
+                return false; 
             }
         }
         Swal.fire({
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 6bac0a7..434c89f 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -772,8 +772,8 @@
                                         }, 3000);
                                     }else if (result.dismiss === Swal.DismissReason.cancel){
                                         swalWithBootstrapButtons.fire(
-                                            'Cancelled',
-                                            'Your imaginary file is safe :)',
+                                            'Batal',
+                                            'Maklumat Gadaian Tidak Berjaya Disimpan',
                                             'error'
                                         )
                                     }
@@ -873,8 +873,8 @@
                                         }, 3000);
                                     } else if (result.dismiss === Swal.DismissReason.cancel) {
                                         swalWithBootstrapButtons.fire(
-                                            'Cancelled',
-                                            'Your imaginary file is safe :)',
+                                            'Batal',
+                                            'Maklumat Gadaian Tidak Berjaya Disimpan',
                                             'error'
                                         )
                                     }
@@ -898,8 +898,7 @@
     }
 
 
-    function deletemarhun(e)
-    {
+    function deletemarhun(e){
         let marhun = $(e).closest('tr').children('td:eq(1)').text();let selectedrow = $(e).closest('tr');let recnozz = tablemarhun.row(selectedrow).data();
         let norujuk = $('#norujukan').val();
 
@@ -911,19 +910,16 @@
                 "norujukan" : norujuk,
                 "recno" : recnozz[1]
             },
-            success:function(data)
-            {
-                console.log(data);
+            success:function(data){
                 location.reload();
             },error: function(xhr, status, error) {
-                        var err = eval("(" + xhr.responseText + ")");
-                        alert(xhr.responseText);
+                var err = eval("(" + xhr.responseText + ")");
+                alert(xhr.responseText);
             }
         });
     }
 
-    function editmarhun(e)
-    {
+    function editmarhun(e){
         let norujuk = $('#norujukan').val();let selectedrow = $(e).closest('tr');let recno = tablemarhun.row(selectedrow).data();
         let nm = recno[3];let karat = recno[4];let berat = recno[5];
         let harga = recno[7];
@@ -946,8 +942,7 @@
         $('#harga1').val(hargaref);
     });
 
-    function calculationharga(e)
-    {
+    function calculationharga(e){
         let berat = $(e).val();
         let total = 0;
         let harga = $('#harga1').val();
diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php
index 89d75b2..8552ae3 100644
--- a/resources/views/homepage/penilai/home.blade.php
+++ b/resources/views/homepage/penilai/home.blade.php
@@ -304,7 +304,6 @@
                 });
             });
         });
-
     });
 
     var total_marhun_pilih = 0;
@@ -388,60 +387,59 @@
                 })
             
 
-            $.ajax({
-            method:'post',
-            url: '{{ route("teller.createkelulusan") }}',
-            data: {
-                "_token" : "{{ csrf_token() }}",
-                "norujukan" : norujukan,
-                "mohon" : mohon
-            },
-            success:function(data){
-                console.log("created");
+                $.ajax({
+                    method:'post',
+                    url: '{{ route("teller.createkelulusan") }}',
+                    data: {
+                        "_token" : "{{ csrf_token() }}",
+                        "norujukan" : norujukan,
+                        "mohon" : mohon
+                    },
+                    success:function(data){
+                        console.log("created");
 
-            },error: function(xhr, status, error) {
-                var err = eval("(" + xhr.responseText + ")");
-                alert(xhr.responseText);
-                console.log(err);
-            }
-            }); 
+                    },error: function(xhr, status, error) {
+                        var err = eval("(" + xhr.responseText + ")");
+                        alert(xhr.responseText);
+                        console.log(err);
+                    }
+                }); 
 
 
-        //TIME INTERVAL
-        let timerInterval;
+                //TIME INTERVAL
+                let timerInterval;
 
-        timerInterval = setInterval(function(){
-            $.ajax({
-                method:'get',
-                url: "{{ route('teller.getkelulusan') }}",
-                data: {
-                "norujukan" : norujukan
-            },
-            success:function(data){
-                console.log(data);
-                if(data != 0){
-                    console.log('berjaya');
-                    clearInterval(timerInterval);
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Anda Berjaya Menerima Pengesahan'
-                    }).then(function(){
-                        $("#print_submit_belum_serah").submit();
+                timerInterval = setInterval(function(){
+                    $.ajax({
+                        method:'get',
+                        url: "{{ route('teller.getkelulusan') }}",
+                        data: {
+                        "norujukan" : norujukan
+                        },
+                        success:function(data){
+                            console.log(data);
+                            if(data != 0){
+                                console.log('berjaya');
+                                clearInterval(timerInterval);
+                                Swal.fire({
+                                    icon: 'success',
+                                    title: 'Anda Berjaya Menerima Pengesahan'
+                                }).then(function(){
+                                    $("#print_submit_belum_serah").submit();
+                                });
+                            }
+                        },error: function(xhr, status, error) {
+                            var err = eval("(" + xhr.responseText + ")");
+                            alert(xhr.responseText);
+                        }
                     });
-                }
-            },error: function(xhr, status, error) {
-                var err = eval("(" + xhr.responseText + ")");
-                alert(xhr.responseText);
-            }
-        });
-
-        }, 3000);
+                }, 3000);
         
 
-        }else if (result.dismiss === Swal.DismissReason.cancel) {
+            }else if (result.dismiss === Swal.DismissReason.cancel) {
                 swalWithBootstrapButtons.fire(
-                    'Cancelled',
-                    'Your imaginary file is safe :)',
+                    'Batal',
+                    'Tidak Berjaya Mendapatkan Kelulusan Khazanah',
                     'error'
                 )
             }
diff --git a/resources/views/onetimepassword/home.blade.php b/resources/views/onetimepassword/home.blade.php
index eb4471c..cecd7e6 100644
--- a/resources/views/onetimepassword/home.blade.php
+++ b/resources/views/onetimepassword/home.blade.php
@@ -117,8 +117,7 @@ function carila()
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran',
-                text: 'Tiada maklumat pelanggan!',
-                footer: '<a href>Why do I have this issue?</a>'
+                text: 'Tiada maklumat pelanggan!'
             });
             $('#form-display').hide();
             }
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index ac7cfa2..0fc20de 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -276,254 +276,218 @@
 
 <script>
 
-var historybayarandatatable = $('#tablehistorybayaran').DataTable({
+    $('form input').keydown(function (e) {
+        if (e.keyCode == 13) {
+            e.preventDefault();
+            return false;
+        }
+    });
+    var historybayarandatatable = $('#tablehistorybayaran').DataTable({
         "ordering": false
     });
 
-var api = '<?php echo $api_url ?>';
+    var api = '<?php echo $api_url ?>';
 
-$('input[type="checkbox"]').hide();
-$('#divtambahpinjaman').hide();
-$('#divpinjamanbaru').hide();
-$('#divbayaranditerima').hide();
-$('#divbakipinjaman').hide();
+    $('input[type="checkbox"]').hide();
+    $('#divtambahpinjaman').hide();
+    $('#divpinjamanbaru').hide();
+    $('#divbayaranditerima').hide();
+    $('#divbakipinjaman').hide();
 
-var array_recno = [];
-var array_nm = [];
-var array_marhun = [];
-var array_berat = [];
+    var array_recno = [];
+    var array_nm = [];
+    var array_marhun = [];
+    var array_berat = [];
 
-//max bayaran 
-let jumlahasalmarhun = parseFloat("{{ $gadai['nilaimarhun'] }}");
-let totalmarhun = jumlahasalmarhun;
+    //max bayaran 
+    let jumlahasalmarhun = parseFloat("{{ $gadai['nilaimarhun'] }}");
+    let totalmarhun = jumlahasalmarhun;
 
-let bayaranseparuhasal = 0;
+    let bayaranseparuhasal = 0;
 
-let bilangan_marhun = Number("{{ $count }}");
+    let bilangan_marhun = Number("{{ $count }}");
 
-bilmarhun = () => {
-  if(bilangan_marhun ==1)
-  {
-    $('option[value="S"]').attr("disabled", true);
-  }
-  else
-  {
-    $('option[value="S"]').attr("disabled", false);
-  }
-}
-
-bilmarhun();
-
-var tarikhtawarruq = new Date("2021/01/01");
-var tarikhgadai = new Date("{{ $gadai['t_gadai'] }}");
-
-
-var kodcaw = "{{ $gadai['kodcaw'] }}";
-var norujukan = "{{ $gadai['norujukan'] }}";
-
-var jumlahperlu = 0;
-var jumlahminima = 0;
- 
-
-$( document ).ready(function() {
-    tebusan();
-
-  $("#bayaran").inputFilter(function(value) {
-    return /^\d*\.?(?:\d{1,2})?$/.test(value);    // Allow digits only, using a RegExp
-  });
-
-  $("#tambahpinjam").inputFilter(function(value) {
-    return /^\d*\.?(?:\d{1,2})?$/.test(value);    // Allow digits only, using a RegExp
-  });
-
-});
-
-function tebusan()
-{
-    
-    if(tarikhgadai >= tarikhtawarruq)
-    {   
-        let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.8) - $gadai['bakipjm'] }}";
-                               
-        $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));                            
-
-
-        $('#divpembiayaanasal').hide();
-        $('#divbakihargajualan').show();
-        $('#divtelahdibayar').show();
-        $('#histbtn').show();
-        
-        //Upah Tawarruq
-        $.ajax({
-          method:'GET',
-          url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
-          dataType: 'json',
-          success:function(data){
-            $('#jumlahupah').val(data.toFixed(2));
-            $('#bayaranditerima').val(data);
-          }
-        });
-
-
-        //Tebus Tawarruq
-        $.ajax({
-          method:'GET',
-          url: api + '/api/tebustawarruq/' + kodcaw + '/' + norujukan,
-          dataType: 'json',
-          success:function(data){
-            $('#perludibayar').val(data.toFixed(2));
-          }
-        });
-
-
-    }
-    else if(tarikhgadai < tarikhtawarruq)
-    {
-        let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.8) - $gadai['pinjaman'] }}";
-
-        $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));
-
-        $('#divpembiayaanasal').show();
-        $('#divbakihargajualan').hide();
-        $('#divtelahdibayar').hide();
-        $('#histbtn').hide();
-
-        //Upah Bukan Tawarruq
-        $.ajax({
-          method:'GET',
-          url: api + '/api/upahbukantawarruq/' + kodcaw + '/' + norujukan,
-          dataType: 'json',
-          success:function(data){
-            $('#jumlahupah').val(data);
-            $('#bayaranditerima').val(data);
-          }
-        });
-
-        //Tebus Bukan Tawarruq
-        $.ajax({
-          method:'GET',
-          url: api + '/api/tebusbukantawarruq/' + kodcaw + '/' + norujukan,
-          dataType: 'json',
-          success:function(data){
-            $('#perludibayar').val(data);
-          }
-        });
-
-
-    }
-
-    // Telah dibayar
-    $.ajax({
-          method:'GET',
-          url: api + '/api/transaction/' + norujukan,
-          dataType: 'json',
-          success:function(data){
-            var totaltelahdibayar = 0;
-
-            if(data == '')
-            {
-                $('#jumlahtelahdibayar').val(0);
-            }
-            else
-            {
-                $.each(data,function(index,transaksi){
-
-                    totaltelahdibayar += parseFloat(transaksi.duit_masuk);
-                });
-
-                $('#jumlahtelahdibayar').val(totaltelahdibayar);
-            }
-
-          }
-     });
-
-}
-
-if(tarikhgadai >= tarikhtawarruq)
-{
-
-     //checked box
-    var checkboxes = document.querySelectorAll('input[type="checkbox"]');
-    var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
-
-    //Separuh Bayar Tawarruq
-    $(document).on('click', '#checkmarhun', function(e) {
-
-        var totalCheckboxes = $('input[type="checkbox"]').length;
-        let numbernotchecked = $("input:checkbox:not(:checked)").length;
-
-        var recno = $(this).data('recno');
-        var nilaimarhun = $(this).data('nm');
-        var marhun = $(this).data('marhun');
-        var berat = $(this).data('berat');
-
-        if ($(this).is(':checked')) {
-            array_recno.push(recno);
-            array_nm.push(nilaimarhun);
-            array_marhun.push(marhun);
-            array_berat.push(berat);
-
-
-            totalmarhun = totalmarhun - parseFloat(nilaimarhun);
-            console.log("Nilai Marhun: " + nilaimarhun);
-            console.log("Max Bayaran Marhun: " + totalmarhun);
-            console.table(array_recno);
-            
+    bilmarhun = () => {
+        if(bilangan_marhun ==1){
+            $('option[value="S"]').attr("disabled", true);
         }
         else{
-            var rm = array_recno.findIndex(x => x === recno);
-            var rmnilai = array_nm.findIndex(y => y == nilaimarhun);
-            var rmmarhun = array_marhun.findIndex(z => z == marhun);
-            var rmberat = array_berat.findIndex(a => a == berat);
-            
-            array_recno.splice(rm,1);
-            array_nm.splice(rmnilai,1);
-            array_marhun.splice(rmmarhun,1);
-            array_berat.splice(rmberat,1);
-
-            totalmarhun = totalmarhun + parseFloat(nilaimarhun);
-
-
+            $('option[value="S"]').attr("disabled", false);
         }
-        if(numbernotchecked != totalCheckboxes)
-        {
+    }
+
+    bilmarhun();
+
+    var tarikhtawarruq = new Date("2021/01/01");
+    var tarikhgadai = new Date("{{ $gadai['t_gadai'] }}");
+
+
+    var kodcaw = "{{ $gadai['kodcaw'] }}";
+    var norujukan = "{{ $gadai['norujukan'] }}";
+
+    var jumlahperlu = 0;
+    var jumlahminima = 0;
+    
+
+    $( document ).ready(function() {
+        tebusan();
+
+        $("#bayaran").inputFilter(function(value) {
+            return /^\d*\.?(?:\d{1,2})?$/.test(value);    // Allow digits only, using a RegExp
+        });
+
+        $("#tambahpinjam").inputFilter(function(value) {
+            return /^\d*\.?(?:\d{1,2})?$/.test(value);    // Allow digits only, using a RegExp
+        });
+
+    });
+
+    function tebusan(){
+        if(tarikhgadai >= tarikhtawarruq){   
+            let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.8) - $gadai['bakipjm'] }}";
+                                
+            $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));                            
+
+
+            $('#divpembiayaanasal').hide();
+            $('#divbakihargajualan').show();
+            $('#divtelahdibayar').show();
+            $('#histbtn').show();
+            
+            //Upah Tawarruq
             $.ajax({
                 method:'GET',
-                url: api + '/api/tebusseparuhtawarruq/' + kodcaw + '/' + norujukan,
+                url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
                 dataType: 'json',
-                data:{
-                "array_recno" : array_recno
-                },
-                success:function(success){
-                    let bayarz = $('#bayaran').val(Number(success.toFixed(2)));
+                success:function(data){
+                    $('#jumlahupah').val(data.toFixed(2));
+                    $('#bayaranditerima').val(data);
+                }
+            });
+            //Tebus Tawarruq
+            $.ajax({
+                method:'GET',
+                url: api + '/api/tebustawarruq/' + kodcaw + '/' + norujukan,
+                dataType: 'json',
+                success:function(data){
+                    $('#perludibayar').val(data.toFixed(2));
+                }
+            });
+        }else if(tarikhgadai < tarikhtawarruq){
+            let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.8) - $gadai['pinjaman'] }}";
 
-                    bayaranseparuhasal = Number(success.toFixed(2));
+            $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));
 
-                    let bakihargajual = $('#bakihargajualan').val();
+            $('#divpembiayaanasal').show();
+            $('#divbakihargajualan').hide();
+            $('#divtelahdibayar').hide();
+            $('#histbtn').hide();
 
-                    $('#perludibayar').val(Number(success.toFixed(2)) +  parseFloat($('#jumlahupah').val()));
-
-                    let totalbakipinjam = parseFloat($('#pinjaman').val()) - success;
-                    $('#bakipinjaman').val(totalbakipinjam.toFixed(2));
-
-                },error:function(xhr, textStatus, errorThrown){
-                    console.log(xhr.responseText);
-                    console.log(textStatus);
+            //Upah Bukan Tawarruq
+            $.ajax({
+                method:'GET',
+                url: api + '/api/upahbukantawarruq/' + kodcaw + '/' + norujukan,
+                dataType: 'json',
+                success:function(data){
+                    $('#jumlahupah').val(data);
+                    $('#bayaranditerima').val(data);
                 }
             });
 
+            //Tebus Bukan Tawarruq
+            $.ajax({
+                method:'GET',
+                url: api + '/api/tebusbukantawarruq/' + kodcaw + '/' + norujukan,
+                dataType: 'json',
+                success:function(data){
+                    $('#perludibayar').val(data);
+                }
+            });
         }
-        else
-        {
-            $('#perludibayar').val(parseFloat($('#jumlahupah').val()));
-            $('#bakipinjaman').val(0);
-            $('#bayaran').val(0);
+        // Telah dibayar
+        $.ajax({
+            method:'GET',
+            url: api + '/api/transaction/' + norujukan,
+            dataType: 'json',
+            success:function(data){
+                var totaltelahdibayar = 0;
 
-        }
-    });
+                if(data == ''){
+                    $('#jumlahtelahdibayar').val(0);
+                }else{
+                    $.each(data,function(index,transaksi){
+                        totaltelahdibayar += parseFloat(transaksi.duit_masuk);
+                    });
+                    $('#jumlahtelahdibayar').val(totaltelahdibayar);
+                }
+            }
+        });
+    }
 
-}
-    else if(tarikhgadai < tarikhtawarruq){
+    if(tarikhgadai >= tarikhtawarruq){
+
+        //checked box
+        var checkboxes = document.querySelectorAll('input[type="checkbox"]');
+        var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
+
+        //Separuh Bayar Tawarruq
+        $(document).on('click', '#checkmarhun', function(e) {
+
+            var totalCheckboxes = $('input[type="checkbox"]').length;
+            let numbernotchecked = $("input:checkbox:not(:checked)").length;
+
+            var recno = $(this).data('recno');
+            var nilaimarhun = $(this).data('nm');
+            var marhun = $(this).data('marhun');
+            var berat = $(this).data('berat');
+
+            if ($(this).is(':checked')) {
+                array_recno.push(recno);
+                array_nm.push(nilaimarhun);
+                array_marhun.push(marhun);
+                array_berat.push(berat);
+                totalmarhun = totalmarhun - parseFloat(nilaimarhun);
+            }else{
+                var rm = array_recno.findIndex(x => x === recno);
+                var rmnilai = array_nm.findIndex(y => y == nilaimarhun);
+                var rmmarhun = array_marhun.findIndex(z => z == marhun);
+                var rmberat = array_berat.findIndex(a => a == berat);
+                
+                array_recno.splice(rm,1);
+                array_nm.splice(rmnilai,1);
+                array_marhun.splice(rmmarhun,1);
+                array_berat.splice(rmberat,1);
+
+                totalmarhun = totalmarhun + parseFloat(nilaimarhun);
+            }
+            if(numbernotchecked != totalCheckboxes){
+                $.ajax({
+                    method:'GET',
+                    url: api + '/api/tebusseparuhtawarruq/' + kodcaw + '/' + norujukan,
+                    dataType: 'json',
+                    data:{
+                        "array_recno" : array_recno
+                    },
+                    success:function(success){
+                        let bayarz = $('#bayaran').val(Number(success.toFixed(2)));
+                        bayaranseparuhasal = Number(success.toFixed(2));
+                        let bakihargajual = $('#bakihargajualan').val();
+                        $('#perludibayar').val(Number(success.toFixed(2)) +  parseFloat($('#jumlahupah').val()));
+                        let totalbakipinjam = parseFloat($('#pinjaman').val()) - success;
+                        $('#bakipinjaman').val(totalbakipinjam.toFixed(2));
+                    },error:function(xhr, textStatus, errorThrown){
+                        console.log(xhr.responseText);
+                        console.log(textStatus);
+                    }
+                });
+            }else{
+                $('#perludibayar').val(parseFloat($('#jumlahupah').val()));
+                $('#bakipinjaman').val(0);
+                $('#bayaran').val(0);
+            }
+        });
+
+    }else if(tarikhgadai < tarikhtawarruq){
         //Separuh Bayar Bukan Tawarruq
         $(document).on('click', '#checkmarhun', function(e) {
 
@@ -531,7 +495,6 @@ if(tarikhgadai >= tarikhtawarruq)
         var checkboxes = document.querySelectorAll('input[type="checkbox"]');
         var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
 
-
         //jumlah upah
         var jumupah = parseFloat($('#jumlahupah').val());
 
@@ -545,8 +508,6 @@ if(tarikhgadai >= tarikhtawarruq)
                 array_nm.push(nilaimarhun);
                 array_marhun.push(marhun);
                 array_berat.push(berat);
-
-
             }
             else{
                 var rm = array_recno.findIndex(x => x === recno);
@@ -558,15 +519,13 @@ if(tarikhgadai >= tarikhtawarruq)
                 array_nm.splice(rmnilai);
                 array_marhun.splice(rmmarhun);
                 array_berat.splice(rmberat);
-
             }
 
             if (checkedOne == false) {
                 $('#perludibayar').val(jumupah);
                 $('#bayaran').val(jumupah);
             }
-            else
-            {
+            else{
                 $.ajax({
                     method:'GET',
                     url: api + '/api/tebusseparuhbukantawarruq/' + kodcaw + '/' + norujukan,
@@ -591,928 +550,781 @@ if(tarikhgadai >= tarikhtawarruq)
             }
         });
     }
+
+    $("#sltjenistebus").change(function(){
     
+        var jumupah = parseFloat($('#jumlahupah').val());
 
-  
+        switch($(this).val()) {
+            case "T":
+                $('input[type="checkbox"]').hide();
+                $('span.spannar').show();
 
-$("#sltjenistebus").change(function(){
-  
-    var jumupah = parseFloat($('#jumlahupah').val());
+                $("#bayaran").prop("disabled", true);
+                $("#bayaran").val(0);
+                
+                $('#divtambahpinjaman').hide();
+                $('#divpinjamanbaru').hide();
+                $('#divbayaranditerima').hide();
+                $('#divbakipinjaman').hide();
 
-    switch($(this).val()) {
-        case "T":
-        $('input[type="checkbox"]').hide();
-        $('span.spannar').show();
+                $('#divtelahdibayar').show();
+                $('#divbayaran').show();
+                $('#divperludibayar').show();
 
-        $("#bayaran").prop("disabled", true);
-        $("#bayaran").val(0);
-        
-        $('#divtambahpinjaman').hide();
-        $('#divpinjamanbaru').hide();
-        $('#divbayaranditerima').hide();
-        $('#divbakipinjaman').hide();
+                tebusan();
+                break;
+            case "A":
+                $('input[type="checkbox"]').hide();
+                $('span.spannar').show();
 
-        $('#divtelahdibayar').show();
-        $('#divbayaran').show();
-        $('#divperludibayar').show();
+                $("#bayaran").prop("disabled", false);
+                $("#perludibayar").prop("readonly", true);
+                $("#bayaran").val(0);
 
-        tebusan();
-        break;
+                $('#divtambahpinjaman').hide();
+                $('#divpinjamanbaru').hide();
+                $('#divbayaranditerima').hide();
+                $('#divbakipinjaman').hide();
 
-        case "A":
-        $('input[type="checkbox"]').hide();
-        $('span.spannar').show();
+                $('#divtelahdibayar').show();
+                $('#divbayaran').show();
+                $('#divperludibayar').show();
 
-        $("#bayaran").prop("disabled", false);
-        $("#perludibayar").prop("readonly", true);
-        $("#bayaran").val(0);
+                $('#perludibayar').val(jumupah);
 
-        $('#divtambahpinjaman').hide();
-        $('#divpinjamanbaru').hide();
-        $('#divbayaranditerima').hide();
-        $('#divbakipinjaman').hide();
+                break;
 
-        $('#divtelahdibayar').show();
-        $('#divbayaran').show();
-        $('#divperludibayar').show();
+            case "S":
+                $('input[type="checkbox"]').show();
+                $('span.spannar').hide();
 
-        $('#perludibayar').val(jumupah);
+                $("#bayaran").prop("disabled", true);
+                $("#perludibayar").prop("readonly", false);
+                $("#bayaran").val(0);
 
-        break;
+                $('#divtambahpinjaman').hide();
+                $('#divpinjamanbaru').hide();
+                $('#divbayaranditerima').hide();
 
-        case "S":
-        $('input[type="checkbox"]').show();
-        $('span.spannar').hide();
+                $('#divbakipinjaman').show();
+                $('#divtelahdibayar').show();
+                $('#divbayaran').show();
+                $('#divperludibayar').show();
 
-        $("#bayaran").prop("disabled", true);
-        $("#perludibayar").prop("readonly", false);
-        $("#bayaran").val(0);
+                $('#perludibayar').val(jumupah);
+                break;
 
-        $('#divtambahpinjaman').hide();
-        $('#divpinjamanbaru').hide();
-        $('#divbayaranditerima').hide();
+            case "P":
+                $('input[type="checkbox"]').hide();
+                $('span.spannar').show();
+                $('#divpinjaman').show();
+                $('#divtambahpinjaman').show();
+                $('#divpinjamanbaru').show();
+                $('#divbayaranditerima').show();
 
-        $('#divbakipinjaman').show();
-        $('#divtelahdibayar').show();
-        $('#divbayaran').show();
-        $('#divperludibayar').show();
-
-        $('#perludibayar').val(jumupah);
-        break;
-
-        case "P":
-        $('input[type="checkbox"]').hide();
-        $('span.spannar').show();
-        $('#divpinjaman').show();
-        $('#divtambahpinjaman').show();
-        $('#divpinjamanbaru').show();
-        $('#divbayaranditerima').show();
-
-        $('#divtelahdibayar').hide();
-        $('#divbakipinjaman').hide();
-        $('#divbayaran').hide();
-        $('#divperludibayar').hide();
+                $('#divtelahdibayar').hide();
+                $('#divbakipinjaman').hide();
+                $('#divbayaran').hide();
+                $('#divperludibayar').hide();
 
 
-        $("#bayaran").prop("disabled", false);
-        $("#bayaran").val(0);
-        break;
-    }      
+                $("#bayaran").prop("disabled", false);
+                $("#bayaran").val(0);
+                break;
+        }      
 
-});
+    });
 
-function bayarkey(e)
-{
-   
-    if($('#sltjenistebus').find(":selected").val() == 'S')
-    {
-        let byr = $(e).val();
-        let total = 0;
-        let pdbyr = 0;
-        let totalseparuh = 0;
+    function bayarkey(e){
+        if($('#sltjenistebus').find(":selected").val() == 'S'){
+            let byr = $(e).val();
+            let total = 0;
+            let pdbyr = 0;
+            let totalseparuh = 0;
 
-        console.log(byr);
-
-        console.log(bayaranseparuhasal);
-
-        if(byr < (bayaranseparuhasal + parseFloat($('#jumlahupah').val())))
-        {
-            $('#bayaran').val(bayaranseparuhasal.toFixed(2));
-        }
-        else
-        {
-            totalseparuh = byr - parseFloat($('#jumlahupah').val());
-            $('#bayaran').val(totalseparuh.toFixed(2));
-        }
-
-        // pdbyr = parseFloat(byr);
-        pdbyr = $('#bayaran').val();
-        total =  $('#pinjaman').val() - pdbyr;
-
-        // $('#perludibayar').val(pdbyr);
-        $('#bakipinjaman').val(total.toFixed(2));
-    }
-}
-
-function bayartambahan(e)
-{
-    if($('#sltjenistebus').find(":selected").val() == 'A')
-    {
-        if(tarikhgadai < tarikhtawarruq)
-        {
-    
-        let byr = $(e).val();
-        let total = 0;
-        let pdbyr = 0;
-
-        if(byr == '')
-        {
-            $('#perludibayar').val($('#jumlahupah').val());
-        }
-        else
-        {
-            pdbyr = parseFloat(byr) + parseFloat($('#jumlahupah').val());
-
-            $('#perludibayar').val(pdbyr);
-            // $('#perludibayar').val(total);
-        }
-       
-        }
-    }
-}
-
-
-function bayarpinjam(e)
-{
-
-    var maxpinjam = parseFloat($('#tambahpinjamsebenar').val());
-    var pinjambaru = parseFloat($('#pinjamanbaru').val());
-    var pinjam = parseFloat($('#pinjaman').val());
-    var nm = parseFloat("{{ $gadai['nilaimarhun'] }}");
-    const percentpinj = parseFloat("{{ $gadai['percentpinj'] }}");
-
-    var totalpinjbaru=0;
-
-    totalpinjbaru = pinjam + parseFloat(e.value);
-
-    $(e).val() == ''  ? $('#pinjamanbaru').val(pinjam.toFixed(2)) : $('#pinjamanbaru').val(totalpinjbaru.toFixed(2));
-
-    // if(parseFloat($(e).val()) > maxpinjam)
-    //     $(e).val(maxpinjam);
-
-    var total = totalpinjbaru/nm * 100;
-
-    $(e).val() == ''  ? $('#basic-addon2').text(percentpinj.toFixed(2)) : $('#basic-addon2').text(total.toFixed(2));  ;
- 
-
-}
-
-let teller = "{{ Auth::user()->name }}";
-
-function bayaransemua()
-{
-    
-    if($('#sltjenistebus').find(":selected").val() == 'T'){
-        let jenisbayarantebus = '';
-        if(tarikhgadai < tarikhtawarruq)
-        {
-            jenisbayarantebus = "nottawarruq";
-
-            var urlroute = '{{ route("resit.belumtebus", ":id") }}';
-            urlroute = urlroute.replace(':id', norujukan);
-        }
-        else if (tarikhgadai >= tarikhtawarruq){
-            jenisbayarantebus = "tawarruq";
-
-            var urlroute = '{{ route("resit.tebus", ":id") }}';
-            urlroute = urlroute.replace(':id', norujukan);
-        }
-
-        var nopelanggan = "{{ $gadai['nopelanggan'] }}";
-        var jenistebus = $('#sltjenistebus').find(":selected").val();
-        var jbg = "{{ $gadai['tempoh'] }}";
-        var kadarupah = "{{ $gadai['kadarupah'] }}";
-        var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
-        var pinjaman = "{{ $gadai['pinjaman']}}";
-        var ansuran = 0;
-        var addpinjaman = 0;
-        var bakipinjaman = $('#perludibayar').val();
-        var bakiupah = $('#jumlahupah').val();
-        var historygadaian = 0;
-        var marhun = "{{ $gadai['marhun'] }}";
-        var nowakil = nw;
-
-        $.ajax({
-            method:'put',
-            datatype: 'json',
-            url: api + '/api/updatetebus/' + kodcaw + '/' + norujukan,
-            data:{
-                "nopelanggan" : nopelanggan,
-                "jenistebus" : jenistebus,
-                "jbg" : jbg,
-                "kadarupah" : kadarupah,
-                "nilai_marhun" : nilai_marhun,
-                "pinjaman" : pinjaman,
-                "ansuran" : ansuran,
-                "addpinjaman" : addpinjaman,
-                "bakipinjaman" : bakipinjaman,
-                "bakiupah" : bakiupah,
-                "historygadaian" : historygadaian,
-                "marhun" : marhun,
-                "nowakil" : nowakil,
-                "jenisbayarantebus" : jenisbayarantebus,
-                "teller" : teller
-            },
-            success:function(success_data){
-
-                Swal.fire({
-                    icon: 'success',
-                    title: 'Berjaya!',
-                    text: 'You clicked the button!',
-                    footer: '<a href>Why do I have this issue?</a>'
-
-                }).then(function() {
-                    window.open(urlroute, '_blank');
-                    window.location.replace("{{ url()->previous() }}");
-                })
+            if(byr < (bayaranseparuhasal + parseFloat($('#jumlahupah').val()))){
+                $('#bayaran').val(bayaranseparuhasal.toFixed(2));
+            }else{
+                totalseparuh = byr - parseFloat($('#jumlahupah').val());
+                $('#bayaran').val(totalseparuh.toFixed(2));
             }
-        });
 
-        /////////////
-        //End File//
-        ///////////
-    
-    }else if($('#sltjenistebus').find(":selected").val() == 'A'){
-        let jenisbayarantebus = '';
-        let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
+            pdbyr = $('#bayaran').val();
+            total =  $('#pinjaman').val() - pdbyr;
 
-        if(tarikhgadai < tarikhtawarruq)
-        {
-            jenisbayarantebus = "nottawarruq";
+            $('#bakipinjaman').val(total.toFixed(2));
         }
-        else if (tarikhgadai >= tarikhtawarruq){
-            jenisbayarantebus = "tawarruq";
+    }
+
+    function bayartambahan(e){
+        if($('#sltjenistebus').find(":selected").val() == 'A'){
+            if(tarikhgadai < tarikhtawarruq){
+        
+            let byr = $(e).val();
+            let total = 0;
+            let pdbyr = 0;
+
+            if(byr == ''){
+                $('#perludibayar').val($('#jumlahupah').val());
+            }else{
+                pdbyr = parseFloat(byr) + parseFloat($('#jumlahupah').val());
+
+                $('#perludibayar').val(pdbyr);
+            }
         }
+    }
 
 
-        if(tarikhgadai >= tarikhtawarruq)
-        {
-            var bayar = $('#bayaran').val(); 
-            var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;
+    function bayarpinjam(e){
+        var maxpinjam = parseFloat($('#tambahpinjamsebenar').val());
+        var pinjambaru = parseFloat($('#pinjamanbaru').val());
+        var pinjam = parseFloat($('#pinjaman').val());
+        var nm = parseFloat("{{ $gadai['nilaimarhun'] }}");
+        const percentpinj = parseFloat("{{ $gadai['percentpinj'] }}");
+
+        var totalpinjbaru=0;
+
+        totalpinjbaru = pinjam + parseFloat(e.value);
+
+        $(e).val() == ''  ? $('#pinjamanbaru').val(pinjam.toFixed(2)) : $('#pinjamanbaru').val(totalpinjbaru.toFixed(2));
+
+        var total = totalpinjbaru/nm * 100;
+
+        $(e).val() == ''  ? $('#basic-addon2').text(percentpinj.toFixed(2)) : $('#basic-addon2').text(total.toFixed(2));  ;
+    }
+
+    let teller = "{{ Auth::user()->name }}";
+
+    function bayaransemua(){
+        if($('#sltjenistebus').find(":selected").val() == 'T'){
+            let jenisbayarantebus = '';
+            if(tarikhgadai < tarikhtawarruq){
+                jenisbayarantebus = "nottawarruq";
+                var urlroute = '{{ route("resit.belumtebus", ":id") }}';
+                urlroute = urlroute.replace(':id', norujukan);
+            }else if (tarikhgadai >= tarikhtawarruq){
+                jenisbayarantebus = "tawarruq";
+                var urlroute = '{{ route("resit.tebus", ":id") }}';
+                urlroute = urlroute.replace(':id', norujukan);
+            }
+
+            var nopelanggan = "{{ $gadai['nopelanggan'] }}";
+            var jenistebus = $('#sltjenistebus').find(":selected").val();
+            var jbg = "{{ $gadai['tempoh'] }}";
+            var kadarupah = "{{ $gadai['kadarupah'] }}";
+            var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
+            var pinjaman = "{{ $gadai['pinjaman']}}";
+            var ansuran = 0;
+            var addpinjaman = 0;
+            var bakipinjaman = $('#perludibayar').val();
+            var bakiupah = $('#jumlahupah').val();
+            var historygadaian = 0;
+            var marhun = "{{ $gadai['marhun'] }}";
+            var nowakil = nw;
+
+            $.ajax({
+                method:'put',
+                datatype: 'json',
+                url: api + '/api/updatetebus/' + kodcaw + '/' + norujukan,
+                data:{
+                    "nopelanggan" : nopelanggan,
+                    "jenistebus" : jenistebus,
+                    "jbg" : jbg,
+                    "kadarupah" : kadarupah,
+                    "nilai_marhun" : nilai_marhun,
+                    "pinjaman" : pinjaman,
+                    "ansuran" : ansuran,
+                    "addpinjaman" : addpinjaman,
+                    "bakipinjaman" : bakipinjaman,
+                    "bakiupah" : bakiupah,
+                    "historygadaian" : historygadaian,
+                    "marhun" : marhun,
+                    "nowakil" : nowakil,
+                    "jenisbayarantebus" : jenisbayarantebus,
+                    "teller" : teller
+                },
+                success:function(success_data){
+                    Swal.fire({
+                        icon: 'success',
+                        title: 'Berjaya!',
+                        text: 'Transaksi Tebus Berjaya Disimpan'
+
+                    }).then(function() {
+                        window.open(urlroute, '_blank');
+                        window.location.replace("{{ url()->previous() }}");
+                    })
+                }
+            });
+
+            /////////////
+            //End File//
+            ///////////
+        
+        }else if($('#sltjenistebus').find(":selected").val() == 'A'){
+            let jenisbayarantebus = '';
+            let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
+
+            if(tarikhgadai < tarikhtawarruq){
+                jenisbayarantebus = "nottawarruq";
+            }else if (tarikhgadai >= tarikhtawarruq){
+                jenisbayarantebus = "tawarruq";
+            }
 
 
-           
-            if(bayar >  bakipinjam)
-            {
+            if(tarikhgadai >= tarikhtawarruq){
+                var bayar = $('#bayaran').val(); 
+                var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;
+
+                if(bayar >  bakipinjam){
+                    Swal.fire(
+                        'Amaran!',
+                        'Bayaran tidak boleh melebihi 10% nilai marhun!',
+                        'error'
+                    )
+                    return false;
+                }
+
+
+                $.ajax({
+                    method:'get',
+                    url: "{{ route('bayaran.ansuranstawarruq') }}",
+                    data:{
+                        "bayaran" : bayar,
+                        "kodcaw" : kodcaw,
+                        "norujukan" : norujukan,
+                        "teller" : teller
+                    },
+                    success:function(success_data){
+                        var urlroute = '{{ route("resit.ansurans", ":id") }}';
+                        urlroute = urlroute.replace(':id', norujukan);
+
+                        Swal.fire(
+                            'Berjaya!',
+                            'Transaksi Bayar Ansuran Berjaya Disimpan',
+                            'success'
+                        ).then(function() {
+                            window.open(urlroute, '_blank');
+                            window.location.replace("{{ url()->previous() }}");
+                        })
+                    }
+                });
+
+            }else if(tarikhgadai < tarikhtawarruq){
+
+                var bakpin = parseFloat("{{ $gadai['pinjaman'] }}") - hadbayaransuran;
+                var bayar = $('#bayaran').val();
+                
+                if(bayar >  bakpin){
+                    Swal.fire(
+                        'Amaran!',
+                        'Bayaran tidak boleh melebihi 10% nilai marhun!',
+                        'error'
+                    )
+                    return false;
+                }
+
+
+                var lebihan = parseFloat($('#perludibayar').val()) - parseFloat($('#jumlahupah').val());
+        
+                var nopelanggan = "{{ $gadai['nopelanggan'] }}";
+                var jenistebus = $('#sltjenistebus').find(":selected").val();
+                var jbg = "{{ $gadai['tempoh'] }}";
+                var kadarupah = "{{ $gadai['kadarupah'] }} ";
+                var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
+                var pinjaman = parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#bayaran').val());
+                var ansuran = $('#bayaran').val();
+                var addpinjaman = $('#bayaran').val();
+                var bakipinjaman = parseFloat($('#bayaran').val()) - parseFloat($('#jumlahupah').val());
+                var bakiupah = 0;
+                var historygadaian = norujukan;
+                var marhun = "{{ $gadai['marhun'] }}";
+                var noic = "{{ $gadai['nokp'] }}";
+                var total_berat = parseFloat("{{ $gadai['berat'] }}");
+                var kuantiti_marhun = Number("{{sizeof($marhun)}}");
+
+                var kadarupahbaru = 0;
+
+                if(nilai_marhun > 0 && nilai_marhun < 401.99){
+                    kadarupahbaru = 1.2/100;
+                }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
+                    kadarupahbaru = 1.50/100;
+                }else if(nilai_marhun >= 2002 ){
+                    kadarupahbaru = 1.70/100;
+                }
+
+                var keuntungan_sebulan = pinjaman * kadarupahbaru;
+                var keuntungan_6bln = keuntungan_sebulan * 6;
+
+                $.ajax({
+                    method:'get',
+                    url: "{{ route('bayaran.ansurans') }}",
+                    data:{
+                        "nopelanggan" : nopelanggan,
+                        "jenistebus" : jenistebus,
+                        "jbg" : jbg,
+                        "kadarupah" : kadarupah,
+                        "nilai_marhun" : nilai_marhun,
+                        "pinjaman" : pinjaman,
+                        "ansuran" : ansuran,
+                        "addpinjaman" : addpinjaman,
+                        "bakipinjaman" : bakipinjaman,
+                        "bakiupah" : bakiupah,
+                        "historygadaian" : historygadaian,
+                        "marhun" : marhun,
+                        "norujukan" : norujukan,
+                        "noic" : noic,
+                        "kadarkeuntungan" : kadarupahbaru,
+                        "keuntungan_6bln" : keuntungan_6bln,
+                        "keuntungan_sebulan" : keuntungan_sebulan,
+                        "kuantiti_marhun" : kuantiti_marhun,
+                        "lebihan" : lebihan,
+                        "jenisbayarantebus" : jenisbayarantebus,
+                        "teller" : teller
+                        
+                    },
+                    success:function(success_data){
+                        Swal.fire(
+                            'Berjaya!',
+                            'Transaksi Ansuran Berjaya Disimpan',
+                            'success'
+                        ).then(function() {
+                            window.location.replace("{{ url('customer_info') }}");
+                        })
+                    },error: function (request, status, error) {
+                        console.log(request.responseText);
+                    }
+                });
+
+            }
+            /////////////
+            //End File//
+            ////////////
+
+        }else if($('#sltjenistebus').find(":selected").val() == 'S'){
+            let jenisbayarantebus = '';
+            if(tarikhgadai < tarikhtawarruq){
+                jenisbayarantebus = "nottawarruq";
+            }else if (tarikhgadai >= tarikhtawarruq){
+                jenisbayarantebus = "tawarruq";
+            }
+
+            if($('#perludibayar').val() < (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val()))){
+                Swal.fire('Amaran!','Jumlah bayaran kurang daripada jumlah yang perlu dibayar!','error');
+                return false;
+            }
+
+            let maxbayaran = totalmarhun * 0.1;
+
+            if($('#bakipinjaman').val() < maxbayaran || $('#bakipinjaman').val() < 50){
                 Swal.fire(
                     'Amaran!',
-                    'Bayaran tidak boleh melebihi 10% nilai marhun!',
+                    `Baki margin pinjaman tidak boleh kurang 10% daripada nilai marhun \n [ RM ${totalmarhun.toFixed(2)} x 10% = RM ${maxbayaran.toFixed(2)} ]`,
+                    'error'
+                );
+                return false;
+            }
+
+            //checked box
+            var checkboxes = document.querySelectorAll('input[type="checkbox"]');
+            var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
+
+            if (checkedOne == false) {
+                Swal.fire(
+                    'Amaran!',
+                    'Sila tick salah satu marhun!',
                     'error'
                 )
                 return false;
             }
 
+            var sumnilaimarhun = 0;
+            var sumberat = 0;
+            var marhun = "{{ $gadai['marhun'] }}";
+
+            var test = marhun.split(",");
+        
+            $.each( array_nm, function( index, value ) {
+                sumnilaimarhun += parseFloat(value);
+            });
+
+            var countarrayerror = 0;
+            $.each( test, function( index, value ) {
+
+                for(var i=0; i<array_marhun.length; i++)
+                {
+                    if (value.match(array_marhun[i])) {
+                    test.splice(index,1);
+                    countarrayerror++;
+
+                    if(countarrayerror == array_marhun.length)
+                        return false;
+                    }
+                }
+            });
+
+            var marhun_baru = test.join(", ");
+
+            $.each( array_berat, function( index, value ) {
+                sumberat += parseFloat(value);
+            });
+
+            var nopelanggan = "{{ $gadai['nopelanggan'] }}";
+            var jenistebus = $('#sltjenistebus').find(":selected").val();
+            var jbg = "{{ $gadai['tempoh'] }}";
+            var kadarupah = "{{ $gadai['kadarupah'] }}";
+            var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}");
+            var nilai_marhun = parseFloat("{{ $gadai['nilaimarhun'] }}") - sumnilaimarhun;
+            var pinjamanbaru = $('#bakipinjaman').val();
+            var ansuran = 0;
+            var addpinjaman = 0;
+            var bakipinjaman = $('#perludibayar').val();
+            var bakiupah = 0;
+            var historygadaian = "{{ $gadai['norujukan'] }}";
+            var marhun = "{{ $gadai['marhun'] }}";
+            var noic = "{{ $gadai['nokp'] }}";
+            var total_berat = parseFloat("{{ $gadai['berat'] }}") - sumberat;
+            var pinjaman = parseFloat("{{ $gadai['pinjaman']}}");
+            var marhun_detail = marhun_baru;
+            var kuantiti_marhun = Number("{{sizeof($marhun)}}") - array_recno.length;
+            var nowakil = nw;
+            
+            var kadarupahbaru = 0;
+
+            if(nilai_marhun > 0 && nilai_marhun < 401.99){
+                kadarupahbaru = 1.2/100;
+            }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
+                kadarupahbaru = 1.50/100;
+            }else if(nilai_marhun >= 2002 ){
+                kadarupahbaru = 1.70/100;
+            }
+            
+            var keuntungan_sebulan = pinjamanbaru * kadarupahbaru;
+            var keuntungan_6bln = keuntungan_sebulan * 6;
 
             $.ajax({
-            method:'get',
-            url: "{{ route('bayaran.ansuranstawarruq') }}",
-            data:{
-                "bayaran" : bayar,
-                "kodcaw" : kodcaw,
-                "norujukan" : norujukan,
-                "teller" : teller
-            },
-            success:function(success_data){
-
-                console.log(success_data);
-
-                var urlroute = '{{ route("resit.ansurans", ":id") }}';
-                urlroute = urlroute.replace(':id', norujukan);
-
-                Swal.fire(
-                    'Good job!',
-                    'You clicked the button!',
-                    'success'
-                ).then(function() {
-                    window.open(urlroute, '_blank');
-                    window.location.replace("{{ url()->previous() }}");
-                })
-            }
-        });
-
-        }
-        else if(tarikhgadai < tarikhtawarruq)
-        {
-        // if($('#bayaran').val() > 0 && $('#bayaran').val() <= parseFloat($('#jumlahupah').val()))
-        // {
-        //     Swal.fire(
-        //     'Amaran!',
-        //     'Masukkan jumlah melebihi jumlah upah!',
-        //     'error'
-        //     )
-        //     return false;
-        // }
-
-        var bakpin = parseFloat("{{ $gadai['pinjaman'] }}") - hadbayaransuran;
-
-        var bayar = $('#bayaran').val();
-           
-        if(bayar >  bakpin)
-        {
-            Swal.fire(
-                'Amaran!',
-                'Bayaran tidak boleh melebihi 10% nilai marhun!',
-                'error'
-            )
-            return false;
-        }
+                method:"GET",
+                url: "{{ route('tebus.separuh') }}",
+                data:{
+                    //yang lama
+                    "norujukan" : norujukan,
+                    "nopelanggan" : nopelanggan,
+                    "jenistebus" : jenistebus,
+                    "jbg" : jbg,
+                    "kadarupah" : kadarupah,
+                    "nilai_marhun" : nilai_marhun_lama,
+                    "pinjaman_lama" : pinjaman,
+                    "ansuran" : ansuran,
+                    "addpinjaman" : addpinjaman,
+                    "bakipinjaman" : bakipinjaman,
+                    "bakiupah" : bakiupah,
+                    "historygadaian" : historygadaian,
+                    "marhun" : marhun,
+                    "nowakil" : nowakil,
+                    "arrayrecno" : array_recno,
+                    "jenisbayarantebus" : jenisbayarantebus,
+                    "teller" : teller,
 
 
-        var lebihan = parseFloat($('#perludibayar').val()) - parseFloat($('#jumlahupah').val());
- 
-        var nopelanggan = "{{ $gadai['nopelanggan'] }}";
-        var jenistebus = $('#sltjenistebus').find(":selected").val();
-        var jbg = "{{ $gadai['tempoh'] }}";
-        var kadarupah = "{{ $gadai['kadarupah'] }} ";
-        var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
-        var pinjaman = parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#bayaran').val());
-        var ansuran = $('#bayaran').val();
-        var addpinjaman = $('#bayaran').val();
-        var bakipinjaman = parseFloat($('#bayaran').val()) - parseFloat($('#jumlahupah').val());
-        var bakiupah = 0;
-        var historygadaian = norujukan;
-        var marhun = "{{ $gadai['marhun'] }}";
-        var noic = "{{ $gadai['nokp'] }}";
-        var total_berat = parseFloat("{{ $gadai['berat'] }}");
-        var kuantiti_marhun = Number("{{sizeof($marhun)}}");
-
-        var kadarupahbaru = 0;
-
-        if(nilai_marhun > 0 && nilai_marhun < 401.99){
-            kadarupahbaru = 1.2/100;
-        }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
-            kadarupahbaru = 1.50/100;
-        }else if(nilai_marhun >= 2002 ){
-            kadarupahbaru = 1.70/100;
-        }
-
-        var keuntungan_sebulan = pinjaman * kadarupahbaru;
-        var keuntungan_6bln = keuntungan_sebulan * 6;
-
-        $.ajax({
-            method:'get',
-            url: "{{ route('bayaran.ansurans') }}",
-            data:{
-                "nopelanggan" : nopelanggan,
-                "jenistebus" : jenistebus,
-                "jbg" : jbg,
-                "kadarupah" : kadarupah,
-                "nilai_marhun" : nilai_marhun,
-                "pinjaman" : pinjaman,
-                "ansuran" : ansuran,
-                "addpinjaman" : addpinjaman,
-                "bakipinjaman" : bakipinjaman,
-                "bakiupah" : bakiupah,
-                "historygadaian" : historygadaian,
-                "marhun" : marhun,
-                "norujukan" : norujukan,
-                "noic" : noic,
-                "kadarkeuntungan" : kadarupahbaru,
-                "keuntungan_6bln" : keuntungan_6bln,
-                "keuntungan_sebulan" : keuntungan_sebulan,
-                "kuantiti_marhun" : kuantiti_marhun,
-                "lebihan" : lebihan,
-                "jenisbayarantebus" : jenisbayarantebus,
-                "teller" : teller
-                
-            },
-            success:function(success_data){
-                Swal.fire(
-                    'Good job!',
-                    'You clicked the button!',
-                    'success'
-                ).then(function() {
-                    window.location.replace("{{ url('customer_info') }}");
-                })
-            },error: function (request, status, error) {
-            console.log(request.responseText);
-        }
-        });
-
-        }
-        /////////////
-        //End File//
-        ////////////
-
-    }else if($('#sltjenistebus').find(":selected").val() == 'S'){
-        let jenisbayarantebus = '';
-        if(tarikhgadai < tarikhtawarruq)
-        {
-            jenisbayarantebus = "nottawarruq";
-        }
-        else if (tarikhgadai >= tarikhtawarruq){
-            jenisbayarantebus = "tawarruq";
-        }
-
-        console.log("perlu dibayar: " + $('#perludibayar').val());
-        console.log("bayaran : " + (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val())));
-
-        if($('#perludibayar').val() < (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val())))
-        {
-            Swal.fire('Amaran!','Jumlah bayaran kurang daripada jumlah yang perlu dibayar!','error');
-            return false;
-        }
-
-
-        let maxbayaran = totalmarhun * 0.1;
-
-        if($('#bakipinjaman').val() < maxbayaran || $('#bakipinjaman').val() < 50)
-        {
-            Swal.fire(
-            'Amaran!',
-            `Baki margin pinjaman tidak boleh kurang 10% daripada nilai marhun \n [ RM ${totalmarhun.toFixed(2)} x 10% = RM ${maxbayaran.toFixed(2)} ]`,
-            'error'
-            )
-            return false;
-        }
-
-        //checked box
-        var checkboxes = document.querySelectorAll('input[type="checkbox"]');
-        var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
-
-        console.log(checkboxes.length);
-        if (checkedOne == false) {
-            Swal.fire(
-            'Amaran!',
-            'Sila tick salah satu marhun!',
-            'error'
-            )
-            return false;
-        }
-
-        var sumnilaimarhun = 0;
-        var sumberat = 0;
-        var marhun = "{{ $gadai['marhun'] }}";
-
-        var test = marhun.split(",");
-        // var marhunlama = marhun.split(",");
-    
-        $.each( array_nm, function( index, value ) {
-              sumnilaimarhun += parseFloat(value);
-        });
-
-
-        console.log(test);
-        console.log(array_marhun);
-        var countarrayerror = 0;
-        $.each( test, function( index, value ) {
-
-            for(var i=0; i<array_marhun.length; i++)
-            {
-                if (value.match(array_marhun[i])) {
-                console.log("value: " + value + " index :" + index +" marhun : " + array_marhun[i]);
-                test.splice(index,1);
-                countarrayerror++;
-
-                if(countarrayerror == array_marhun.length)
-                    return false;
-                
+                    //yang baru
+                    "noic" : noic,
+                    "total_nilai_marhun" : nilai_marhun,
+                    "pinjaman" : pinjamanbaru,
+                    "kadarkeuntungan" : kadarupahbaru,
+                    "keuntungan_6bln" : keuntungan_6bln,
+                    "keuntungan_sebulan" : keuntungan_sebulan,
+                    "total_berat" : total_berat,
+                    "marhun_detail" : marhun_detail,
+                    "kuantiti_marhun" : kuantiti_marhun
+        
+                },
+                success:function(success_data){
+                    var urlroute = '{{ route("resit.tebus", ":id") }}';
+                    urlroute = urlroute.replace(':id', norujukan);
+                    Swal.fire(
+                        'Berjaya!',
+                        'Transaksi Tebus Separuh Berjaya Disimpan',
+                        'success'
+                    ) .then(function() {
+                        window.open(urlroute, '_blank');
+                        window.location.replace("{{ url()->previous() }}");
+                    })
+                },error: function (request, status, error) {
+                    console.log(request.responseText);
                 }
-                // else
-                // {
-                //     console.log("value: " + value + " index :" + index +" marhun : " + array_marhun[i]);
-                //     marhunlama.splice(index,1);
-                // }
+            });
+
+            /////////////
+            //End File//
+            ///////////
+        
+        }else if($('#sltjenistebus').find(":selected").val() == 'P'){
+            let jenisbayarantebus = '';
+            if(tarikhgadai < tarikhtawarruq){
+                jenisbayarantebus = "nottawarruq";
+            }
+            else if (tarikhgadai >= tarikhtawarruq){
+                jenisbayarantebus = "tawarruq";
             }
-        });
 
-        
-
-        var marhun_baru = test.join(", ");
-        // var marhun_lama = marhunlama.join(", ");
-
-
-        // console.table(marhun_baru);
-        // console.table(marhun_lama);
-
-        // return;
-
-        $.each( array_berat, function( index, value ) {
-            sumberat += parseFloat(value);
-        });
-
-        // var lebihan = parseFloat($('#bayaran').val()) - parseFloat($('#perludibayar').val());
-
-        var nopelanggan = "{{ $gadai['nopelanggan'] }}";
-        var jenistebus = $('#sltjenistebus').find(":selected").val();
-        var jbg = "{{ $gadai['tempoh'] }}";
-        var kadarupah = "{{ $gadai['kadarupah'] }}";
-        var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}");
-        var nilai_marhun = parseFloat("{{ $gadai['nilaimarhun'] }}") - sumnilaimarhun;
-        var pinjamanbaru = $('#bakipinjaman').val();
-        var ansuran = 0;
-        var addpinjaman = 0;
-        var bakipinjaman = $('#perludibayar').val();
-        var bakiupah = 0;
-        var historygadaian = "{{ $gadai['norujukan'] }}";
-        var marhun = "{{ $gadai['marhun'] }}";
-        var noic = "{{ $gadai['nokp'] }}";
-        var total_berat = parseFloat("{{ $gadai['berat'] }}") - sumberat;
-        var pinjaman = parseFloat("{{ $gadai['pinjaman']}}");
-        var marhun_detail = marhun_baru;
-        var kuantiti_marhun = Number("{{sizeof($marhun)}}") - array_recno.length;
-        var nowakil = nw;
-
-
-        console.log("Pinjaman Baru Sekali Lagi: " + pinjamanbaru);
-        // console.log('lebihan : ' + lebihan + ' ');
-        console.log("No Pelanggan:" + nopelanggan + " " + "jenistebus:" + jenistebus + " " + "jbg:" + jbg + " " + "kadarupah:" + kadarupah + " ");
-        console.log("nilai_marhun_lama:" + nilai_marhun_lama + " " + "nilai_marhun:" + nilai_marhun + " " + "pinjamanbaru:" + pinjamanbaru + " " + "bakipinjaman:" + bakipinjaman + " ");
-        console.log("historygadaian:" + historygadaian + " " + "marhun:" + marhun + " " + "total_berat:" + total_berat + " " + "pinjaman:" + pinjaman + " ");
-        console.log("marhun_detail: " + marhun_detail + "kuantiti_marhun: " + kuantiti_marhun);
-        console.log(nowakil);
-        
-        var kadarupahbaru = 0;
-
-        if(nilai_marhun > 0 && nilai_marhun < 401.99){
-            kadarupahbaru = 1.2/100;
-        }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
-            kadarupahbaru = 1.50/100;
-        }else if(nilai_marhun >= 2002 ){
-            kadarupahbaru = 1.70/100;
-        }
-        
-        var keuntungan_sebulan = pinjamanbaru * kadarupahbaru;
-        var keuntungan_6bln = keuntungan_sebulan * 6;
-
-        $.ajax({
-        method:"GET",
-        url: "{{ route('tebus.separuh') }}",
-        data:{
-            //yang lama
-            "norujukan" : norujukan,
-            "nopelanggan" : nopelanggan,
-            "jenistebus" : jenistebus,
-            "jbg" : jbg,
-            "kadarupah" : kadarupah,
-            "nilai_marhun" : nilai_marhun_lama,
-            "pinjaman_lama" : pinjaman,
-            "ansuran" : ansuran,
-            "addpinjaman" : addpinjaman,
-            "bakipinjaman" : bakipinjaman,
-            "bakiupah" : bakiupah,
-            "historygadaian" : historygadaian,
-            "marhun" : marhun,
-            "nowakil" : nowakil,
-            "arrayrecno" : array_recno,
-            "jenisbayarantebus" : jenisbayarantebus,
-            "teller" : teller,
-
-
-            //yang baru
-            "noic" : noic,
-            "total_nilai_marhun" : nilai_marhun,
-            "pinjaman" : pinjamanbaru,
-            "kadarkeuntungan" : kadarupahbaru,
-            "keuntungan_6bln" : keuntungan_6bln,
-            "keuntungan_sebulan" : keuntungan_sebulan,
-            "total_berat" : total_berat,
-            "marhun_detail" : marhun_detail,
-            "kuantiti_marhun" : kuantiti_marhun
- 
-        },
-        success:function(success_data){
-            var urlroute = '{{ route("resit.tebus", ":id") }}';
-            urlroute = urlroute.replace(':id', norujukan);
-
-            console.log(success_data);
-            Swal.fire(
-            'Good job!',
-            'You clicked the button!',
-            'success'
-        ) .then(function() {
-            window.open(urlroute, '_blank');
-            window.location.replace("{{ url()->previous() }}");
-        })
-        },error: function (request, status, error) {
-            console.log(request.responseText);
-        }
-
-
-
-        });
-
-        /////////////
-        //End File//
-        ///////////
-       
-    }
-    else if($('#sltjenistebus').find(":selected").val() == 'P')
-    {
-        let jenisbayarantebus = '';
-        if(tarikhgadai < tarikhtawarruq)
-        {
-            jenisbayarantebus = "nottawarruq";
-        }
-        else if (tarikhgadai >= tarikhtawarruq){
-            jenisbayarantebus = "tawarruq";
-        }
-
-        if( $('#tambahpinjam').val() <=  0 && $('#tambahpinjam').val() === '')
-            {
+            if( $('#tambahpinjam').val() <=  0 && $('#tambahpinjam').val() === ''){
                 Swal.fire(
                     'Amaran!',
                     'Amaun hendaklah melebihi daripada 0',
                     'error'
                 )
                 return false;
-        } 
-    
-        if(parseFloat($('#basic-addon2').text()) > 80)
-        {
-            Swal.fire(
-            'Amaran!',
-            'Pinjaman Haruslah Dalam Lingkungan 80%!',
-            'error'
-            )
-            return false;
-        }
-
-
-        var nopelanggan = "{{ $gadai['nopelanggan'] }}";
-        var jenistebus = $('#sltjenistebus').find(":selected").val();
-        var jbg = "{{ $gadai['tempoh'] }}";
-        var kadarupah = "{{ $gadai['kadarupah'] }}";
-        var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
-        var pinjaman = parseFloat($('#pinjamanbaru').val());
-        var ansuran = 0;
-        var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val());
-        var maxpinjaman = parseFloat($('#tambahpinjamsebenar').val());
-        var bakipinjaman = maxpinjaman - parseFloat($('#tambahpinjam').val());
-        var bakiupah = 0;
-        var historygadaian = "{{ $gadai['norujukan'] }}";
-        var marhun = "{{ $gadai['marhun'] }}";
-        var total_berat = parseFloat("{{ $gadai['berat'] }}");
-        var kuantiti_marhun = Number("{{sizeof($marhun)}}");
-        var noic = "{{ $gadai['nokp'] }}";
+            } 
         
-        
-    
-
-        var kadarupahbaru = 0;
-
-        if(nilai_marhun > 0 && nilai_marhun < 401.99){
-            kadarupahbaru = 1.2/100;
-        }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
-            kadarupahbaru = 1.50/100;
-        }else if(nilai_marhun >= 2002 ){
-            kadarupahbaru = 1.70/100;
-        }
-
-        var keuntungan_sebulan = pinjaman * kadarupahbaru;
-        var keuntungan_6bln = keuntungan_sebulan * 6;
-
-        console.log("No. Pelanggan : " + nopelanggan  + " Jenistebus : " + jenistebus);
-        console.log(" jbg : " + jbg  + " kadarupah : " + kadarupah);
-        console.log("nilai_marhun : " + nilai_marhun  + " pinjaman : " + pinjaman);
-        console.log("ansuran : " + ansuran  + " addpinjaman : " + addpinjaman);
-        console.log("bakipinjaman : " + bakipinjaman  + " bakiupah : " + bakiupah);
-        console.log("historygadaian : " + historygadaian  + " marhun : " + marhun);
-        console.log("total_berat : " + total_berat  + " kuantiti_marhun : " + kuantiti_marhun);
-        console.log("noic :" + noic);
-
-
-        console.log(keuntungan_sebulan + " " + pinjaman);
-    
-        // return;
-
-        $.ajax({
-            method:'GET',
-            url: "{{ route('tambah.pinjaman') }}",
-            data:{
-                "nopelanggan" : nopelanggan,
-                "jenistebus" : jenistebus,
-                "jbg" : jbg,
-                "kadarupah" : kadarupah,
-                "nilai_marhun" : nilai_marhun,
-                "pinjaman" : pinjaman,
-                "ansuran" : ansuran,
-                "addpinjaman" : addpinjaman,
-                "bakipinjaman" : bakipinjaman,
-                "bakiupah" : bakiupah,
-                "historygadaian" : historygadaian,
-                "marhun" : marhun,
-                "kuantiti_marhun" : kuantiti_marhun,
-                "total_berat" : total_berat,
-                "kadarkeuntungan" : kadarupahbaru,
-                "keuntungan_6bln" : keuntungan_6bln,
-                "keuntungan_sebulan" : keuntungan_sebulan,
-                "noic" : noic,
-                "norujukan" : norujukan,
-                "jenisbayarantebus" : jenisbayarantebus,
-                "teller" : teller
-
-            },
-            success:function(success_data){
+            if(parseFloat($('#basic-addon2').text()) > 80){
                 Swal.fire(
-                    'Good job!',
-                    'You clicked the button!',
-                    'success'
-                ).then(function() {
-                    window.location.replace("{{ url()->previous() }}");
-                })
-            },error: function (request, status, error) {
-            console.log(request.responseText);
-        }
-        });
-
-        /////////////
-        //End File//
-        ///////////
-    }
-
-}
-
-let nw = 0;
-
-function wakilfunction(e)
-{
-    let wakil = $('#wakiltxt').val();
-
-    if(wakil.length == 12)
-    {
-        $.ajax({
-            method:'GET',
-            url: "{{ route('wakil.search') }}",
-            data:{
-                'wakil' : wakil
-            },
-            success:function(data){
-
-                if(data == 'no-data')
-                {
-                    Swal.fire({
-                    allowOutsideClick: false,
-                    allowEscapeKey: false,
-                    allowEnterKey: false,
-                    confirmButtonText: '<i class="fa fa-thumbs-up"></i> Daftar Dulu Boss!',
-                    icon: 'info',
-                    title: 'Maklumat anda tiada dalam senarai wakil! Tekan button okay untuk mendaftar!'
-                    }).then(function(){
-                        daftarfunction(wakil);
-                    });
-                }else{
-                    Swal.fire({
-                    allowOutsideClick: false,
-                    allowEscapeKey: false,
-                    allowEnterKey: false,
-                    confirmButtonText: '<i class="fa fa-thumbs-up"></i> Baik Boss!',
-                    icon: 'success',
-                    title: 'Maklumat anda Berjaya Direkodkan!'
-                    });
-
-                    console.log(data.nowakil);
-                    nw = data.nowakil;
-
-                    $('#wakiltxt').prop( "disabled", true );
-                    $(e).html("Ubah");
-                    $(e).attr("onclick","ubahwakil(this)");
-                }
-               
-            },error: function (request, status, error) {
-            console.log(request.responseText);
-        }
-        });
-    }
-    else
-    {
-        Swal.fire({
-            icon: 'error',
-            titleText: 'Kad Pengenalan',
-            text: 'mestilah tidak melebihi dan kurang daripada 12 patah perkataan'
-        });
-    }
-  
-}
-
-function daftarwakil()
-{
-    let nopelanggan = $('#nopelanggan').val();
-    let nowakil = $('#nowakil').val();
-    let nama = $('#nama').val();
-    let hubungan = $('#slthubungan').val();
-    let alamat = $('#alamat').val();
-    let telefon = $('#notel').val();
-    let nota = $('#nota').val();
-    let nokp = $('#nokp').val();
-
-    
-    $.ajax({
-        method:'POST',
-        url: "{{ route('wakil.create') }}",
-        data:{ 
-            "_token": "{{ csrf_token() }}",
-            "nopelanggan" : nopelanggan,
-            "nowakil" : nowakil,
-            "nama" : nama,
-            "hubungan" : hubungan,
-            "alamat" : alamat,
-            "telefon" : telefon,
-            "nota" : nota,
-            "icno" : nokp
-             },
-        success:function(data){
-
-            if(data == 1)
-            {
-                $('#WakilModal').hide();
-                $('#WakilModal').modal('hide');
-                nw = nowakil;
-                Swal.fire({
-                    allowOutsideClick: false,
-                    allowEscapeKey: false,
-                    allowEnterKey: false,
-                    confirmButtonText: '<i class="fa fa-thumbs-up"></i> Baik Boss!',
-                    icon: 'success',
-                    title: 'Berjaya Mendaftar Wakil Pelanggan!'
-                }).then(function(){
-                    $('#wakiltxt').prop( "disabled", true );
-                    $('#caribtn').html("Ubah");
-                    $('#caribtn').attr("onclick","ubahwakil(this)");
-                  
-
-                });
+                    'Amaran!',
+                    'Pinjaman Haruslah Dalam Lingkungan 80%!',
+                    'error'
+                )
+                return false;
             }
 
-        },error: function (request, status, error) {
-            console.log(request.responseText);
-        }
-    });
-}
 
-function daftarfunction(id)
-{
-    $('#nokp').val(id);
+            var nopelanggan = "{{ $gadai['nopelanggan'] }}";
+            var jenistebus = $('#sltjenistebus').find(":selected").val();
+            var jbg = "{{ $gadai['tempoh'] }}";
+            var kadarupah = "{{ $gadai['kadarupah'] }}";
+            var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
+            var pinjaman = parseFloat($('#pinjamanbaru').val());
+            var ansuran = 0;
+            var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val());
+            var maxpinjaman = parseFloat($('#tambahpinjamsebenar').val());
+            var bakipinjaman = maxpinjaman - parseFloat($('#tambahpinjam').val());
+            var bakiupah = 0;
+            var historygadaian = "{{ $gadai['norujukan'] }}";
+            var marhun = "{{ $gadai['marhun'] }}";
+            var total_berat = parseFloat("{{ $gadai['berat'] }}");
+            var kuantiti_marhun = Number("{{sizeof($marhun)}}");
+            var noic = "{{ $gadai['nokp'] }}";
+        
+            var kadarupahbaru = 0;
 
-    $.ajax({
-        method:'GET',
-        url: "{{ route('wakil.caricustomer') }}",
-        data:{ "icno" : id },
-        success:function(data){
+            if(nilai_marhun > 0 && nilai_marhun < 401.99){
+                kadarupahbaru = 1.2/100;
+            }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
+                kadarupahbaru = 1.50/100;
+            }else if(nilai_marhun >= 2002 ){
+                kadarupahbaru = 1.70/100;
+            }
 
-            $('#WakilModal').modal();
-            $('#nama').val('');
-            $('#alamat').val(data['']);
-            $('#notel').val(data['']);
+            var keuntungan_sebulan = pinjaman * kadarupahbaru;
+            var keuntungan_6bln = keuntungan_sebulan * 6;
 
-            //get first wakil
             $.ajax({
                 method:'GET',
-                url: "{{ route('wakil.first') }}",
-                success:function(getfirstwakil)
-                {
-                    let firstwakil = parseInt(getfirstwakil);
+                url: "{{ route('tambah.pinjaman') }}",
+                data:{
+                    "nopelanggan" : nopelanggan,
+                    "jenistebus" : jenistebus,
+                    "jbg" : jbg,
+                    "kadarupah" : kadarupah,
+                    "nilai_marhun" : nilai_marhun,
+                    "pinjaman" : pinjaman,
+                    "ansuran" : ansuran,
+                    "addpinjaman" : addpinjaman,
+                    "bakipinjaman" : bakipinjaman,
+                    "bakiupah" : bakiupah,
+                    "historygadaian" : historygadaian,
+                    "marhun" : marhun,
+                    "kuantiti_marhun" : kuantiti_marhun,
+                    "total_berat" : total_berat,
+                    "kadarkeuntungan" : kadarupahbaru,
+                    "keuntungan_6bln" : keuntungan_6bln,
+                    "keuntungan_sebulan" : keuntungan_sebulan,
+                    "noic" : noic,
+                    "norujukan" : norujukan,
+                    "jenisbayarantebus" : jenisbayarantebus,
+                    "teller" : teller
 
-                    $('#nowakil').val(firstwakil+1);
+                },
+                success:function(success_data){
+                    Swal.fire(
+                        'Berjaya!',
+                        'Transaksi Tambah Pinjaman Berjaya Disimpan',
+                        'success'
+                    ).then(function() {
+                        window.location.replace("{{ url()->previous() }}");
+                    })
+                },error: function (request, status, error) {
+                    console.log(request.responseText);
                 }
             });
 
-            if(data != 'no-data')
-            {
-                $('#nama').val(data['nama']);
-                $('#alamat').val(data['alamat1']);
-                $('#notel').val(data['telefon']);
-                $('#nopelanggan').val(data['nopelanggan']);
-            }
-           
-
-        },error: function (request, status, error) {
-            console.log(request.responseText);
+            /////////////
+            //End File//
+            ///////////
         }
 
-    });
-}
-
-function ubahwakil(e)
-{
-    $('#wakiltxt').prop( "disabled", false);
-    $(e).html("Cari");
-    $(e).attr( "onclick", "wakilfunction(this)");
-}
-
-
-function historybayaran()
-{
-    $.ajax({
-    method: 'get',
-    url: api + '/api/transaction/' + norujukan,
-    success: function(data)
-    {
-      historybayarantable(data);
-      $('#historybayaranModal').modal();
     }
-  });
-}
+
+    let nw = 0;
+
+    function wakilfunction(e){
+        let wakil = $('#wakiltxt').val();
+
+        if(wakil.length == 12){
+            $.ajax({
+                method:'GET',
+                url: "{{ route('wakil.search') }}",
+                data:{
+                    'wakil' : wakil
+                },
+                success:function(data){
+
+                    if(data == 'no-data'){
+                        Swal.fire({
+                            allowOutsideClick: false,
+                            allowEscapeKey: false,
+                            allowEnterKey: false,
+                            confirmButtonText: '<i class="fa fa-thumbs-up"></i> Daftar Dulu Boss!',
+                            icon: 'info',
+                            title: 'Maklumat anda tiada dalam senarai wakil! Tekan button okay untuk mendaftar!'
+                        }).then(function(){
+                            daftarfunction(wakil);
+                        });
+                    }else{
+                        Swal.fire({
+                            allowOutsideClick: false,
+                            allowEscapeKey: false,
+                            allowEnterKey: false,
+                            confirmButtonText: '<i class="fa fa-thumbs-up"></i> Baik Boss!',
+                            icon: 'success',
+                            title: 'Maklumat anda Berjaya Direkodkan!'
+                        });
+                        nw = data.nowakil;
+
+                        $('#wakiltxt').prop( "disabled", true );
+                        $(e).html("Ubah");
+                        $(e).attr("onclick","ubahwakil(this)");
+                    }
+                
+                },error: function (request, status, error) {
+                console.log(request.responseText);
+            }
+            });
+        }else{
+            Swal.fire({
+                icon: 'error',
+                titleText: 'Kad Pengenalan',
+                text: 'mestilah tidak melebihi dan kurang daripada 12 patah perkataan'
+            });
+        }
+    
+    }
+
+    function daftarwakil(){
+        let nopelanggan = $('#nopelanggan').val();
+        let nowakil = $('#nowakil').val();
+        let nama = $('#nama').val();
+        let hubungan = $('#slthubungan').val();
+        let alamat = $('#alamat').val();
+        let telefon = $('#notel').val();
+        let nota = $('#nota').val();
+        let nokp = $('#nokp').val();
+
+        
+        $.ajax({
+            method:'POST',
+            url: "{{ route('wakil.create') }}",
+            data:{ 
+                "_token": "{{ csrf_token() }}",
+                "nopelanggan" : nopelanggan,
+                "nowakil" : nowakil,
+                "nama" : nama,
+                "hubungan" : hubungan,
+                "alamat" : alamat,
+                "telefon" : telefon,
+                "nota" : nota,
+                "icno" : nokp
+                },
+            success:function(data){
+                if(data == 1){
+                    $('#WakilModal').hide();
+                    $('#WakilModal').modal('hide');
+                    nw = nowakil;
+                    Swal.fire({
+                        allowOutsideClick: false,
+                        allowEscapeKey: false,
+                        allowEnterKey: false,
+                        confirmButtonText: '<i class="fa fa-thumbs-up"></i> Baik Boss!',
+                        icon: 'success',
+                        title: 'Berjaya Mendaftar Wakil Pelanggan!'
+                    }).then(function(){
+                        $('#wakiltxt').prop( "disabled", true );
+                        $('#caribtn').html("Ubah");
+                        $('#caribtn').attr("onclick","ubahwakil(this)");
+                    });
+                }
+
+            },error: function (request, status, error) {
+                console.log(request.responseText);
+            }
+        });
+    }
+
+    function daftarfunction(id){
+        $('#nokp').val(id);
+
+        $.ajax({
+            method:'GET',
+            url: "{{ route('wakil.caricustomer') }}",
+            data:{ "icno" : id },
+            success:function(data){
+
+                $('#WakilModal').modal();
+                $('#nama').val('');
+                $('#alamat').val(data['']);
+                $('#notel').val(data['']);
+
+                //get first wakil
+                $.ajax({
+                    method:'GET',
+                    url: "{{ route('wakil.first') }}",
+                    success:function(getfirstwakil){
+                        let firstwakil = parseInt(getfirstwakil);
+
+                        $('#nowakil').val(firstwakil+1);
+                    }
+                });
+
+                if(data != 'no-data'){
+                    $('#nama').val(data['nama']);
+                    $('#alamat').val(data['alamat1']);
+                    $('#notel').val(data['telefon']);
+                    $('#nopelanggan').val(data['nopelanggan']);
+                }
+            
+
+            },error: function (request, status, error) {
+                console.log(request.responseText);
+            }
+
+        });
+    }
+
+    function ubahwakil(e){
+        $('#wakiltxt').prop( "disabled", false);
+        $(e).html("Cari");
+        $(e).attr( "onclick", "wakilfunction(this)");
+    }
+
+
+    function historybayaran(){
+        $.ajax({
+            method: 'get',
+            url: api + '/api/transaction/' + norujukan,
+            success: function(data)
+                historybayarantable(data);
+                $('#historybayaranModal').modal();
+            }
+        });
+    }
 
 
 
@@ -1521,18 +1333,15 @@ function historybayaran()
         
         historybayarandatatable.clear().draw();
         $.each(data,function(index,bayaran){
-
             var urlroute = '{{ route("resit.ansuran", ":id") }}';
             urlroute = urlroute.replace(':id', bayaran['id']);
-
-            console.log(bayaran['']);
             historybayarandatatable.row.add([
-                    counter,
-                    bayaran['created_at'], 
-                    "RM " + bayaran['duit_masuk'],
-                    '<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
-                ]).draw();
-                counter = counter + 1;
+                counter,
+                bayaran['created_at'], 
+                "RM " + bayaran['duit_masuk'],
+                '<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
+            ]).draw();
+            counter = counter + 1;
         });
     }