From f04a4debf79a9163a3f16c263b7033748e08e2b3 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 30 May 2021 19:39:06 +0800 Subject: [PATCH 1/2] fix penebusan resit --- app/Http/Controllers/GadaianController.php | 2 -- resources/views/penebusan/index.blade.php | 17 +++++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 5421a59..e8e4885 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/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; diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 1393a95..400756c 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -1010,18 +1010,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 +1061,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') }}", From 29b5e62c7929296c762a9055a22aedf6a8265c4e Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 30 May 2021 19:45:19 +0800 Subject: [PATCH 2/2] fix add disabled auto tawarruq --- resources/views/penebusan/index.blade.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 400756c..120258e 100644 --- a/resources/views/penebusan/index.blade.php +++ b/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();