diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 105678b..ef7a3da 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -4160,7 +4160,7 @@ class KhazanahController extends Controller
$upahsimpanxtra = $xtra['upahsimpan'];
$bakilelongxtra = $xtra['bakilelong'];
$utgterkumpulxtra = $xtra['untungrugiterkumpul'];
- $rugilelongxtra = -($xtra['kerugianlelong']);
+ $rugilelongxtra = -($xtra['kerugianlelong']);
}
//Terkumpul
diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php
index 79d14dc..64ff61a 100644
--- a/resources/views/khazanah/panjar.blade.php
+++ b/resources/views/khazanah/panjar.blade.php
@@ -212,6 +212,114 @@
}
+function kiraanpanjar(datakeyin)
+{
+ var idkey = $(datakeyin).attr('id');
+ var valkey = $(datakeyin).val();
+ var amount = 0;
+ let amountkiraan = 0;
+
+ var validate = parseFloat($(datakeyin).data('amaun'));
+
+ $.each(arrayambilan, function( index, arr ){
+ if(arr[0] == idkey)
+ {
+
+ arrayambilan[index][1] = totalamount(idkey,valkey);
+ }
+
+ amount += arr[1];
+ });
+
+ if(Number(valkey) > Number(validate))
+ {
+ Swal.fire({
+ icon: 'error',
+ title: 'Amaran',
+ text: 'Jumlah denominasi melebihi kadar'
+ });
+ $(datakeyin).val('');
+ }
+ else
+ {
+
+ $('#amaunkiraan').val(amount);
+
+ }
+
+ switch(idkey) {
+ case 'bundle1':
+ amountkiraan += (valkey * 100);
+ $('#totalb1').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'bundle20':
+ amountkiraan += (valkey * 1000);
+ $('#totalb20').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'bundle5':
+ amountkiraan += (valkey * 500);
+ $('#totalb5').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'bundle50':
+ amountkiraan += (valkey * 5000);
+ $('#totalb50').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'bundle10':
+ amountkiraan += (valkey * 1000);
+ $('#totalb10').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'bundle100':
+ amountkiraan += (valkey * 5000);
+ $('#totalb100').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'sen1':
+ amountkiraan += (valkey * 0.01);
+ $('#totalsen1').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'sen5':
+ amountkiraan += (valkey * 0.05);
+ $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'sen10':
+ amountkiraan += (valkey * 0.10);
+ $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'sen20':
+ amountkiraan += (valkey * 0.20);
+ $('#totalsen20').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'sen50':
+ amountkiraan += (valkey * 0.50);
+ $('#totalsen50').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'ringgit1':
+ amountkiraan += (valkey * 1);
+ $('#totalring1').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'ringgit5':
+ amountkiraan += (valkey * 5);
+ $('#totalring5').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'ringgit10':
+ amountkiraan += (valkey * 10);
+ $('#totalring10').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'ringgit20':
+ amountkiraan += (valkey * 20);
+ $('#totalring20').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'ringgit50':
+ amountkiraan += (valkey * 50);
+ $('#totalring50').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ case 'ringgit100':
+ amountkiraan += (valkey * 100);
+ $('#totalring100').val(formatter.format(amountkiraan.toFixed(2)));
+ break;
+ }
+
+}
+
function checkformpanjar(formdata)
{
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 380c22f..f672226 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -1367,7 +1367,7 @@
komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh";
}
- let jumpinjam = $('#bakipinjaman').val();
+ let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";
Swal.fire({
@@ -1641,7 +1641,7 @@
komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
}
- let jumpinjam = $('#hargapembiayaansemasa').val();
+ let jumpinjam = $('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";
Swal.fire({
@@ -1985,7 +1985,7 @@
komen = "Pembiayaan Melebihi RM 10,000|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
}
- let jumpinjam = $('#bakipinjaman').val();
+ let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";
Swal.fire({
@@ -2234,7 +2234,7 @@
sumberat += parseFloat(value);
});
- var jenistebus = $('#sltjenistebus').find(":selected").val();
+ var jenistebus = $('#sltjenistebus').find(":selected").val();
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
var jbg = "{{ $gadai['tempoh'] }}";
var kadarupah = "{{ $gadai['kadarupah'] }}";
@@ -2639,4 +2639,4 @@ function pembatalanbalik()
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/print/resittebussebelum.blade.php b/resources/views/print/resittebussebelum.blade.php
index 886915b..737529e 100644
--- a/resources/views/print/resittebussebelum.blade.php
+++ b/resources/views/print/resittebussebelum.blade.php
@@ -570,4 +570,4 @@ hr.new5 {
-
\ No newline at end of file
+
diff --git a/resources/views/print/suratgadaianhilang.blade.php b/resources/views/print/suratgadaianhilang.blade.php
index 72f6fb8..f5d44ea 100644
--- a/resources/views/print/suratgadaianhilang.blade.php
+++ b/resources/views/print/suratgadaianhilang.blade.php
@@ -28,12 +28,12 @@
@php
- $poskod = Http::get($api_url . '/api/poskod/' . $customers[0]['poskod'])->json();
+ $poskod = Http::get($api_url . '/api/poskod/' . $customers['poskod'])->json();
$negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
$daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
@endphp
-
Saya, {{ $customers[0]['nama'] }}, No. K/P : @php $satu = substr($gadai[0][0]['nokp'],0,6); $dua = substr($gadai[0][0]['nokp'],6,2);$ketiga = substr($gadai[0][0]['nokp'],8); echo $satu . '-' . $dua . '-' . $ketiga; @endphp yang beralamat di {{ strtoupper($customers[0]['alamat1']) . ', ' . $customers[0]['poskod'] . ', ' . strtoupper($daerah['namadaerah']) . ', ' . strtoupper($negeri['negeri']) }} dengan sesungguhnya dan sebenarnya mengaku bahawa: -
+Saya, {{ $customers['nama'] }}, No. K/P : @php $satu = substr($gadai[0][0]['nokp'],0,6); $dua = substr($gadai[0][0]['nokp'],6,2);$ketiga = substr($gadai[0][0]['nokp'],8); echo $satu . '-' . $dua . '-' . $ketiga; @endphp yang beralamat di {{ strtoupper($customers['alamat1']) . ', ' . $customers['poskod'] . ', ' . strtoupper($daerah['namadaerah']) . ', ' . strtoupper($negeri['negeri']) }} dengan sesungguhnya dan sebenarnya mengaku bahawa: -
Pesuruhjaya Sumpah
atau Notari Awam )