From de7bdaa3af409f8d7cd91a43c5407245d371db6b Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Mon, 23 Aug 2021 16:58:56 +0800 Subject: [PATCH] add pendahuluan --- .../laporan/laporanalirantunai.blade.php | 18 +++---- resources/views/khazanah/dashboard.blade.php | 6 +-- .../khazanah/pendahuluanserahanmain.blade.php | 49 ++++++++++++++----- resources/views/layouts/app.blade.php | 36 ++++++++++++-- 4 files changed, 83 insertions(+), 26 deletions(-) diff --git a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php index 3684a9a..21e7769 100644 --- a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php +++ b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php @@ -111,12 +111,12 @@ - +
SULIT DAN PERSENDIRIAN
- + @@ -198,13 +198,13 @@ - -
- - -
- - + + + \ No newline at end of file diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php index 8394c74..e0347ae 100644 --- a/resources/views/khazanah/dashboard.blade.php +++ b/resources/views/khazanah/dashboard.blade.php @@ -38,7 +38,7 @@

RM {{ ($ringkasanharian['gadai'][0]['jumlahpinjaman']) ? number_format($ringkasanharian['gadai'][0]['jumlahpinjaman'],2) : "0.00" }}

-

Gadai Hari Ini

+

Pembiayaan Hari Ini

@@ -171,7 +171,7 @@

RM {{ ($dashboard[0]['variasi']) ? number_format((float)$dashboard[0]['variasi'],2) : "0.00" }}

-

Varian

+

Varians

@@ -231,7 +231,7 @@

RM {{ ($komuditicheck) ? number_format($komuditicheck['unit_komuditi'],2) : '0.00' }}

-

Baki Komuditi

+

Baki Komoditi

diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php index 7995ee2..6ecfe44 100644 --- a/resources/views/khazanah/pendahuluanserahanmain.blade.php +++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php @@ -20,6 +20,17 @@
+ @php + $dt = \Carbon\Carbon::now(); + + $date = $dt->format('Y-m-d'); + + @endphp + +
+ +
+
{{-- @php $date = date('yy-m-d'); @endphp --}} @@ -29,7 +40,7 @@ - {{-- --}} + @@ -39,7 +50,7 @@ - {{-- @if($date === $gldetail['tarikh']) @else @endif --}} + @if($date === $gldetail['tarikh']) @else @endif @endforeach @@ -62,7 +73,14 @@ var tablependahuluanserahan = $('#table-pendahuluanserahan').DataTable({ "scrollX": true, - "order": [[ 0, "desc" ]] + "order": [[ 0, "desc" ]], + "columnDefs": [ + { + "targets": [ 4 ], + "visible": false, + "searchable": false + } + ] }); let api = "{{ config('api.url') }}"; @@ -112,6 +130,15 @@ }); + function togglepadam() + { + event.preventDefault(); + + var column = tablependahuluanserahan.column(4); + + column.visible(!column.visible()); + } + function deletependser() { Swal.fire({ @@ -124,14 +151,14 @@ cancelButtonColor: '#d33', confirmButtonText: 'Teruskan!' }).then((result) => { - if (result.isConfirmed) { - Swal.fire( - 'Deleted!', - 'Your file has been deleted.', - 'success' - ) - } - }); + if (result.isConfirmed) { + Swal.fire( + 'Deleted!', + 'Your file has been deleted.', + 'success' + ) + } + }); } function validateformat(evt) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 8247f3e..df47ce9 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -68,6 +68,17 @@ + + @php + $auth_user = Auth::user(); + + if($auth_user['role_harian'] == 'teller') + { + $api_url = config('api.url'); + $gadai = Http::get( config('api.url') .'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'])->json(); + $listserah = Http::get(config('api.url').'/api/listSerahMarhunController/'.$auth_user['cawangan'])->json(); + } + @endphp
- + + + @php + if($auth_user['role_harian'] == 'teller') + { + echo '
+
+
+
G : ' . count($gadai) . '
+
T : ' . count($listserah) . '
+
+
+
'; + } + @endphp + + + + + + +
Description Pendahuluan (RM) Serahan (RM)TindakanTindakan
{{ $gldetail['descpt'] }} {{ ($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) }}