diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index cd52d88..ddec107 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -282,6 +282,7 @@
             return false;
         }
     });
+
     var historybayarandatatable = $('#tablehistorybayaran').DataTable({
         "ordering": false
     });
@@ -310,8 +311,7 @@
     bilmarhun = () => {
         if(bilangan_marhun ==1){
             $('option[value="S"]').attr("disabled", true);
-        }
-        else{
+        }else{
             $('option[value="S"]').attr("disabled", false);
         }
     }
@@ -327,7 +327,7 @@
 
     var jumlahperlu = 0;
     var jumlahminima = 0;
-    
+ 
 
     $( document ).ready(function() {
         tebusan();
@@ -348,7 +348,6 @@
                                 
             $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2));                            
 
-
             $('#divpembiayaanasal').hide();
             $('#divbakihargajualan').show();
             $('#divtelahdibayar').show();
@@ -364,6 +363,7 @@
                     $('#bayaranditerima').val(data);
                 }
             });
+
             //Tebus Tawarruq
             $.ajax({
                 method:'GET',
@@ -373,6 +373,8 @@
                     $('#perludibayar').val(data.toFixed(2));
                 }
             });
+
+
         }else if(tarikhgadai < tarikhtawarruq){
             let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.8) - $gadai['pinjaman'] }}";
 
@@ -403,7 +405,10 @@
                     $('#perludibayar').val(data);
                 }
             });
+
+
         }
+
         // Telah dibayar
         $.ajax({
             method:'GET',
@@ -412,16 +417,23 @@
             success:function(data){
                 var totaltelahdibayar = 0;
 
-                if(data == ''){
+                if(data == '')
+                {
                     $('#jumlahtelahdibayar').val(0);
-                }else{
+                }
+                else
+                {
                     $.each(data,function(index,transaksi){
+
                         totaltelahdibayar += parseFloat(transaksi.duit_masuk);
                     });
+
                     $('#jumlahtelahdibayar').val(totaltelahdibayar);
                 }
+
             }
         });
+
     }
 
     if(tarikhgadai >= tarikhtawarruq){
@@ -446,7 +458,13 @@
                 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);
