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

update

Browse Source
This commit is contained in:
afiq
2021-02-11 15:18:09 +08:00
parent 13cdd12a2b
commit 70b7bde6c0
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/customers/info.blade.php
+1
View File
@@ -923,6 +923,7 @@
method:'put', method:'put',
url:api_url + '/api/tebus/hapus/' + kodcaw + '/' + hapusidsudah, url:api_url + '/api/tebus/hapus/' + kodcaw + '/' + hapusidsudah,
success:function(data){ success:function(data){
console.log(data);
if(data != "Bukan-Tebus"){ if(data != "Bukan-Tebus"){
swalWithBootstrapButtons.fire( swalWithBootstrapButtons.fire(
'Hapus!', 'Hapus!',
resources/views/gadaian/index.blade.php
+17 -19
View File
@@ -145,7 +145,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form action="" id="maklumat_marhun" method="post"> <form action="" id="maklumat_marhun" method="post">
<div class="row"> <div class="row justify-content-center">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group row"> <div class="form-group row">
<input type="hidden" name="kodcaw" id="kodcaw" value=""> <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 class="col-md-8"><input class="form-control" type="text" name="jumlah_nilai_marhun" id="jumlah_nilai_marhun" readonly></div>
</div> </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>
<div class="modal-footer"> <div class="modal-footer">
<div class="form-group row"> <div class="form-group row">
<input class="btn btn-primary mr-2" type="button" name="tambah_marhun" id="tambah_marhun" value="Tambah"> <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_nilai_marhun = total_nilai_marhun + Number(marhun_detail['n_marhun']);
total_berat = total_berat + Number(marhun_detail['berat']); total_berat = total_berat + Number(marhun_detail['berat']);
marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] +","; marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] +",";
jumlah_nilai_marhun += Number(marhun_detail['n_marhun']);
tablemarhun.row.add([ tablemarhun.row.add([
counter, counter,
marhun_detail['recno'], marhun_detail['recno'],
@@ -358,6 +345,8 @@
counter = counter + 1; 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){ if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
kadarupah = 1.25/100; kadarupah = 1.25/100;
}else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){ }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
@@ -421,6 +410,7 @@
var berat_emas = $('#berat_emas').val(); var berat_emas = $('#berat_emas').val();
var harga = $('#harga').val(); var harga = $('#harga').val();
var nilaimarhun = $('#nilai_marhun').val(); var nilaimarhun = $('#nilai_marhun').val();
var bilangan_marhun_daftar = Number($('#bilangan_marhun').val());
var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,"")); var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,""));
var nota_array = $('#nota').val(); var nota_array = $('#nota').val();
if(nota_array != null){ if(nota_array != null){
@@ -460,7 +450,7 @@
event.preventDefault(); event.preventDefault();
return false; return false;
}else{ }else{
if(jumlah_marhun<10){ if(bilangan_marhun_daftar<10){
$.ajax({ $.ajax({
method:'POST', method:'POST',
url: api_url + '/api/marhun/'+kodcaw, url: api_url + '/api/marhun/'+kodcaw,
@@ -525,6 +515,7 @@
var berat_emas = $('#berat_emas').val(); var berat_emas = $('#berat_emas').val();
var harga = $('#harga').val(); var harga = $('#harga').val();
var nilaimarhun = $('#nilai_marhun').val(); var nilaimarhun = $('#nilai_marhun').val();
var bilangan_marhun_daftar = Number($('#bilangan_marhun').val());
var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,"")); var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,""));
var nota_array = $('#nota').val(); var nota_array = $('#nota').val();
console.log($.isNumeric(berat_emas)); console.log($.isNumeric(berat_emas));
@@ -561,7 +552,7 @@
event.preventDefault(); event.preventDefault();
return false; return false;
}else{ }else{
if(jumlah_marhun < 10){ if(bilangan_marhun_daftar < 10){
$.ajax({ $.ajax({
method:'POST', method:'POST',
url: api_url + '/api/marhun/'+kodcaw, url: api_url + '/api/marhun/'+kodcaw,
@@ -682,7 +673,7 @@
return false; return false;
} }
else{ else{
if(pinjaman > Number(pembiyaan_max_pelulus)+10){ if(pinjaman > Number(pembiyaan_max_pelulus)+10 || pinjaman > 10000){
const swalWithBootstrapButtons = Swal.mixin({ const swalWithBootstrapButtons = Swal.mixin({
customClass: { customClass: {
confirmButton: 'btn btn-success', confirmButton: 'btn btn-success',
@@ -691,9 +682,16 @@
buttonsStyling: false 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({ swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Daripada Operasi?', title: 'Dapatkan Pengesahan Daripada Operasi?',
text: "Tetapan margin melebihi 75% untuk Operasi!", text: errortext,
icon: 'info', icon: 'info',
showCancelButton: true, showCancelButton: true,
confirmButtonText: 'Setuju!', confirmButtonText: 'Setuju!',