diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php index 7b8f14c..abe4834 100644 --- a/app/Http/Controllers/CustomersController.php +++ b/app/Http/Controllers/CustomersController.php @@ -58,6 +58,11 @@ class CustomersController extends Controller $request->session()->forget('page_reload'); $request->session()->forget('norujukan'); + + if($request->tebus_auto_tawarruq_berjaya === 'true'){ + $request->session()->flash('activate_tab', 'SAG_baru'); + } + return view('customers.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi')); } diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index fdeb0d9..c5122cb 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -384,7 +384,7 @@ @endif - +
@@ -1430,7 +1430,7 @@ 'error' ); } - + } }); @@ -2180,7 +2180,7 @@ total = keuntungan + lebihanmargin; var marginsemasa = (jenisAT == 'hargalama') ? pinjaman_baru/nm * 100 : pinjaman_baru/nmsemasa * 100; - + if(parseFloat($('#perludibayarAT').val()) < parseFloat(total.toFixed(2))){ Swal.fire({ icon: 'error', @@ -2474,7 +2474,7 @@ }else if(marginsemasa > 80){ - + // $("#terima_transaksi").prop('disabled', false); // Swal.fire( // 'Amaran!', @@ -2603,7 +2603,8 @@ 'success' ) .then(function() { window.open(urlroute, '_blank'); - window.location.replace("{{ route('customer_info') }}"); + //add query params to signal tebus auto tawarruq berjaya to controller + window.location.replace("{{ route('customer_info') . '?tebus_auto_tawarruq_berjaya=true' }}"); }) },error: function (request, status, error) { console.log(request.responseText); @@ -3206,7 +3207,7 @@ function pembatalanbalik() function funcexcuse(toggle){ - if(toggle){ + if(toggle){ let pembiayaan = parseFloat($('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,"")); var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,"")); let percentasal = parseFloat('{{ number_format($percent_asal,2) }}'); @@ -3375,7 +3376,7 @@ function validateFloatKeyPress(el, evt) { //total pembiayaan baru pembiayaanbaru = pembiayaan - parseFloat(tot); - + //get the carat position var caratPos = getSelectionStart(el); var dotPos = el.value.indexOf("."); @@ -3412,7 +3413,7 @@ function bayaranATfunc(e){ let hargamarhun = parseFloat("{{ $nilaihargasemasa }}"); let pembiayaan = parseFloat("{{ $pembiayaanbaru }}"); let percenthargasemasa = parseFloat("{{ $percent_hargaemassemasa }}"); - + //algorithm untuk bayaran pelanggan dan baki let baki = parseFloat($('#bakiPelanggan').val()); let bayaranpelanggan = parseFloat($('#duitPelanggan').val());