+                
             }else{
                 var rm = array_recno.findIndex(x => x === recno);
                 var rmnilai = array_nm.findIndex(y => y == nilaimarhun);
@@ -459,6 +477,8 @@
                 array_berat.splice(rmberat,1);
 
                 totalmarhun = totalmarhun + parseFloat(nilaimarhun);
+
+
             }
             if(numbernotchecked != totalCheckboxes){
                 $.ajax({
@@ -466,28 +486,36 @@
                     url: api + '/api/tebusseparuhtawarruq/' + kodcaw + '/' + norujukan,
                     dataType: 'json',
                     data:{
-                        "array_recno" : array_recno
+                    "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){
+    }
+    else if(tarikhgadai < tarikhtawarruq){
         //Separuh Bayar Bukan Tawarruq
         $(document).on('click', '#checkmarhun', function(e) {
 
@@ -495,6 +523,7 @@
         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());
 
@@ -519,13 +548,13 @@
                 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,
@@ -550,6 +579,9 @@
             }
         });
     }
+    
+
+  
 
     $("#sltjenistebus").change(function(){
     
@@ -557,92 +589,98 @@
 
         switch($(this).val()) {
             case "T":
-                $('input[type="checkbox"]').hide();
-                $('span.spannar').show();
+            $('input[type="checkbox"]').hide();
+            $('span.spannar').show();
 
-                $("#bayaran").prop("disabled", true);
-                $("#bayaran").val(0);
-                
-                $('#divtambahpinjaman').hide();
-                $('#divpinjamanbaru').hide();
-                $('#divbayaranditerima').hide();
-                $('#divbakipinjaman').hide();
+            $("#bayaran").prop("disabled", true);
+            $("#bayaran").val(0);
+            
+            $('#divtambahpinjaman').hide();
+            $('#divpinjamanbaru').hide();
+            $('#divbayaranditerima').hide();
+            $('#divbakipinjaman').hide();
 
-                $('#divtelahdibayar').show();
-                $('#divbayaran').show();
-                $('#divperludibayar').show();
+            $('#divtelahdibayar').show();
+            $('#divbayaran').show();
+            $('#divperludibayar').show();
+
+            tebusan();
+            break;
 
-                tebusan();
-                break;
             case "A":
-                $('input[type="checkbox"]').hide();
-                $('span.spannar').show();
+            $('input[type="checkbox"]').hide();
+            $('span.spannar').show();
 
-                $("#bayaran").prop("disabled", false);
-                $("#perludibayar").prop("readonly", true);
-                $("#bayaran").val(0);
+            $("#bayaran").prop("disabled", false);
+            $("#perludibayar").prop("readonly", true);
+            $("#bayaran").val(0);
 
-                $('#divtambahpinjaman').hide();
-                $('#divpinjamanbaru').hide();
-                $('#divbayaranditerima').hide();
-                $('#divbakipinjaman').hide();
+            $('#divtambahpinjaman').hide();
+            $('#divpinjamanbaru').hide();
+            $('#divbayaranditerima').hide();
+            $('#divbakipinjaman').hide();
 
-                $('#divtelahdibayar').show();
-                $('#divbayaran').show();
-                $('#divperludibayar').show();
+            $('#divtelahdibayar').show();
+            $('#divbayaran').show();
+            $('#divperludibayar').show();
 
-                $('#perludibayar').val(jumupah);
+            $('#perludibayar').val(jumupah);
 
-                break;
+            break;
 
             case "S":
-                $('input[type="checkbox"]').show();
-                $('span.spannar').hide();
+            $('input[type="checkbox"]').show();
+            $('span.spannar').hide();
 
-                $("#bayaran").prop("disabled", true);
-                $("#perludibayar").prop("readonly", false);
-                $("#bayaran").val(0);
+            $("#bayaran").prop("disabled", true);
+            $("#perludibayar").prop("readonly", false);
+            $("#bayaran").val(0);
 
-                $('#divtambahpinjaman').hide();
-                $('#divpinjamanbaru').hide();
-                $('#divbayaranditerima').hide();
+            $('#divtambahpinjaman').hide();
+            $('#divpinjamanbaru').hide();
+            $('#divbayaranditerima').hide();
 
-                $('#divbakipinjaman').show();
-                $('#divtelahdibayar').show();
-                $('#divbayaran').show();
-                $('#divperludibayar').show();
+            $('#divbakipinjaman').show();
+            $('#divtelahdibayar').show();
+            $('#divbayaran').show();
+            $('#divperludibayar').show();
 
-                $('#perludibayar').val(jumupah);
-                break;
+            $('#perludibayar').val(jumupah);
+            break;
 
             case "P":
-                $('input[type="checkbox"]').hide();
-                $('span.spannar').show();
-                $('#divpinjaman').show();
-                $('#divtambahpinjaman').show();
-                $('#divpinjamanbaru').show();
-                $('#divbayaranditerima').show();
+            $('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;
 
+            console.log(byr);
+
+            console.log(bayaranseparuhasal);
+
             if(byr < (bayaranseparuhasal + parseFloat($('#jumlahupah').val()))){
                 $('#bayaran').val(bayaranseparuhasal.toFixed(2));
             }else{
@@ -650,9 +688,11 @@
                 $('#bayaran').val(totalseparuh.toFixed(2));
             }
 
+            // pdbyr = parseFloat(byr);
             pdbyr = $('#bayaran').val();
             total =  $('#pinjaman').val() - pdbyr;
 
+            // $('#perludibayar').val(pdbyr);
             $('#bakipinjaman').val(total.toFixed(2));
         }
     }
@@ -661,22 +701,26 @@
         if($('#sltjenistebus').find(":selected").val() == 'A'){
             if(tarikhgadai < tarikhtawarruq){
         
-            let byr = $(e).val();
-            let total = 0;
-            let pdbyr = 0;
+                let byr = $(e).val();
+                let total = 0;
+                let pdbyr = 0;
 
-            if(byr == ''){
-                $('#perludibayar').val($('#jumlahupah').val());
-            }else{
-                pdbyr = parseFloat(byr) + parseFloat($('#jumlahupah').val());
+                if(byr == ''){
+                    $('#perludibayar').val($('#jumlahupah').val());
+                }else{
+                    pdbyr = parseFloat(byr) + parseFloat($('#jumlahupah').val());
 
-                $('#perludibayar').val(pdbyr);
+                    $('#perludibayar').val(pdbyr);
+                    // $('#perludibayar').val(total);
+                }
+        
             }
         }
     }
 
 
     function bayarpinjam(e){
+
         var maxpinjam = parseFloat($('#tambahpinjamsebenar').val());
         var pinjambaru = parseFloat($('#pinjamanbaru').val());
         var pinjam = parseFloat($('#pinjaman').val());
@@ -689,6 +733,9 @@
 
         $(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));  ;
@@ -696,15 +743,21 @@
 
     let teller = "{{ Auth::user()->name }}";
 
-    function bayaransemua(){
+    function bayaransemua()
+    {
+        
         if($('#sltjenistebus').find(":selected").val() == 'T'){
             let jenisbayarantebus = '';
-            if(tarikhgadai < tarikhtawarruq){
+            if(tarikhgadai < tarikhtawarruq)
+            {
                 jenisbayarantebus = "nottawarruq";
+
                 var urlroute = '{{ route("resit.belumtebus", ":id") }}';
                 urlroute = urlroute.replace(':id', norujukan);
-            }else if (tarikhgadai >= tarikhtawarruq){
+            }
+            else if (tarikhgadai >= tarikhtawarruq){
                 jenisbayarantebus = "tawarruq";
+
                 var urlroute = '{{ route("resit.tebus", ":id") }}';
                 urlroute = urlroute.replace(':id', norujukan);
             }
@@ -745,10 +798,12 @@
                     "teller" : teller
                 },
                 success:function(success_data){
+
                     Swal.fire({
                         icon: 'success',
                         title: 'Berjaya!',
-                        text: 'Transaksi Tebus Berjaya Disimpan'
+                        text: 'You clicked the button!',
+                        footer: '<a href>Why do I have this issue?</a>'
 
                     }).then(function() {
                         window.open(urlroute, '_blank');
@@ -765,18 +820,24 @@
             let jenisbayarantebus = '';
             let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
 
-            if(tarikhgadai < tarikhtawarruq){
+            if(tarikhgadai < tarikhtawarruq)
+            {
                 jenisbayarantebus = "nottawarruq";
-            }else if (tarikhgadai >= tarikhtawarruq){
+            }
+            else if (tarikhgadai >= tarikhtawarruq){
                 jenisbayarantebus = "tawarruq";
             }
 
 
-            if(tarikhgadai >= tarikhtawarruq){
+            if(tarikhgadai >= tarikhtawarruq)
+            {
                 var bayar = $('#bayaran').val(); 
                 var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;
 
-                if(bayar >  bakipinjam){
+
+            
+                if(bayar >  bakipinjam)
+                {
                     Swal.fire(
                         'Amaran!',
                         'Bayaran tidak boleh melebihi 10% nilai marhun!',
@@ -787,114 +848,130 @@
 
 
                 $.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);
+                method:'get',
+                url: "{{ route('bayaran.ansuranstawarruq') }}",
+                data:{
+                    "bayaran" : bayar,
+                    "kodcaw" : kodcaw,
+                    "norujukan" : norujukan,
+                    "teller" : teller
+                },
+                success:function(success_data){
 
-                        Swal.fire(
-                            'Berjaya!',
-                            'Transaksi Bayar Ansuran Berjaya Disimpan',
-                            'success'
-                        ).then(function() {
-                            window.open(urlroute, '_blank');
-                            window.location.replace("{{ url()->previous() }}");
-                        })
-                    }
-                });
+                    console.log(success_data);
 
-            }else if(tarikhgadai < tarikhtawarruq){
+                    var urlroute = '{{ route("resit.ansurans", ":id") }}';
+                    urlroute = urlroute.replace(':id', norujukan);
 
-                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;
+                        '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;
+            }
 
 
-                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 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;
+            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;
-                }
+            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;
+            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);
-                    }
-                });
+            $.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);
+            }
+            });
 
             }
             /////////////
@@ -903,25 +980,33 @@
 
         }else if($('#sltjenistebus').find(":selected").val() == 'S'){
             let jenisbayarantebus = '';
-            if(tarikhgadai < tarikhtawarruq){
+            if(tarikhgadai < tarikhtawarruq)
+            {
                 jenisbayarantebus = "nottawarruq";
-            }else if (tarikhgadai >= tarikhtawarruq){
+            }
+            else if (tarikhgadai >= tarikhtawarruq){
                 jenisbayarantebus = "tawarruq";
             }
 
-            if($('#perludibayar').val() < (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val()))){
+            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){
+            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'
-                );
+                '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;
             }
 
