This commit is contained in:
afiq
2021-02-13 15:14:48 +08:00
parent 70b7bde6c0
commit bb56ac1bbc
11 changed files with 133 additions and 130 deletions
+13 -22
View File
@@ -149,7 +149,7 @@
</div>
<div class="modal-body">
<form action="" id="maklumat_marhun" method="post">
<div class="row">
<div class="row justify-content-center">
<div class="col-md-6">
<div class="form-group row">
<input type="hidden" name="kodcaw" id="kodcaw" value="">
@@ -191,21 +191,7 @@
<div class="col-md-8"><input class="form-control" type="text" name="jumlah_nilai_marhun" id="jumlah_nilai_marhun" readonly></div>
</div>
</div>
<div class="col-md-6">
<div class="row">
<div class="col-md-12">
<img style="width:200px" src="{{ asset('img/logo_arrahn_baru.png') }}" alt="">
</div>
</div>
<div class="row">
<div class="form-group row" style="margin-right:auto;margin-left:auto">
<button class="btn btn-primary mr-2">KAMERA</button>
<button class="btn btn-primary">MUAT NAIK</button>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<div class="form-group row">
<input class="btn btn-primary mr-2" type="button" name="tambah_marhun" id="tambah_marhun" value="Tambah">
@@ -368,6 +354,7 @@
total_nilai_marhun = total_nilai_marhun + Number(marhun_detail['n_marhun']);
total_berat = total_berat + Number(marhun_detail['berat']);
marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] +",";
jumlah_nilai_marhun += Number(marhun_detail['n_marhun']);
tablemarhun.row.add([
counter,
marhun_detail['recno'],
@@ -379,12 +366,12 @@
marhun_detail['harga'],
"<div class='buttonpunya text-center'><button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button> <button onclick='deletemarhun(this)' class='btn btn-danger'><i class='fas fa-trash-alt'></i></button></div>"
]).draw();
count++;
counter = counter + 1;
});
});
$('#bilangan_marhun').val(formatter.format(counter-1));
$('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
if (count == 1){
$('.buttonpunya').html("<button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button>");
}
@@ -515,6 +502,7 @@
var berat_emas = $('#berat_emas').val();
var harga = $('#harga').val();
var nilaimarhun = $('#nilai_marhun').val();
var bilangan_marhun_daftar = Number($('#bilangan_marhun').val());
var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,""));
var nota_array = $('#nota').val();
if(nota_array != null){
@@ -554,7 +542,7 @@
event.preventDefault();
return false;
}else{
if(jumlah_marhun<10){
if(bilangan_marhun_daftar<10){
$.ajax({
method:'POST',
url: api_url + '/api/marhun/'+kodcaw,
@@ -619,6 +607,7 @@
var berat_emas = $('#berat_emas').val();
var harga = $('#harga').val();
var nilaimarhun = $('#nilai_marhun').val();
var bilangan_marhun_daftar = Number($('#bilangan_marhun').val());
var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,""));
var nota_array = $('#nota').val();
console.log($.isNumeric(berat_emas));
@@ -655,7 +644,7 @@
event.preventDefault();
return false;
}else{
if(jumlah_marhun < 10){
if(bilangan_marhun_daftar < 10){
$.ajax({
method:'POST',
url: api_url + '/api/marhun/'+kodcaw,
@@ -711,6 +700,7 @@
function verifyGadai(func){
$("#terima_gadai").prop('disabled', true);
var kodcaw = $('#kodcaw').val();
var nokp = $('#nokp').val();
var nopelanggan = $('#nopelanggan').val();
@@ -727,6 +717,7 @@
var max_pinjaman = nilai_marhun_total * 0.80;
if(pinjaman < min_pinjaman){
$("#terima_gadai").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Amaran!',
@@ -736,6 +727,7 @@
return false;
}
else if(pinjaman > max_pinjaman){
$("#terima_gadai").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Amaran!',
@@ -745,8 +737,7 @@
return false;
}
else{
if(pinjaman > Number(pembiyaan_max_pelulus)+10){
if(pinjaman > Number(pembiyaan_max_pelulus)+10 || pinjaman >=10000){
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
@@ -756,7 +747,7 @@
})
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Daripada Operasi?',
title: 'Dapatkan Pengesahan Operasi',
text: "Tetapan margin melebihi 75% untuk Operasi!",
icon: 'info',
showCancelButton: true,