Merge branch 'pipiv2' into 'new-master'

Pipiv2

See merge request online-sistem1/kaunter!138

app/Http/Controllers/GadaianController.php

@@ -472,8 +472,6 @@ class GadaianController extends Controller
 
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
 
-        dd($cawangan_info);
-
         $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
         
         $totaltransaction = 0;

resources/views/penebusan/index.blade.php

@@ -705,6 +705,8 @@
 
         switch($(this).val()) {
             case "T":
+                $("#terima_transaksi").prop('disabled', false);
+
                 $('input[type="checkbox"]').hide();
                 $('span.spannar').show();
 
@@ -728,6 +730,8 @@
                 break;
 
             case "A":
+                $("#terima_transaksi").prop('disabled', false);
+
                 $('input[type="checkbox"]').hide();
                 $('span.spannar').show();
 
@@ -751,6 +755,8 @@
                 break;
 
             case "S":
+                $("#terima_transaksi").prop('disabled', false);
+
                 $('input[type="checkbox"]').show();
                 $('span.spannar').hide();
 
@@ -773,6 +779,8 @@
                 break;
 
             case "P":
+                $("#terima_transaksi").prop('disabled', false);
+
                 $('input[type="checkbox"]').hide();
                 $('span.spannar').show();
                 $('#divpinjaman').show();
@@ -791,6 +799,8 @@
                 $("#bayaran").val(0);
                 break;
             case "U":
+                $("#terima_transaksi").prop('disabled', false);
+
                 $('input[type="checkbox"]').hide();
                 $('span.spannar').show();
 
@@ -812,6 +822,8 @@
                 $('#perludibayar').val(formatter.format(jumupah));
                 break;
             case "AT":
+                $("#terima_transaksi").prop('disabled', true);
+
                 $('input[type="checkbox"]').hide();
                 $('span.spannar').show();
                 $('#divpinjaman').show();
@@ -1010,18 +1022,13 @@
             }
 
             let jenisbayarantebus = '';
+     
             if(hargajualan == '')
             {
                 jenisbayarantebus = "nottawarruq";
-
-                var urlroute = '{{ route("resit.belumtebus", ":id") }}';
-                urlroute = urlroute.replace(':id', norujukan);
             }
             else if (hargajualan != ''){
                 jenisbayarantebus = "tawarruq";
-
-                var urlroute = '{{ route("resit.tebus", ":id") }}';
-                urlroute = urlroute.replace(':id', norujukan);
             }
 
             var nopelanggan = "{{ $gadai['nopelanggan'] }}";
@@ -1066,6 +1073,16 @@
                 
                     if(success_data == 'success')
                     {  
+                        if(jenisbayarantebus == "tawarruq")
+                        {
+                            var urlroute = '{{ route("resit.tebus", ":id") }}';
+                            urlroute = urlroute.replace(':id', norujukan);
+
+                        }else{
+                            var urlroute = '{{ route("resit.belumtebus", ":id") }}';
+                            urlroute = urlroute.replace(':id', norujukan);
+                        }
+
                         $.ajax({
                             method: 'put',
                             url: "{{ route('alirantunai.tebus') }}",