Merged in finadev (pull request #70)

update minor changes at teller
This commit is contained in:
dev_kopkb
2024-01-07 01:25:56 +00:00
5 changed files with 50 additions and 12 deletions
+5 -5
View File
@@ -142,15 +142,15 @@
<button type="button" onclick="periksaalirantunai();" class="btn btn-primary float-right">Kemaskini</button>
<button type="button" onclick="cetaklaporanalirantunai()" class="btn btn-primary float-right mr-1">Peti Besi</button>
<button type="button" onclick="cetakserahankeseluruhan()" class="btn btn-primary float-right mr-1">Serahan</button>
<button type="button" onclick="cetaklaporanalirantunai()" class="btn btn-primary float-right mr-1">Aliran Tunai<i class='fas fa-print ml-2'></i></button>
<button type="button" onclick="cetakserahankeseluruhan()" class="btn btn-primary float-right mr-1">Serahan<i class='fas fa-print ml-2'></i></button>
<nav>
<div class="nav nav-tabs mb-4" id="nav-tab" role="tablist">
<a class="nav-item nav-link" id="nav-rekod-tab" data-toggle="tab" href="#nav-rekod" role="tab" aria-controls="nav-rekod" aria-selected="false">Rekod</a>
<a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-controls="nav-home" aria-selected="true">Tunai</a>
<a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-profile" role="tab" aria-controls="nav-profile" aria-selected="false">Gadai / Tebus</a>
<a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-controls="nav-contact" aria-selected="false">Tuntut Baki</a>
<a class="nav-item nav-link" id="nav-upah-tab" data-toggle="tab" href="#nav-upah" role="tab" aria-controls="nav-upah" aria-selected="false">Upah Lama</a>
{{-- <a class="nav-item nav-link" id="nav-upah-tab" data-toggle="tab" href="#nav-upah" role="tab" aria-controls="nav-upah" aria-selected="false">Upah Lama</a> --}}
</div>
</nav>
<div class="tab-content" id="nav-tabContent">
@@ -239,7 +239,7 @@
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>Pinjaman (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Nilai Marhun (RM)</th>
<th>Jenis Transaksi</th>
</tr>
@@ -273,7 +273,7 @@
<th>Bil</th>
<th>Tarikh</th>
<th>Caj Lelong (RM)</th>
<th>Jumlah (RM)</th>
<th>Baki Lelong (RM)</th>
<th>Jenis</th>
</tr>
</thead>
+2 -2
View File
@@ -398,7 +398,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
</div>
</div>
</div>
@@ -438,7 +438,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
</div>
</div>
</div>
+2 -2
View File
@@ -96,7 +96,7 @@
<div class="col-md-5">
<div class="form-group row">
<div class="col-5">
Pembiayaan Max
Pembiayaan Maks
</div>
<div class="col-7 input-group">
<input type="text" style="height:50px !important" class="form-control" readonly name="pembiayaan_max_teller" id="pembiayaan_max_teller">
@@ -166,7 +166,7 @@
<div class="col-5">
<div class="form-group row">
<div class="col-md-5">
Pembiayaan Max Pelulus
Pembiayaan Maks Pelulus
</div>
<div class="col-md-7 input-group">
<input type="text" class="form-control" readonly name="pembiyaan_max_pelulus" id="pembiyaan_max_pelulus">
+2 -2
View File
@@ -18,7 +18,7 @@
<table class="table table-striped table-bordered table-hover">
<thead class="thead-dark">
<tr>
<th>Bil</th>
{{-- <th>Bil</th> --}}
<th>Mutu Emas</th>
<th>Karat</th>
<th>Harga/Gram</th>
@@ -27,7 +27,7 @@
<tbody>
@foreach($harga_emas as $harga)
<tr>
<td>{{ $harga['recno'] }}</td>
{{-- <td>{{ $harga['recno'] }}</td> --}}
<td>{{ $harga['keterangan'] }}</td>
<td>{{ $harga['karat'] }}</td>
<td>{{ number_format($harga['harga'],2) }}</td>
+39 -1
View File
@@ -310,7 +310,7 @@
<span>DUIT PELANGGAN (RM)</span>
</div>
<div class="col-8">
<input type="text" id="duitPelanggan" onkeyup="bayaranPelanggan(this)" placeholder="0.00" class="form-control"/>
<input type="text" id="duitPelanggan" onkeyup="bayaranPelanggan(this)" onpaste="return false;" ondrop="return false;" onkeypress="return validateFloatKeyPressDuitPelanggan(this,event);" placeholder="0.00" class="form-control"/>
</div>
</div>
<div class="form-group row" id="divbakiPelanggan">
@@ -3545,6 +3545,44 @@ function validateFloatKeyPressAT(el, evt) {
return true;
}
function validateFloatKeyPressDuitPelanggan(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()