KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merged in afiqhamzah/fix/tab-activation-defaults-to-SAG-Baru-after-tebus-auto-tawarruq (pull request #26)

Browse Source 
Tab activation defaults to SAG Baru after tebus auto tawarruq process success
This commit is contained in:
Afiq Hamzah
2023-12-11 07:00:05 +00:00
parent 7251f959d4 cbd7637710
commit b21fdc8142
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomersController.php
+5
View File
@@ -58,6 +58,11 @@ class CustomersController extends Controller
$request->session()->forget('page_reload'); $request->session()->forget('page_reload');
$request->session()->forget('norujukan'); $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')); return view('customers.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi'));
} }
resources/views/penebusan/index.blade.php
+9 -8
View File
@@ -384,7 +384,7 @@
@endif @endif
</div> </div>
<div class="col-6" id="divbayaranditerima"> <div class="col-6" id="divbayaranditerima">
<div class="form-group row"> <div class="form-group row">
@@ -1430,7 +1430,7 @@
'error' 'error'
); );
} }
} }
}); });
@@ -2180,7 +2180,7 @@
total = keuntungan + lebihanmargin; total = keuntungan + lebihanmargin;
var marginsemasa = (jenisAT == 'hargalama') ? pinjaman_baru/nm * 100 : pinjaman_baru/nmsemasa * 100; var marginsemasa = (jenisAT == 'hargalama') ? pinjaman_baru/nm * 100 : pinjaman_baru/nmsemasa * 100;
if(parseFloat($('#perludibayarAT').val()) < parseFloat(total.toFixed(2))){ if(parseFloat($('#perludibayarAT').val()) < parseFloat(total.toFixed(2))){
Swal.fire({ Swal.fire({
icon: 'error', icon: 'error',
@@ -2474,7 +2474,7 @@
}else if(marginsemasa > 80){ }else if(marginsemasa > 80){
// $("#terima_transaksi").prop('disabled', false); // $("#terima_transaksi").prop('disabled', false);
// Swal.fire( // Swal.fire(
// 'Amaran!', // 'Amaran!',
@@ -2603,7 +2603,8 @@
'success' 'success'
) .then(function() { ) .then(function() {
window.open(urlroute, '_blank'); 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) { },error: function (request, status, error) {
console.log(request.responseText); console.log(request.responseText);
@@ -3206,7 +3207,7 @@ function pembatalanbalik()
function funcexcuse(toggle){ function funcexcuse(toggle){
if(toggle){ if(toggle){
let pembiayaan = parseFloat($('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,"")); let pembiayaan = parseFloat($('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,""));
var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,"")); var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
let percentasal = parseFloat('{{ number_format($percent_asal,2) }}'); let percentasal = parseFloat('{{ number_format($percent_asal,2) }}');
@@ -3375,7 +3376,7 @@ function validateFloatKeyPress(el, evt) {
//total pembiayaan baru //total pembiayaan baru
pembiayaanbaru = pembiayaan - parseFloat(tot); pembiayaanbaru = pembiayaan - parseFloat(tot);
//get the carat position //get the carat position
var caratPos = getSelectionStart(el); var caratPos = getSelectionStart(el);
var dotPos = el.value.indexOf("."); var dotPos = el.value.indexOf(".");
@@ -3412,7 +3413,7 @@ function bayaranATfunc(e){
let hargamarhun = parseFloat("{{ $nilaihargasemasa }}"); let hargamarhun = parseFloat("{{ $nilaihargasemasa }}");
let pembiayaan = parseFloat("{{ $pembiayaanbaru }}"); let pembiayaan = parseFloat("{{ $pembiayaanbaru }}");
let percenthargasemasa = parseFloat("{{ $percent_hargaemassemasa }}"); let percenthargasemasa = parseFloat("{{ $percent_hargaemassemasa }}");
//algorithm untuk bayaran pelanggan dan baki //algorithm untuk bayaran pelanggan dan baki
let baki = parseFloat($('#bakiPelanggan').val()); let baki = parseFloat($('#bakiPelanggan').val());
let bayaranpelanggan = parseFloat($('#duitPelanggan').val()); let bayaranpelanggan = parseFloat($('#duitPelanggan').val());