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

fix perludibayar dalam autotawarruq

Browse Source
This commit is contained in:
Hafifie PKB
2023-12-07 00:27:48 +08:00
parent cc48bf3565
commit a75918257f
1 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/penebusan/index.blade.php
+30 -7
View File
@@ -296,7 +296,7 @@
<b>PERLU DIBAYAR(RM)</b>
</div>
<div class="col-8">
<input type="text" id="perludibayartawarruq" class="form-control" readonly/>
<input type="text" id="perludibayartawarruq" style="font-weight:bold;" class="form-control" readonly/>
</div>
</div>
<div class="form-group row" id="divbayaranminima">
@@ -329,7 +329,7 @@
<b>PERLU DIBAYAR(RM)</b>
</div>
<div class="col-8">
<input type="text" id="perludibayar" onkeyup="bayarkey(this)" class="form-control" readonly/>
<input type="text" id="perludibayar" style="font-weight:bold;" onkeyup="bayarkey(this)" class="form-control" readonly/>
</div>
</div>
</div>
@@ -1006,7 +1006,7 @@
$('#divperludibayar').hide();
$('#divbayaran').hide();
$('#basic-addon2').text((percenthargasemasa > 80) ? '80.00' : percenthargasemasa);
$('#perludibayarAT').val(formatter.format(totalbayaran));
$('#calcbayar').val(totalbayaran);
@@ -2167,6 +2167,7 @@
}else if($('#sltjenistebus').find(":selected").val() == 'AT'){
let nilaimargin = $('#txtlebihanmargin').val();
var keuntungan = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
var pinjamasal = parseFloat($('#pinjamanasal').val().replace(/[^0-9.-]+/g,""));
@@ -2175,7 +2176,20 @@
var pinjaman_baru = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
let lebihanmargin = parseFloat((nilaimargin) ? nilaimargin : 0);
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',
title: 'Ralat Bayaran!',
text: 'Bayaran harus melebihi keuntungan dan jumlah lebihan margin'
});
event.preventDefault();
return false;
}
$.ajax({
method:'get',
@@ -3392,7 +3406,7 @@ function bayaranATfunc(e){
let pdbyr = 0;
let pembiayaanbaru = 0;
let upah = parseFloat($('#jumlahupah').val());
let lebihanmargin = parseFloat($('#txtlebihanmargin').val());
let lebihanmargin = parseFloat(($('#txtlebihanmargin').val()) ? $('#txtlebihanmargin').val() : 0);
total = upah + lebihanmargin;
let hargamarhun = parseFloat("{{ $nilaihargasemasa }}");
@@ -3415,7 +3429,8 @@ function bayaranATfunc(e){
}else{
// pdbyr = parseFloat(byr) + parseFloat(total);
// $('#perludibayarAT').val(pdbyr);
pembiayaanbaru = pembiayaan - parseFloat(byr);
let kumpul = parseFloat(byr) - total;
pembiayaanbaru = pembiayaan - kumpul;
totalpercent = (pembiayaanbaru / hargamarhun) * 100;
$('#pinjamanbaru').val(formatter.format(pembiayaanbaru));
@@ -3433,12 +3448,20 @@ function bayaranATfunc(e){
function blockbayaranAT(event){
let value = $(event).val();
let upah = parseFloat($('#jumlahupah').val());
let pembiayaan = parseFloat("{{ $pembiayaanbaru }}");
let hargamarhun = parseFloat("{{ $nilaihargasemasa }}");
totalpercent = (pembiayaan / hargamarhun) * 100;
let nilaimargin = $('#txtlebihanmargin').val();
let lebihanmargin = parseFloat((nilaimargin) ? nilaimargin : 0);
total = upah + lebihanmargin;
console.log(total,upah,lebihanmargin)
if(value == '' || value <= 0 || value < total){
$('#perludibayarAT').val(total);
$('#perludibayarAT').val(formatter.format(total));
$('#pinjamanbaru').val(formatter.format(pembiayaan));
$('#basic-addon2').text(formatter.format(totalpercent.toFixed(2)));
}
}