diff --git a/resources/views/gadaian/v2/edit.blade.php b/resources/views/gadaian/v2/edit.blade.php index 312a42b..cd955cb 100644 --- a/resources/views/gadaian/v2/edit.blade.php +++ b/resources/views/gadaian/v2/edit.blade.php @@ -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))); } }); } diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php index 4d3daa6..f2418ee 100644 --- a/resources/views/gadaian/v2/index.blade.php +++ b/resources/views/gadaian/v2/index.blade.php @@ -136,7 +136,7 @@ Pembiayaan
- +
0 %
@@ -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 + } + @endsection diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index e033d5c..5e13029 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -12,13 +12,22 @@ + @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 +
- {{-- Gadaian --}} - Gadaian + @if($version == 'v1') + Gadaian + @else + Gadaian + @endif
{{-- Lelongan --}} @@ -54,8 +63,11 @@
- {{-- Penebusan --}} - Penebusan + @if($version == 'v1') + Penebusan + @else + Penebusan + @endif
Kawalan Stok Produk diff --git a/resources/views/penebusan/v2/index.blade-backup.php b/resources/views/penebusan/v2/index.blade-backup.php new file mode 100644 index 0000000..74c833c --- /dev/null +++ b/resources/views/penebusan/v2/index.blade-backup.php @@ -0,0 +1,3781 @@ +@extends('layouts.app') +@section('content') +@include('modal.historybayaran') +@include('modal.wakil') + + +
+
+
+ + + +
+ +
+
+
+ NAMA +
+
+ +
+
+
+
+
+
+ NO PELANGGGAN +
+
+ +
+
+
+
+
+
+ NO RUJUKAN +
+
+ +
+
+
+
+
+
+ NO KAD PENGENALAN +
+
+ +
+
+
+
+
+
+ JENIS TEBUS +
+
+ +
+
+
+
+
+
+ WAKIL +
+
+ +
+
+ +
+
+
+ +
+
+
+ TEMPOH +
+
+ +
+
+
+ +
+ +
+
+ + + + + + + + + + + + + + + @php $count = 0; @endphp + @foreach ($marhun as $index=>$m) + + @php + $karatbaru = str_replace('.','-',$m['karat']); + $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $hargaemassemasa = floatval($hargabaru['harga']) * floatval($m['berat']); + @endphp + + @php + $marhunperibadi = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/jemas/nama_marhun/',["marhun" => $m['marhun']])->json(); + @endphp + + + + + + + + + @php $count++; @endphp + @endforeach + + + + + + + + + +
BilMarhunN. MarhunN. Marhun SemasaBerat/gramKaratHargaHarga Semasa
{{ $index+1 }}{{ $marhunperibadi['descpt'] }}RM {{ number_format($m['n_marhun'],2) }}@php + echo "RM " . number_format($hargaemassemasa,2); + @endphp{{ $m['berat'] }}{{ $m['karat'] }}RM {{ $m['harga'] }}RM {{ number_format(floatval($hargabaru['harga']),2) }} @php if($m['harga'] > $hargabaru['harga']) echo ''; if($m['harga'] < $hargabaru['harga']) echo ''; + if($m['harga'] === $hargabaru['harga']) echo ''; + + @endphp
JUMLAHRM {{ number_format($gadai['nilaimarhun'],2) }}RM {{ number_format($nilaihargasemasa,2) }}{{ number_format($gadai['berat'],2) }}
+
+
+
+
+
+ + +
+
+
+
+ +
+
+
+ BAKI HARGA JUALAN(RM) +
+
+ +
+
+
+
+ BAKI PEMBIAYAAN(RM) +
+
+ +
+
+
+ +
+
+
+ PERLU DIBAYAR(RM) +
+
+ +
+
+
+ +
+ +
+ + +
+ @if($gadai['tagbaru'] == 1) +
+
+
+
+ UJRAH +
+
+ KEUNTUNGAN +
+ +
+ SEBENAR +
+ +
+ +
+
+ +
+
+ @endif + @if($gadai['tagbaru'] == 1) +
+
+
+
+ UJRAH +
+
+ KEUNTUNGAN +
+ +
+ REBET +
+ +
+ +
+
+ +
+
+ @endif +
+
+ JUMLAH PENDAPATAN +
+
+ +
+
+ + +
+
+ TELAH DIBAYAR(RM) +
+
+ +
+
+
+ +
+
+ + +
+
+ +
+ +
+
+
+ BAKI HARGA JUALAN(RM) +
+
+ +
+
+
+
+ BAKI PEMBIAYAAN(RM) +
+
+ +
+
+
+ +
+ + +
+ @if($gadai['tagbaru'] == 1) +
+
+
+
+ UJRAH +
+
+ KEUNTUNGAN +
+ +
+ SEBENAR +
+ +
+ +
+
+ +
+
+ @endif + @if($gadai['tagbaru'] == 1) +
+
+
+
+ UJRAH +
+
+ KEUNTUNGAN +
+ +
+ REBET +
+ +
+ +
+
+ +
+
+ @endif +
+
+ JUMLAH PENDAPATAN +
+
+ +
+
+ + +
+
+ TELAH DIBAYAR(RM) +
+
+ +
+
+
+ +
+
+
+ + +
+ +
+
+
+ BAKI HARGA JUALAN(RM) +
+
+ +
+
+
+
+ BAKI PEMBIAYAAN(RM) +
+
+ +
+
+
+ +
+
+ PEMBIAYAAN H. ASAL (RM) +
+ @php + if($gadai['bakipjm'] != 0){ + $bakipjm = $gadai['bakipjm']; + }else{ + $bakipjm = $gadai['pinjaman']; + } + $percent_asal = ($bakipjm / $gadai['nilaimarhun']) * 100; + @endphp +
+ +
+ {{ number_format($percent_asal,2) }} +
+
+
+ +
+
+
+ PEMBIAYAAN ASAL(RM) +
+
+ +
+
+
+
+ BAYARAN PEMBIAYAAN(RM) +
+
+ +
+
+
+ +
+
+ PERLU DIBAYAR(RM) +
+
+ +
+
+
+
+ BAYARAN PELANGGAN(RM) +
+
+ +
+
+ +
+ +
+
+ PEMBIAYAAN BARU(RM) +
+ @php + if($gadai['bakipjm'] != 0){ + $bakipjm = $gadai['bakipjm']; + }else{ + $bakipjm = $gadai['pinjaman']; + } + $percent_hargaemassemasa = ($bakipjm / $nilaihargasemasa) * 100; + + $percentage = 80 / 100; + $pembiayaanbaru = $nilaihargasemasa * (80/100); + $rounded_value = round($nilaihargasemasa * $percentage, 1, PHP_ROUND_HALF_UP); + $rounded_value = (($rounded_value-$pembiayaanbaru) > 0) ? $rounded_value - 0.1 : $rounded_value; + $pembiayaanbaru = min($pembiayaanbaru, $rounded_value); + $bayaranlebihan = $bakipjm - $pembiayaanbaru; + + $pembiayaanbaru = ($percent_hargaemassemasa > 80) ? $pembiayaanbaru : $bakipjm; + @endphp +
+ +
+ {{ number_format($percent_hargaemassemasa,2) }} + @if($percent_hargaemassemasa > 80) + {{ number_format($percent_hargaemassemasa,2) }} + @endif +
+
+
+ + @if($percent_hargaemassemasa > 80) +
+
+ BAYARAN LEBIHAN MARGIN +
+
+ +
+ {{ round($percent_hargaemassemasa - 80,2) }} +
+
+
+ @endif +
+ + +
+
+ + + + + + +
+ + + + + + +
+ +
+
+
+ DUIT PELANGGAN(RM) +
+
+ +
+
+
+
+ BAKI (RM) +
+
+ +
+
+
+ + +
+
+ TAMBAH PEMBIAYAAN(RM) +
+
+ +
+
+ +
+
+
+
+ PERLU DIBAYAR(RM) +
+
+ +
+
+
+
+ BAYARAN MINIMA +
+
+ +
+
+
+ +
+
+
+ PEMBIAYAAN BARU(RM) +
+
+ +
+ +
+
+
+
+ + + + + +
+
+
+ BAYARAN DITERIMA(RM) +
+
+ +
+
+
+ + +
+ @if($gadai['tagbaru'] == 0) +
+ +
+ @if($percent_hargaemassemasa > 80 && $gadai['taglelong'] == 1) +
+ +
+
+
+ @else +
+ +
+ @endif + @else +
+ +
+ @endif +
+ + +
+
+
+
+
+
+
+
+
+ + +@endsection diff --git a/resources/views/penebusan/v2/index.blade.php b/resources/views/penebusan/v2/index.blade.php index e5fd27b..14b0789 100644 --- a/resources/views/penebusan/v2/index.blade.php +++ b/resources/views/penebusan/v2/index.blade.php @@ -218,6 +218,7 @@
+ SEBENAR
@@ -228,6 +229,29 @@
@endif + @if($gadai['tagbaru'] == 1) +
+
+
+
+ UJRAH +
+
+ KEUNTUNGAN +
+ +
+ REBET +
+ +
+ +
+
+ +
+
+ @endif
JUMLAH PENDAPATAN @@ -425,7 +449,7 @@
- @if($percent_hargaemassemasa > 80) + @if($percent_hargaemassemasa > 80 && $gadai['taglelong'] == 1)
@@ -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; }