Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into tukar-taraf

resources/views/customers/info.blade.php

@@ -430,7 +430,7 @@
                     event.preventDefault();
                     return false;
                 }else{
-                    if(Number(data['unit_komuditi']) < 10000){
+                    if(Number(data['unit_komuditi']) < 50000){
                         Swal.fire({
                             icon: 'error',
                             title: 'Unit Komoditi Berbaki Minumum',

resources/views/lelongan/index.blade.php

@@ -199,6 +199,39 @@
 
     function bayarantuntubaki()
     {
+	$.ajax({
+            method: 'put',
+            url: "{{ route('lelong.tuntutbaki') }}",
+            data: { 
+            "_token": "{{ csrf_token() }}",
+            'batchno' : batchno,
+            'jenis' : jenis,
+            'norujukan' : norujukan,
+            'teller' : teller,
+            'bakipjm' : bakipjm,
+            'bakiupah' : bakiupah,
+            'cajlain' : cajlain,
+            'cajlelong' : cajlelong,
+            'jumlah' : jumlah,
+            'nowakil' : nowakil,
+            'hargajual' : hargajual
+            },
+            success:function(data){
+                let urlroute = '{{ route("resit.tuntutbaki", ":id") }}';
+                urlroute = urlroute.replace(':id', norujukan);
+                Swal.fire(
+                        'Berjaya!',
+                        'Tuntut Baki Berjaya',
+                        'success'
+                    ) .then(function() {
+                        window.open(urlroute, '_blank');
+                        window.location.replace("{{  route('customer_info') }}");
+                    })
+            },error: function(xhr, status, error) {
+                var err = eval("(" + xhr.responseText + ")");
+                alert(xhr.responseText);
+            }
+        });
         const swalWithBootstrapButtons = Swal.mixin({
             customClass: {
                 confirmButton: 'btn btn-success',
@@ -348,4 +381,4 @@
     }
 
 </script>
-@endsection
+@endsection

resources/views/penebusan/index.blade.php

@@ -442,7 +442,7 @@
                 url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
                 dataType: 'json',
                 success:function(data){
-                    $('#jumlahupah').val(formatter.format(data));
+                    $('#jumlahupah').val(data);
                 }
             });
 
@@ -700,8 +700,8 @@
 
     $("#sltjenistebus").change(function(){
     
-        var jumupah = parseFloat($('#jumlahupah').val());
-        var jumupahrebet = parseFloat($('#bayaranditerima').val());
+        var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
+        var jumupahrebet = parseFloat($('#bayaranditerima').val().replace(/[^0-9.-]+/g,""));
 
         switch($(this).val()) {
             case "T":