From 068ce8857955668904fbb3981a7068fa72ab4e06 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 28 Mar 2021 16:47:06 +0800 Subject: [PATCH] hari ini --- app/Http/Controllers/GadaianController.php | 4 +- app/Http/Controllers/KhazanahController.php | 53 +++-- public/js/main.js | 16 +- resources/views/aliran_tunai/index.blade.php | 8 +- resources/views/customers/info.blade.php | 2 +- resources/views/gadaian/edit.blade.php | 4 +- resources/views/gadaian/index.blade.php | 4 +- .../views/homepage/khazanah/home.blade.php | 85 ++++--- .../views/khazanah/alirantunai.blade.php | 223 +++++++++--------- resources/views/khazanah/gadaian.blade.php | 2 +- .../views/khazanah/khazanahserahan.blade.php | 62 +++-- .../laporan/marhunterkumpul.blade.php | 26 +- .../views/khazanah/pendahuluanserah.blade.php | 32 +-- .../khazanah/pendahuluanserahanmain.blade.php | 32 ++- resources/views/khazanah/serahan.blade.php | 1 + resources/views/khazanah/tebus.blade.php | 2 +- resources/views/layouts/app.blade.php | 4 +- resources/views/layouts/app_operasi.blade.php | 6 +- resources/views/lelongan/index.blade.php | 2 +- ...enominasimodalpendahuluanserahan.blade.php | 68 +++++- resources/views/penebusan/index.blade.php | 4 +- .../views/print/laporan_imbanduga.blade.php | 12 +- 22 files changed, 393 insertions(+), 259 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 2f9c968..900e7f8 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -395,7 +395,7 @@ class GadaianController extends Controller foreach($transaction as $trans) { - $totaltransaction += $trans['duit_masuk']; + $totaltransaction += $trans['duit_masuk']; } if(sizeof($gadai) != 0) @@ -434,7 +434,7 @@ class GadaianController extends Controller foreach($transaction as $trans) { - $totaltransaction += $trans['duit_masuk']; + $totaltransaction += $trans['duit_masuk']; } diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index ac78a64..97d9353 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1768,9 +1768,6 @@ class KhazanahController extends Controller ])->json(); } - - - return $this->denominasipendahuluanserahan($request); } @@ -1794,12 +1791,25 @@ class KhazanahController extends Controller if($request->jenisgldetail == 'pendahuluan') { - $rekodb1 += intval($request->bundle1); - $rekodb5 += intval($request->bundle5); - $rekodb10 += intval($request->bundle10); - $rekodb20 += intval($request->bundle20); - $rekodb50 += intval($request->bundle50); - $rekodb100 += intval($request->bundle100); + // $rekodb1 += intval($request->bundle1); + // $rekodb5 += intval($request->bundle5); + // $rekodb10 += intval($request->bundle10); + // $rekodb20 += intval($request->bundle20); + // $rekodb50 += intval($request->bundle50); + // $rekodb100 += intval($request->bundle100); + + $rekodsen1 += intval($request->ambilansen1); + $rekodsen5 += intval($request->ambilansen5); + $rekodsen10 += intval($request->ambilansen10); + $rekodsen20 += intval($request->ambilansen20); + $rekodsen50 += intval($request->ambilansen50); + + $rekodring1 += intval($request->ambilanring1); + $rekodring5 += intval($request->ambilanring5); + $rekodring10 += intval($request->ambilanring10); + $rekodring20 += intval($request->ambilanring20); + $rekodring50 += intval($request->ambilanring50); + $rekodring100 += intval($request->ambilanring100); $denominasiupdate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[ @@ -1829,12 +1839,25 @@ class KhazanahController extends Controller }else if($request->jenisgldetail == 'serahan') { - $rekodb1 -= intval($request->bundle1); - $rekodb5 -= intval($request->bundle5); - $rekodb10 -= intval($request->bundle10); - $rekodb20 -= intval($request->bundle20); - $rekodb50 -= intval($request->bundle50); - $rekodb100 -= intval($request->bundle100); + // $rekodb1 -= intval($request->bundle1); + // $rekodb5 -= intval($request->bundle5); + // $rekodb10 -= intval($request->bundle10); + // $rekodb20 -= intval($request->bundle20); + // $rekodb50 -= intval($request->bundle50); + // $rekodb100 -= intval($request->bundle100); + + $rekodsen1 -= intval($request->ambilansen1); + $rekodsen5 -= intval($request->ambilansen5); + $rekodsen10 -= intval($request->ambilansen10); + $rekodsen20 -= intval($request->ambilansen20); + $rekodsen50 -= intval($request->ambilansen50); + + $rekodring1 -= intval($request->ambilanring1); + $rekodring5 -= intval($request->ambilanring5); + $rekodring10 -= intval($request->ambilanring10); + $rekodring20 -= intval($request->ambilanring20); + $rekodring50 -= intval($request->ambilanring50); + $rekodring100 -= intval($request->ambilanring100); $denominasiupdate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[ diff --git a/public/js/main.js b/public/js/main.js index 558d766..f8a93a8 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -289,6 +289,10 @@ async function openuptambahdanserah(e) return 'Isikan tempat kosong diatas!' } + if(value <= 0){ + return 'Masukkan jumlah yang munasabah sahaja!'; + } + if(isNaN(value)) { return 'Amaun hendaklah dalam nombor!' @@ -329,7 +333,7 @@ async function openuptambahdanserah(e) allowEnterKey: false }) - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); @@ -382,7 +386,11 @@ async function openuptambahdanserah(e) allowOutsideClick: true, inputValidator: (value) => { if (!value) { - return 'Isikan tempat kosong diatas!' + return 'Isikan tempat kosong diatas!'; + } + + if(value <= 0){ + return 'Masukkan jumlah yang munasabah sahaja!'; } if(value > bakiakhir) @@ -392,7 +400,7 @@ async function openuptambahdanserah(e) if(isNaN(value)) { - return 'Amaun hendaklah dalam nombor!' + return 'Amaun hendaklah dalam nombor!'; } } }); @@ -489,7 +497,7 @@ function tambahdanserahanfunc(e) allowEnterKey: false }) - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index ec6eae9..a8ccba6 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -158,8 +158,8 @@ {{ $loop->iteration }} {{ $gt['norujukan'] }} - {{ $gt['pinjaman'] }} - {{ $gt['nilaimarhun'] }} + {{ number_format($gt['pinjaman'],2) }} + {{ number_format($gt['nilaimarhun'],2) }} @php if($gt['jenistebus'] == ''){ echo '

Gadai

'; }else{ @@ -191,8 +191,8 @@ {{ $loop->iteration }} {{ $tb['tarikh'] }} - {{ $tb['cajlelong'] }} - {{ $tb['jumlah'] }} + {{ number_format($tb['cajlelong'],2) }} + {{ number_format($tb['jumlah'],2) }} @php if($tb['jenis'] == 'T'){ echo '

Baki Lelong

'; }else{ diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 2650f4a..afebfe2 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -845,7 +845,7 @@ } }); - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php index a8d10ee..b38a385 100644 --- a/resources/views/gadaian/edit.blade.php +++ b/resources/views/gadaian/edit.blade.php @@ -920,7 +920,7 @@ } }); - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); @@ -1025,7 +1025,7 @@ } }); - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 07abb0a..086c1a9 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -822,7 +822,7 @@ } }); - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); @@ -956,7 +956,7 @@ //Try Pusher - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index c9bf508..21a3628 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -212,7 +212,11 @@ diff --git a/resources/views/khazanah/laporan/marhunterkumpul.blade.php b/resources/views/khazanah/laporan/marhunterkumpul.blade.php index f196364..7f77789 100644 --- a/resources/views/khazanah/laporan/marhunterkumpul.blade.php +++ b/resources/views/khazanah/laporan/marhunterkumpul.blade.php @@ -35,21 +35,21 @@ - + $(document).ready( function () { + $('#datetimepicker1').datepicker({ + format: 'dd-mm-yyyy' + }); + }); + + @endsection diff --git a/resources/views/khazanah/pendahuluanserah.blade.php b/resources/views/khazanah/pendahuluanserah.blade.php index 173cd81..99d140d 100644 --- a/resources/views/khazanah/pendahuluanserah.blade.php +++ b/resources/views/khazanah/pendahuluanserah.blade.php @@ -135,51 +135,51 @@ RM0.01 - + RM1 - + RM0.05 - + RM5 - + RM0.10 - + RM10 - + RM0.20 - + RM20 - + RM0.50 - + RM50 - + @@ -189,7 +189,7 @@ RM100 - +
@@ -197,7 +197,7 @@ - + @@ -210,15 +210,15 @@
Total Wang Tunai Keping (RM)
- + - + - +
Total Keseluruhan (RM)
Baki Akhir Sistem (RM)
Lebihan/Kekurangan (RM)
@@ -367,7 +367,7 @@ window.location.href = "{{ route('khazanah.pendahulu') }}"; } }); -} + } function validateamaun() diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php index aec24c3..d0e020a 100644 --- a/resources/views/khazanah/pendahuluanserahanmain.blade.php +++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php @@ -32,8 +32,8 @@ {{ $gldetail['tarikh'] }} {{ $gldetail['descpt'] }} - {{ number_format($gldetail['pendahuluan'],2) }} - {{ number_format($gldetail['serahan'],2) }} + {{ ($gldetail['pendahuluan'] == 0 && ($gldetail['ktacct'] == '7000/102' || $gldetail['ktacct'] == '7000/106')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['pendahuluan'],2) }} + {{ ($gldetail['serahan'] == 0 && ($gldetail['dtacct'] == '1000/026' || $gldetail['dtacct'] == '1000/020' || $gldetail['dtacct'] == '1000/090')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['serahan'],2) }} @endforeach @@ -184,6 +184,11 @@ let bundle1 = $('#bundle1').val();let bundle5 = $('#bundle5').val();let bundle10 = $('#bundle10').val(); let bundle20 = $('#bundle20').val();let bundle50 = $('#bundle50').val();let bundle100 = $('#bundle100').val(); + //denominasi keping + let sen1 = $('#sen1').val();let sen5 = $('#sen5').val();let sen10 = $('#sen10').val();let sen20 = $('#sen20').val();let sen50 = $('#sen50').val(); + let ringgit1 = $('#ringgit1').val();let ringgit5 = $('#ringgit5').val();let ringgit10 = $('#ringgit10').val();let ringgit20 = $('#ringgit20').val();let ringgit50 = $('#ringgit50').val(); + let ringgit100 = $('#ringgit100').val(); + $.ajax({ method: 'post', url: '{{ route("khazanah.pendahuluanserahanHQ") }}', @@ -196,12 +201,23 @@ 'teller' : teller, 'dtacct' : dtacct, 'ktacct' : ktacct, - 'bundle1' : bundle1, - 'bundle5' : bundle5, - 'bundle10' : bundle10, - 'bundle20' : bundle20, - 'bundle50' : bundle50, - 'bundle100' : bundle100 + 'ambilansen1' : sen1, + 'ambilansen5' : sen5, + 'ambilansen10' : sen10, + 'ambilansen20' : sen20, + 'ambilansen50' : sen50, + 'ambilanring1' : ringgit1, + 'ambilanring5' : ringgit5, + 'ambilanring10' : ringgit10, + 'ambilanring20' : ringgit20, + 'ambilanring50' : ringgit50, + 'ambilanring100' : ringgit100 + // 'bundle1' : bundle1, + // 'bundle5' : bundle5, + // 'bundle10' : bundle10, + // 'bundle20' : bundle20, + // 'bundle50' : bundle50, + // 'bundle100' : bundle100 }, success:function(data){ if(data == 'LULUS'){ diff --git a/resources/views/khazanah/serahan.blade.php b/resources/views/khazanah/serahan.blade.php index bcdb7fd..c7233e4 100644 --- a/resources/views/khazanah/serahan.blade.php +++ b/resources/views/khazanah/serahan.blade.php @@ -55,6 +55,7 @@ Modal Serahan Tarikh + Masa Action diff --git a/resources/views/khazanah/tebus.blade.php b/resources/views/khazanah/tebus.blade.php index 3411f94..40c021b 100644 --- a/resources/views/khazanah/tebus.blade.php +++ b/resources/views/khazanah/tebus.blade.php @@ -146,7 +146,7 @@
-

