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

Merged in fix-berat (pull request #188)

Browse Source 
fix edit nota edit kuantiti
This commit is contained in:
Muhd hafifie
2024-10-07 13:43:22 +00:00
parent 6dd644d40a f8affec82b
commit 39f9a8a31c
3 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/gadaian/v2/edit.blade.php
+22 -4
View File
@@ -685,7 +685,7 @@
let karat = recno[4];
let berat = recno[5];
let harga = recno[8];
let nota = recno[6];
let nota = recno[7];
let tag_permata_edit = recno[8];
let beratpermata = recno[10];
let kuantiti = recno[6];
@@ -694,8 +694,14 @@
if(jenismarhun == 'G/B' || jenismarhun == 'WFR' || jenismarhun == 'SYE' || jenismarhun == 'DNR'){
$('#kuantiti_modal').attr('disabled', false);
$(".div_kuantiti_edit").css("display", "block");
$(".div_column_kuantiti_edit").css("display", "block");
$('#kuantiti_edit').val(kuantiti);
}else{
$('#kuantiti_modal').attr('disabled', true);
$('#kuantiti_modal').attr('disabled', false);
$(".div_kuantiti_edit").css("display", "none");
$(".div_column_kuantiti_edit").css("display", "none");
$('#kuantiti_edit').val(1);
}
if (!arrayBatuPermata.includes(jenismarhun)) {
@@ -725,7 +731,7 @@
$("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
$('#nota_edit').val(res).trigger('change');
$('#kuantiti_modal').val(kuantiti);
$('#kuantiti_edit').val(kuantiti);
$('#sltkarat').val(karat);
$('#marhun_edit').val(jenismarhun);
@@ -794,7 +800,7 @@
var harga_edit = $('#harga_edit').val();
var nilaimarhun_edit = $('#nilaimarhun_edit').val();
var nilai_marhun_edit = Number(nilaimarhun_edit.replace(/[^0-9.-]+/g,""));
var kuantiti = $('#kuantiti_modal').val();
var kuantiti = $('#kuantiti_edit').val();
if(nota_edit != null){
var nota = nota_edit.toString();
@@ -802,6 +808,18 @@
var nota = '';
}
if(kuantiti > 10)
{
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Kuantiti tidak boleh melebihi 10'
});
event.preventDefault();
return false;
}
var resultValidation = validateBatuPermata(tagpermata_edit, beratpermata_edit);
if(resultValidation == false) {
return false;
resources/views/gadaian/v2/index.blade.php
+22 -4
View File
@@ -1600,7 +1600,7 @@
let karat = recno[4];
let berat = recno[5];
let harga = recno[8];
let nota = recno[6];
let nota = recno[7];
let tag_permata_edit = recno[8];
let beratpermata = recno[10];
let kuantiti = recno[6];
@@ -1609,8 +1609,14 @@
if(jenismarhun == 'G/B' || jenismarhun == 'WFR' || jenismarhun == 'SYE' || jenismarhun == 'DNR'){
$('#kuantiti_modal').attr('disabled', false);
$(".div_kuantiti_edit").css("display", "block");
$(".div_column_kuantiti_edit").css("display", "block");
$('#kuantiti_edit').val(kuantiti);
}else{
$('#kuantiti_modal').attr('disabled', true);
$('#kuantiti_modal').attr('disabled', false);
$(".div_kuantiti_edit").css("display", "none");
$(".div_column_kuantiti_edit").css("display", "none");
$('#kuantiti_edit').val(1);
}
if (!arrayBatuPermata.includes(jenismarhun)) {
@@ -1639,7 +1645,7 @@
$("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
$('#nota_edit').val(res).trigger('change');
$('#kuantiti_modal').val(kuantiti);
$('#kuantiti_edit').val(kuantiti);
$('#sltkarat').val(karat);
$('#marhun_edit').val(jenismarhun);
@@ -1668,7 +1674,7 @@
var harga_edit = $('#harga_edit').val();
var nilaimarhun_edit = $('#nilaimarhun_edit').val();
var nilai_marhun_edit = Number(nilaimarhun_edit.replace(/[^0-9.-]+/g,""));
var kuantiti = $('#kuantiti_modal').val();
var kuantiti = $('#kuantiti_edit').val();
if(nota_edit != null){
var nota = nota_edit.toString();
@@ -1676,6 +1682,18 @@
var nota = '';
}
if(kuantiti > 10)
{
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Kuantiti tidak boleh melebihi 10'
});
event.preventDefault();
return false;
}
var resultValidation = validateBatuPermata(tagpermata_edit, beratpermata_edit);
if(resultValidation == false) {
return false;
resources/views/modal/editmarhun.blade.php
+4
View File
@@ -50,6 +50,10 @@
</div>
<div class="col-md-8 col_edit_permata div_anggaran_edit">Anggaran Berat Permata</div>
<div class="col-md-4 mb-2 col_edit_permata div_anggaran_edit"><input class="form-control" type="text" name="beratpermataedit" id="beratpermataedit" autocomplete="off"></div>
<div class="col-md-4 div_kuantiti_edit">Kuantiti</div>
<div class="col-md-8 div_column_kuantiti_edit">
<input class="form-control" name="kuantiti_edit" id="kuantiti_edit" type="text" pattern="\d*" maxlength="2">
</div>
<div class="col-md-4">Karat</div>
<div class="col-md-8">
<select name="sltkarat" id="sltkarat" class="form-control">