update
This commit is contained in:
@@ -923,6 +923,7 @@
|
||||
method:'put',
|
||||
url:api_url + '/api/tebus/hapus/' + kodcaw + '/' + hapusidsudah,
|
||||
success:function(data){
|
||||
console.log(data);
|
||||
if(data != "Bukan-Tebus"){
|
||||
swalWithBootstrapButtons.fire(
|
||||
'Hapus!',
|
||||
|
||||
@@ -145,7 +145,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="">
|
||||
@@ -187,21 +187,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">
|
||||
@@ -344,6 +330,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'],
|
||||
@@ -358,6 +345,8 @@
|
||||
counter = counter + 1;
|
||||
});
|
||||
});
|
||||
$('#bilangan_marhun').val(formatter.format(counter-1));
|
||||
$('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
|
||||
if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
|
||||
kadarupah = 1.25/100;
|
||||
}else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
|
||||
@@ -421,6 +410,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){
|
||||
@@ -460,7 +450,7 @@
|
||||
event.preventDefault();
|
||||
return false;
|
||||
}else{
|
||||
if(jumlah_marhun<10){
|
||||
if(bilangan_marhun_daftar<10){
|
||||
$.ajax({
|
||||
method:'POST',
|
||||
url: api_url + '/api/marhun/'+kodcaw,
|
||||
@@ -525,6 +515,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));
|
||||
@@ -561,7 +552,7 @@
|
||||
event.preventDefault();
|
||||
return false;
|
||||
}else{
|
||||
if(jumlah_marhun < 10){
|
||||
if(bilangan_marhun_daftar < 10){
|
||||
$.ajax({
|
||||
method:'POST',
|
||||
url: api_url + '/api/marhun/'+kodcaw,
|
||||
@@ -682,7 +673,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',
|
||||
@@ -691,9 +682,16 @@
|
||||
buttonsStyling: false
|
||||
});
|
||||
|
||||
if(pinjaman > Number(pembiyaan_max_pelulus)+10){
|
||||
var errortext = "Tetapan margin melebihi 75% untuk Operasi!";
|
||||
}
|
||||
if(pinjaman > 10000){
|
||||
var errortext = "Pinjaman Melebihi 10000";
|
||||
}
|
||||
|
||||
swalWithBootstrapButtons.fire({
|
||||
title: 'Dapatkan Pengesahan Daripada Operasi?',
|
||||
text: "Tetapan margin melebihi 75% untuk Operasi!",
|
||||
text: errortext,
|
||||
icon: 'info',
|
||||
showCancelButton: true,
|
||||
confirmButtonText: 'Setuju!',
|
||||
|
||||
Reference in New Issue
Block a user