@@ -929,11 +1014,12 @@
             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'
+                'Amaran!',
+                'Sila tick salah satu marhun!',
+                'error'
                 )
                 return false;
             }
@@ -943,32 +1029,54 @@
             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;
+                    
                     }
+                    // else
+                    // {
+                    //     console.log("value: " + value + " index :" + index +" marhun : " + array_marhun[i]);
+                    //     marhunlama.splice(index,1);
+                    // }
                 }
             });
 
+            
+
             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'] }}";
@@ -988,6 +1096,15 @@
             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;
 
@@ -1003,84 +1120,94 @@
             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,
+            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);
+            }
+
 
 
-                    //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);
-                }
             });
 
             /////////////
             //End File//
             ///////////
         
-        }else if($('#sltjenistebus').find(":selected").val() == 'P'){
+        }
+        else if($('#sltjenistebus').find(":selected").val() == 'P')
+        {
             let jenisbayarantebus = '';
-            if(tarikhgadai < tarikhtawarruq){
+            if(tarikhgadai < tarikhtawarruq)
+            {
                 jenisbayarantebus = "nottawarruq";
             }
             else if (tarikhgadai >= tarikhtawarruq){
                 jenisbayarantebus = "tawarruq";
             }
 
-            if( $('#tambahpinjam').val() <=  0 && $('#tambahpinjam').val() === ''){
-                Swal.fire(
-                    'Amaran!',
-                    'Amaun hendaklah melebihi daripada 0',
-                    'error'
-                )
-                return false;
+            if( $('#tambahpinjam').val() <=  0 && $('#tambahpinjam').val() === '')
+                {
+                    Swal.fire(
+                        'Amaran!',
+                        'Amaun hendaklah melebihi daripada 0',
+                        'error'
+                    )
+                    return false;
             } 
         
-            if(parseFloat($('#basic-addon2').text()) > 80){
+            if(parseFloat($('#basic-addon2').text()) > 80)
+            {
                 Swal.fire(
-                    'Amaran!',
-                    'Pinjaman Haruslah Dalam Lingkungan 80%!',
-                    'error'
+                'Amaran!',
+                'Pinjaman Haruslah Dalam Lingkungan 80%!',
+                'error'
                 )
                 return false;
             }
@@ -1102,7 +1229,10 @@
             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){
@@ -1116,6 +1246,20 @@
             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') }}",
@@ -1145,15 +1289,15 @@
                 },
                 success:function(success_data){
                     Swal.fire(
-                        'Berjaya!',
-                        'Transaksi Tambah Pinjaman Berjaya Disimpan',
+                        'Good job!',
+                        'You clicked the button!',
                         'success'
                     ).then(function() {
                         window.location.replace("{{ url()->previous() }}");
                     })
                 },error: function (request, status, error) {
-                    console.log(request.responseText);
-                }
+                console.log(request.responseText);
+            }
             });
 
             /////////////
