diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 5bf00dd..e4ac06a 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -4067,6 +4067,7 @@ class KhazanahController extends Controller $upahsimpanxtra = $xtra['upahsimpan']; $bakilelongxtra = $xtra['bakilelong']; $utgterkumpulxtra = $xtra['untungrugiterkumpul']; + $rugilelongxtra = -($xtra['kerugianlelong']); } //Terkumpul @@ -4114,7 +4115,7 @@ class KhazanahController extends Controller if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]); if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]); if($bakilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]); - if($rugilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]); + if($rugilelongxtra != 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]); if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]); if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]); if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]); diff --git a/public/js/main.js b/public/js/main.js index d422400..8137f25 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -227,7 +227,7 @@ function kiraan(datakeyin) $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2))); break; case 'sen10': - amountkiraan += (valkey * 0.05); + amountkiraan += (valkey * 0.10); $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2))); break; case 'sen20': @@ -335,7 +335,7 @@ function kiraanpanjar(datakeyin) $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2))); break; case 'sen10': - amountkiraan += (valkey * 0.05); + amountkiraan += (valkey * 0.10); $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2))); break; case 'sen20': diff --git a/resources/views/homepage/penilai/home.blade.php.save b/resources/views/homepage/penilai/home.blade.php.save new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/homepage/penilai/home.blade.php.save.1 b/resources/views/homepage/penilai/home.blade.php.save.1 new file mode 100644 index 0000000..f5fc33d --- /dev/null +++ b/resources/views/homepage/penilai/home.blade.php.save.1 @@ -0,0 +1,563 @@ +@extends('layouts.app') +@section('content') + + + + + +
+
+
+
+ + + + +
+ +
+
+ + + + + + + + + + + + + + @php $count=1; @endphp + @if (is_array($gadaian_semasa) || is_object($gadaian_semasa)) + @foreach($gadaian_semasa as $index=>$gadaian) + + + + + + + + + + @php $count++; @endphp + @endforeach + @endif + +
BilNamaNo KPNo RujukanPembiayaan (RM)Nilai Marhun (RM)Berat (g)
{{ $count }} + @php + $customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json(); + echo ($customer_info[0]['nama']); + @endphp + {{ $gadaian['nokp'] }} + @php + $marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json(); + @endphp + {{$gadaian['norujukan']}} + {{ number_format($gadaian['pinjaman'],2) }}{{ number_format($gadaian['nilaimarhun'],2) }}{{ number_format($gadaian['berat'],2) }}
+
+
+
+ + +
+ + + + + + + + + + + + + + @php $count=1; @endphp + @if (is_array($gadaian_belumserah) || is_object($gadaian_belumserah)) + @foreach($gadaian_belumserah as $index=>$gadaian) + + @php + $customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json(); + @endphp + + + + + + + + + @php $count++; @endphp + @endforeach + @endif + +
BilNamaNo KPNo RujukanPembiayaan (RM)Nilai Marhun (RM)Berat (g)
{{ $customer_info[0]['nama'] }}{{ $gadaian['nokp'] }} + @php + $marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json(); + @endphp + {{$gadaian['norujukan']}} + {{ number_format($gadaian['pinjaman'],2) }}{{ number_format($gadaian['nilaimarhun'],2) }}{{ number_format($gadaian['berat'],2) }}
+
+
+ Jumlah Nilai Marhun Dipilih +
+ +
+
+ @csrf + + +
+
+
+
+
+
+
+
+
+
+
Tarikh
+
+
+
+
+ + + + + + + + + + + + +
BilNamaNo KPNo RujukanPembiayaan (RM)Nilai Marhun (RM)Berat (g)
+
+
+
+
+
+
+
+
+
+ +@endsection 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 120258e..529b4d3 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,6 +2234,7 @@ sumberat += parseFloat(value); }); + var jenistebus = $('#sltjenistebus').find(":selected").val(); var nopelanggan = "{{ $gadai['nopelanggan'] }}"; var jbg = "{{ $gadai['tempoh'] }}"; var kadarupah = "{{ $gadai['kadarupah'] }}"; @@ -2273,7 +2274,7 @@ //yang lama "norujukan" : norujukan, "nopelanggan" : nopelanggan, - "jenistebus" : jenisbayarantebus, + "jenistebus" : jenistebus, "jbg" : jbg, "kadarupah" : kadarupah, "nilai_marhun" : nilai_marhun_lama, @@ -2638,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 71b07fb..737529e 100644 --- a/resources/views/print/resittebussebelum.blade.php +++ b/resources/views/print/resittebussebelum.blade.php @@ -414,7 +414,7 @@ hr.new5 { -No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['jbg'] }} +No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['tempoh'] }} @@ -506,7 +506,7 @@ hr.new5 { -No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['jbg'] }} +No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['tempoh'] }} @@ -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: -

  1. Surat Gadaian Ar-Rahn Cawangan @php $namacawangan = substr($cawangan_detail['namacaw'],7); $rendoh = strtolower($namacawangan);echo ucwords($rendoh); @endphp kepunyaan saya telah hilang dalam simpanan @php if(strtoupper($polis[0]['komen1']) == 'SIMPANAN') { echo '.'; }else{ echo 'kerana ' . $polis[0]['komen1'] . '.'; } @endphp Saya telah sedaya upaya berusaha mencari surat tersebut tetapi gagal menemuinya. Saya juga mengaku bahawa tidak pernah menjual atau menggadai surat tersebut kepada mana-mana institusi kewangan.
    2. @@ -77,7 +77,7 @@ - {{ $customers[0]['nama'] }} + {{ $customers['nama'] }} ) ........................................................ @@ -112,4 +112,4 @@

    Pesuruhjaya Sumpah

    atau Notari Awam )

    - \ No newline at end of file +