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

Merged in new-onepercent (pull request #53)

Browse Source 
fix hapus auto tawarruq and add 2 decimal places in customer info
This commit is contained in:
Muhd hafifie
2023-12-30 06:30:27 +00:00
parent 10f2f4c6cd bca4a13ac7
commit 2e134df559
2 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/customers/v2/info.blade.php
+28 -19
View File
@@ -852,7 +852,7 @@
'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['tempoh'],
'RM '+ upahsemasa,
'RM '+ formatter.format(upahsemasa),
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
]).draw();
}else{
@@ -895,7 +895,7 @@
'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['tempoh'],
'RM '+ upahsemasa['pendapatan'],
'RM '+ formatter.format(upahsemasa['pendapatan']),
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
]).draw();
}
@@ -2217,23 +2217,32 @@
url: api_url + '/api/gadai/hapus/' + kodcaw + '/' + id,
data: { 'kodlaluan' : teller },
success:function(data){
$.ajax({
method:'put',
url: api_url + '/api/komuditi/batal',
dataType:'json',
data:{
norujukan: hapusid
},
success:function(batalkomuditi){
swalWithBootstrapButtons.fire(
'Hapus!',
'Maklumat gadaian telah dihapuskan.',
'success'
).then(function(){
location.reload();
});
}
})
swalWithBootstrapButtons.fire(
'Hapus!',
'Maklumat gadaian telah dihapuskan.',
'success'
).then(function(){
location.reload();
});
// $.ajax({
// method:'put',
// url: api_url + '/api/komuditi/batal',
// dataType:'json',
// data:{
// norujukan: hapusid
// },
// success:function(batalkomuditi){
// swalWithBootstrapButtons.fire(
// 'Hapus!',
// 'Maklumat gadaian telah dihapuskan.',
// 'success'
// ).then(function(){
// location.reload();
// });
// }
// })
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
resources/views/penebusan/v2/index.blade.php
+16 -15
View File
@@ -170,7 +170,7 @@
<div class="col-6 flex-column-reverse d-flex" id="divbakihargajualan">
<div class="form-group row">
<div class="col-4">
BAKI HARGA JUALAN(RM)
BAKI HARGA JUALAN (RM)
</div>
<div class="col-8">
<input type="text" id="bakihargajualan" value="{{ number_format($gadai['bakihargajualan'],2) }}" class="form-control" readonly/>
@@ -178,7 +178,7 @@
</div>
<div class="form-group row">
<div class="col-4">
BAKI PEMBIAYAAN(RM)
BAKI PEMBIAYAAN (RM)
</div>
<div class="col-8">
<input type="text" id="pinjaman" value="{{ number_format($gadai['bakipjm'],2) }}" class="form-control" readonly/>
@@ -189,7 +189,7 @@
<div class="col-6" id="divpembiayaanasal">
<div class="form-group row">
<div class="col-4">
PEMBIAYAAN ASAL(RM)
PEMBIAYAAN ASAL (RM)
</div>
<div class="col-8">
<input type="text" id="pinjamanasal" value="{{ number_format($gadai['pinjaman'],2) }}" class="form-control" readonly/>
@@ -197,7 +197,7 @@
</div>
<div class="form-group row" id="divbayarantawarruq">
<div class="col-4">
BAYARAN PEMBIAYAAN(RM)
BAYARAN PEMBIAYAAN (RM)
</div>
<div class="col-8">
<input type="text" id="bayarantawarruq" onkeyup="bayartawarruq(this)" placeholder="0.00" class="form-control"/>
@@ -283,7 +283,7 @@
<div class="form-group row" id="divtelahdibayar">
<div class="col-4">
TELAH DIBAYAR(RM)
TELAH DIBAYAR (RM)
</div>
<div class="col-8">
<input type="text" id="jumlahtelahdibayar" class="form-control" readonly/>
@@ -294,7 +294,7 @@
<div class="col-6">
<div class="form-group row" id="divperludibayarAT">
<div class="col-4">
<b>PERLU DIBAYAR(RM)</b>
<b>PERLU DIBAYAR (RM)</b>
</div>
<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/>
@@ -302,7 +302,7 @@
</div>
<div class="form-group row" id="divbayaran">
<div class="col-4">
<b>BAYARAN PELANGGAN(RM)</b>
<b>BAYARAN PELANGGAN (RM)</b>
</div>
<div class="col-8">
<input type="text" id="bayaran" onkeyup="bayartambahan(this)" placeholder="0.00" class="form-control" disabled/>
@@ -311,7 +311,7 @@
<fieldset class="scheduler-border">
<div class="form-group row" id="divduitPelanggan">
<div class="col-4">
<span>DUIT PELANGGAN(RM)</span>
<span>DUIT PELANGGAN (RM)</span>
</div>
<div class="col-8">
<input type="text" id="duitPelanggan" onkeyup="bayaranPelanggan(this)" placeholder="0.00" class="form-control"/>
@@ -328,7 +328,7 @@
</fieldset>
<div class="form-group row" id="divtambahpinjaman">
<div class="col-4">
TAMBAH PEMBIAYAAN(RM)
TAMBAH PEMBIAYAAN (RM)
</div>
<div class="col-4">
<input type="text" id="tambahpinjam" onkeyup="bayarpinjam(this)" placeholder="0.00" class="form-control"/>
@@ -339,7 +339,7 @@
</diV>
<div class="form-group row" id="divperludibayartawarruq">
<div class="col-4">
<b>PERLU DIBAYAR(RM)</b>
<b>PERLU DIBAYAR (RM)</b>
</div>
<div class="col-8">
<input type="text" id="perludibayartawarruq" style="font-weight:bold;" class="form-control" readonly/>
@@ -358,7 +358,7 @@
<div class="col-6" id="divbakipinjaman">
<div class="form-group row">
<div class="col-4">
<b>PEMBIAYAAN BARU(RM)</b>
<b>PEMBIAYAAN BARU (RM)</b>
</div>
<div class="col-8 input-group mb-2">
<input type="text" placeholder="0.00" id="bakipinjaman" class="form-control" readonly/>
@@ -372,7 +372,7 @@
<div class="col-6" id="divperludibayar">
<div class="form-group row">
<div class="col-4">
<b>PERLU DIBAYAR(RM)</b>
<b>PERLU DIBAYAR (RM)</b>
</div>
<div class="col-8">
<input type="text" id="perludibayar" style="font-weight:bold;" onkeyup="bayarkey(this)" class="form-control" readonly/>
@@ -385,7 +385,7 @@
<div class="form-group row">
<div class="col-4">
<span>PEMBIAYAAN BARU(RM)</span>
<span>PEMBIAYAAN BARU (RM)</span>
</div>
@php
if($gadai['bakipjm'] != 0){
@@ -435,7 +435,7 @@
<div class="col-6" id="divbayaranditerima">
<div class="form-group row">
<div class="col-4">
<b>BAYARAN DITERIMA(RM)</b>
<b>BAYARAN DITERIMA (RM)</b>
</div>
<div class="col-4">
<input type="text" id="bayaranditerima" class="form-control" readonly/>
@@ -2273,7 +2273,8 @@
var marginsemasa = (jenisAT == 'hargalama') ? pinjaman_baru/nm * 100 : pinjaman_baru/nmsemasa * 100;
let texting = (jenisAT != 'hargalama') ? 'Bayaran harus melebihi keuntungan dan jumlah lebihan margin' : 'Bayaran harus melebihi keuntungan';
if(parseFloat($('#perludibayarAT').val()) < parseFloat(total.toFixed(2))){
if(parseFloat($('#perludibayarAT').val().replace(/[^0-9.-]+/g,"")) < parseFloat(total.toFixed(2))){
Swal.fire({
icon: 'error',
title: 'Ralat Bayaran!',