@@ -1165,10 +1309,12 @@
 
     let nw = 0;
 
-    function wakilfunction(e){
+    function wakilfunction(e)
+    {
         let wakil = $('#wakiltxt').val();
 
-        if(wakil.length == 12){
+        if(wakil.length == 12)
+        {
             $.ajax({
                 method:'GET',
                 url: "{{ route('wakil.search') }}",
@@ -1177,26 +1323,29 @@
                 },
                 success:function(data){
 
-                    if(data == 'no-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!'
+                        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!'
+                        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 );
@@ -1208,7 +1357,9 @@
                 console.log(request.responseText);
             }
             });
-        }else{
+        }
+        else
+        {
             Swal.fire({
                 icon: 'error',
                 titleText: 'Kad Pengenalan',
@@ -1218,7 +1369,8 @@
     
     }
 
-    function daftarwakil(){
+    function daftarwakil()
+    {
         let nopelanggan = $('#nopelanggan').val();
         let nowakil = $('#nowakil').val();
         let nama = $('#nama').val();
@@ -1244,7 +1396,9 @@
                 "icno" : nokp
                 },
             success:function(data){
-                if(data == 1){
+
+                if(data == 1)
+                {
                     $('#WakilModal').hide();
                     $('#WakilModal').modal('hide');
                     nw = nowakil;
@@ -1259,6 +1413,8 @@
                         $('#wakiltxt').prop( "disabled", true );
                         $('#caribtn').html("Ubah");
                         $('#caribtn').attr("onclick","ubahwakil(this)");
+                    
+
                     });
                 }
 
@@ -1268,7 +1424,8 @@
         });
     }
 
-    function daftarfunction(id){
+    function daftarfunction(id)
+    {
         $('#nokp').val(id);
 
         $.ajax({
@@ -1286,14 +1443,16 @@
                 $.ajax({
                     method:'GET',
                     url: "{{ route('wakil.first') }}",
-                    success:function(getfirstwakil){
+                    success:function(getfirstwakil)
+                    {
                         let firstwakil = parseInt(getfirstwakil);
 
                         $('#nowakil').val(firstwakil+1);
                     }
                 });
 
-                if(data != 'no-data'){
+                if(data != 'no-data')
+                {
                     $('#nama').val(data['nama']);
                     $('#alamat').val(data['alamat1']);
                     $('#notel').val(data['telefon']);
@@ -1308,23 +1467,26 @@
         });
     }
 
-    function ubahwakil(e){
-        $('#wakiltxt').prop( "disabled", false);
-        $(e).html("Cari");
-        $(e).attr( "onclick", "wakilfunction(this)");
-    }
+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();
-            }
-        });
+function historybayaran()
+{
+    $.ajax({
+    method: 'get',
+    url: api + '/api/transaction/' + norujukan,
+    success: function(data)
+    {
+      historybayarantable(data);
+      $('#historybayaranModal').modal();
     }
+  });
+}
 
 
 
@@ -1333,15 +1495,18 @@
         
         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;
         });
     }
 
@@ -1364,5 +1529,6 @@
     };
   }(jQuery));
 
+
 </script>
 @endsection
\ No newline at end of file