Jumlah Surat Gadai : {{ count($listserah) + count($senaraitebus) }}

+

Jumlah SAG : {{ count($listserah) + count($senaraitebus) }}

Cetak diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index cf28ea4..f298256 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -118,7 +118,7 @@ // Enable pusher logging - don't include this in production // Pusher.logToConsole = true; - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); @@ -183,7 +183,7 @@ // Enable pusher logging - don't include this in production // Pusher.logToConsole = true; - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php index 7b0816e..2bcd634 100644 --- a/resources/views/layouts/app_operasi.blade.php +++ b/resources/views/layouts/app_operasi.blade.php @@ -109,7 +109,7 @@ // Enable pusher logging - don't include this in production Pusher.logToConsole = true; - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); @@ -163,7 +163,7 @@ // Enable pusher logging - don't include this in production Pusher.logToConsole = true; - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); @@ -219,7 +219,7 @@ // Enable pusher logging - don't include this in production Pusher.logToConsole = false; - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index 10ef16f..e275dfb 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -265,7 +265,7 @@ } }); - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); diff --git a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php index 8e876d8..31c2563 100644 --- a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php +++ b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php @@ -5,7 +5,7 @@ @@ -22,7 +22,7 @@
- +
@@ -33,7 +33,7 @@ - + {{-- @@ -62,8 +62,68 @@ + --}} + + + + + + + + + + -
Ambilan Total (RM)
RM1
RM0.01 RM1
+ + RM0.05 + + + + RM5 + + + + + + RM0.10 + + + + RM10 + + + + + + RM0.20 + + + + RM20 + + + + + + RM0.50 + + + + RM50 + + + + + + + + + RM100 + + + + +
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index deacc19..c133a66 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -1245,7 +1245,7 @@ } }); - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); @@ -1373,7 +1373,7 @@ }); - var pusher = new Pusher('26b0ec2f297f94b7aa9b', { + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { cluster: 'ap1', encrypted: true }); diff --git a/resources/views/print/laporan_imbanduga.blade.php b/resources/views/print/laporan_imbanduga.blade.php index 35b63ca..51b727a 100644 --- a/resources/views/print/laporan_imbanduga.blade.php +++ b/resources/views/print/laporan_imbanduga.blade.php @@ -9,7 +9,7 @@ #header td, #customers th { padding:4px; - font-size:10px; + font-size:12px; } #header tr:nth-child(even){background-color: #ffffff;} @@ -39,7 +39,7 @@ #scan td, #scan th { padding: 8px; - font-size:12px; + font-size:20px; } #scan tr:nth-child(even){background-color: #ffffff;} @@ -96,7 +96,7 @@ #details td, #details th { padding: 8px; - font-size:11px; + font-size:16px; } #details tr:nth-child(even){background-color: #ffffff;} @@ -181,7 +181,7 @@ #details td, #details th { padding:4px; - font-size:12px; + font-size:16px; border: 1px solid #ddd; } @@ -244,9 +244,7 @@ #data td, #data th { padding:4px; - font-size:12px; - - font-size:12px; + font-size:16px; }