Merged in new-onepercent (pull request #55)
fix labeling in penebusan page
This commit is contained in:
@@ -237,7 +237,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-4">
|
<div class="col-4">
|
||||||
REBET
|
REBAT
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-4">
|
<div class="col-4">
|
||||||
@@ -250,7 +250,7 @@
|
|||||||
@endif
|
@endif
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<div class="col-4">
|
<div class="col-4">
|
||||||
JUMLAH PENDAPATAN
|
@if($gadai['tagbaru'] == 1) JUM UNTUNG DAN UJRAH @else JUMLAH KEUNTUNGAN @endif
|
||||||
</div>
|
</div>
|
||||||
<div class="col-8">
|
<div class="col-8">
|
||||||
<input type="text" id="jumlahupah" class="form-control" readonly/>
|
<input type="text" id="jumlahupah" class="form-control" readonly/>
|
||||||
@@ -290,7 +290,7 @@
|
|||||||
<div class="col-6">
|
<div class="col-6">
|
||||||
<div class="form-group row" id="divperludibayarAT">
|
<div class="form-group row" id="divperludibayarAT">
|
||||||
<div class="col-4">
|
<div class="col-4">
|
||||||
<b>PERLU DIBAYAR (RM)</b>
|
<b>BAYARAN PELANGGAN (RM)</b>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-8">
|
<div class="col-8">
|
||||||
<input type="text" id="perludibayarAT" style="font-weight:bold;" class="form-control" onselectstart="return false;" onkeyup="bayaranATfunc(this)" onkeypress="return validateFloatKeyPress(this,event);" onchange="blockbayaranAT(this)" readonly/>
|
<input type="text" id="perludibayarAT" style="font-weight:bold;" class="form-control" onselectstart="return false;" onkeyup="bayaranATfunc(this)" onkeypress="return validateFloatKeyPress(this,event);" onchange="blockbayaranAT(this)" readonly/>
|
||||||
@@ -948,6 +948,7 @@
|
|||||||
$("#divbayaranminima").hide();
|
$("#divbayaranminima").hide();
|
||||||
$('.divlebihanmargin').hide();
|
$('.divlebihanmargin').hide();
|
||||||
$('#divjenisAT').hide();
|
$('#divjenisAT').hide();
|
||||||
|
$('#divperludibayarAT').hide();
|
||||||
|
|
||||||
$('#bayaran').val(formatter.format(jumupah));
|
$('#bayaran').val(formatter.format(jumupah));
|
||||||
|
|
||||||
@@ -3573,6 +3574,20 @@ function blockbayaranAT(event){
|
|||||||
total = (jenisAT != 'hargalama') ? (upah + lebihanmargin) : upah;
|
total = (jenisAT != 'hargalama') ? (upah + lebihanmargin) : upah;
|
||||||
|
|
||||||
if(value == '' || value <= 0 || value < total){
|
if(value == '' || value <= 0 || value < total){
|
||||||
|
if(value == '' || value <= 0){
|
||||||
|
Swal.fire(
|
||||||
|
'Tidak Berjaya!',
|
||||||
|
'Bayaran Tidak boleh ditinggalkan Kosong!',
|
||||||
|
'error'
|
||||||
|
);
|
||||||
|
}else if(value < total){
|
||||||
|
Swal.fire(
|
||||||
|
'Tidak Berjaya!',
|
||||||
|
'Bayaran Tidak boleh kurang daripada RM' + formatter.format(total) + '!',
|
||||||
|
'error'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if(jenisAT != 'hargalama'){
|
if(jenisAT != 'hargalama'){
|
||||||
$('#perludibayarAT').val(formatter.format(total));
|
$('#perludibayarAT').val(formatter.format(total));
|
||||||
$('#pinjamanbaru').val(formatter.format(pembiayaan));
|
$('#pinjamanbaru').val(formatter.format(pembiayaan));
|
||||||
|
|||||||
Reference in New Issue
Block a user