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

fix changes for taglelong and only have 0 and 5 for two decima places

Browse Source
This commit is contained in:
Hafifie PKB
2023-12-26 09:48:20 +08:00
parent 8e5dcab13c
commit 39b989c317
5 changed files with 3888 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/gadaian/v2/edit.blade.php
+1 -1
View File
@@ -502,7 +502,7 @@
var max_teller = total_nilai_marhun * (pinjaman_teller/100);
var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100);
$('#pembiayaan_max_teller').val(formatter.format(max_teller));
$('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus));
$('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus.toFixed(2)));
}
});
}
resources/views/gadaian/v2/index.blade.php
+49 -3
View File
@@ -136,7 +136,7 @@
Pembiayaan
</div>
<div class="col-7 input-group">
<input type="text" class="form-control" name="pinjaman" id="pinjaman">
<input type="text" class="form-control" onkeypress="return validateFloatKeyPress(this,event);" name="pinjaman" id="pinjaman">
<div class="input-group-append">
<span class="input-group-text span-pinjaman">0 %</span>
</div>
@@ -458,8 +458,8 @@
$('.span-pinjaman-max').text(formatter.format(pinjaman_teller) + ' %');
var max_teller = total_nilai_marhun * (pinjaman_teller/100);
var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100);
$('#pembiayaan_max_teller').val(formatter.format(max_teller));
$('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus));
$('#pembiayaan_max_teller').val(formatter.format(max_teller.toFixed(2)));
$('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus.toFixed(2)));
}
});
}
@@ -1243,5 +1243,51 @@
$('#nilaimarhun_edit').val(formatter.format(total));
}
function validateFloatKeyPress(el, evt) {
var charCode = (evt.which) ? evt.which : event.keyCode;
var number = el.value;
let keypress = evt.key;
// Split the current value by dot to check the number of decimal places
var numberParts = number.split('.');
// Check if the pressed key is a valid character for a floating-point number
if (charCode != 46 && charCode > 31 && (charCode < 48 || charCode > 57)) {
return false;
}
// Check if there is already a dot, and the pressed key is another dot
if (numberParts.length > 1 && charCode == 46) {
return false;
}
// Get the caret position in the input field
var caratPos = getSelectionStart(el);
// Get the position of the existing dot
var dotPos = el.value.indexOf(".");
// Check if the caret is after the existing dot, and there are more than 2 digits after the dot
if (caratPos > dotPos && dotPos > -1 && (numberParts[1] && numberParts[1].length > 1)) {
return false;
}
// If the last digit is not 5 or 0, disallow the input
if (numberParts[1] && numberParts[1].length === 1 && !['0', '5'].includes(keypress)) {
return false;
}
return true;
}
function getSelectionStart(o) {
if (o.createTextRange) {
var r = document.selection.createRange().duplicate()
r.moveEnd('character', o.value.length)
if (r.text == '') return o.value.length
return o.value.lastIndexOf(r.text)
} else return o.selectionStart
}
</script>
@endsection
resources/views/khazanah/laporan/index.blade.php
+16 -4
View File
@@ -12,13 +12,22 @@
</ol>
</nav>
@php
$auth_user = Auth::user();
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$version = $cawangan['version'];
@endphp
<div class="card-body text-center">
<div class="row form-group justify-content-center">
<div class="col-3 mx-1" >
<div class="row">
{{-- <a href="{{ route('laporan.gadaian') }}" class="btn btn-dark btn-lg btn-block mb-3">Gadaian</a> --}}
<a href="{{ route('laporan.gadaianujrah') }}" class="btn btn-dark btn-lg btn-block mb-3">Gadaian</a>
@if($version == 'v1')
<a href="{{ route('laporan.gadaian') }}" class="btn btn-dark btn-lg btn-block mb-3">Gadaian</a>
@else
<a href="{{ route('laporan.gadaianujrah') }}" class="btn btn-dark btn-lg btn-block mb-3">Gadaian</a>
@endif
</div>
<div class="row d-none">
{{-- <a href="{{ route('laporan.lelongan') }}" class="btn btn-dark btn-lg btn-block mb-3">Lelongan</a> --}}
@@ -54,8 +63,11 @@
</div>
<div class="col-3 mx-1">
<div class="row">
{{-- <a href="{{ route('laporan.tebus') }}" class="btn btn-dark btn-lg btn-block mb-3">Penebusan</a> --}}
<a href="{{ route('laporan.tebusujrah') }}" class="btn btn-dark btn-lg btn-block mb-3">Penebusan</a>
@if($version == 'v1')
<a href="{{ route('laporan.tebus') }}" class="btn btn-dark btn-lg btn-block mb-3">Penebusan</a>
@else
<a href="{{ route('laporan.tebusujrah') }}" class="btn btn-dark btn-lg btn-block mb-3">Penebusan</a>
@endif
</div>
<div class="row">
<a href="{{ route('laporan.kawalanstok') }}" class="btn btn-dark btn-lg btn-block mb-3">Kawalan Stok Produk</a>
resources/views/penebusan/v2/index.blade-backup.php
+3781
View File
File diff suppressed because it is too large Load Diff
resources/views/penebusan/v2/index.blade.php
+41 -2
View File
@@ -218,6 +218,7 @@
</div>
<div class="col-4">
SEBENAR
</div>
<div class="col-4">
@@ -228,6 +229,29 @@
</div>
</div>
@endif
@if($gadai['tagbaru'] == 1)
<div class="form-group row">
<div class="col-4">
</div>
<div class="col-4">
<span>UJRAH</span>
</div>
<div class="col-4">
<span>KEUNTUNGAN</span>
</div>
<div class="col-4">
REBET
</div>
<div class="col-4">
<input type="text" id="jumujrahrebet" class="form-control" readonly/>
</div>
<div class="col-4">
<input type="text" id="jumonepercentrebet" class="form-control" readonly/>
</div>
</div>
@endif
<div class="form-group row">
<div class="col-4">
JUMLAH PENDAPATAN
@@ -425,7 +449,7 @@
<div class="col-6" id="divjenisAT">
<button type="button" class="btn btn-danger" onclick="funcexcuse(false)">Batal</button>
</div>
@if($percent_hargaemassemasa > 80)
@if($percent_hargaemassemasa > 80 && $gadai['taglelong'] == 1)
<div class="col-6 divlebihanmargin">
<button type="button" class="btn btn-primary" onclick="funcexcuse(true)">EXCUSE</button>
</div>
@@ -587,6 +611,7 @@
$.ajax({
method:'GET',
url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
async:false,
data: {
'jeniskeuntungan' : jeniskeuntungan
},
@@ -607,12 +632,20 @@
$.ajax({
method:'GET',
url: api + '/api/upahrebettawarruq/' + kodcaw + '/' + norujukan,
async:false,
data: {
'jeniskeuntungan' : jeniskeuntungan
},
dataType: 'json',
success:function(data){
$('#bayaranditerima').val(data);
if(jeniskeuntungan == 'asal'){
$('#bayaranditerima').val(data);
}else{
let ujrah = Number($('#jumujrah').val());
let total = ujrah - data['ujrah'];
$('#jumujrahrebet').val(total.toFixed(2));
$('#jumonepercentrebet').val(data['keuntungan']);
}
}
});
@@ -2248,6 +2281,7 @@
}
var duitpelanggan = parseFloat($('#duitPelanggan').val().replace(/[^0-9.-]+/g,""));
if(isNaN(duitpelanggan)) duitpelanggan = 0;
if(Number(duitpelanggan) < parseFloat($('#perludibayarAT').val())){
Swal.fire('Amaran!','Duit Pelanggan haruslah diisi melebihi perlu dibayar!','error');
@@ -3458,6 +3492,11 @@ function validateFloatKeyPress(el, evt) {
return false;
}
// If the last digit is not 5 or 0, disallow the input
if (number[1] && number[1].length === 1 && !['0', '5'].includes(keypress)) {
return false;
}
return true;
}