From cbf7fef739df98c25df16ffe68c8aab6fc681758 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 29 Mar 2023 22:16:20 +0800 Subject: [PATCH] fix ringkasan terkumpul dan penambahan data filter dalam bajet --- app/Http/Controllers/KhazanahController.php | 9 +- resources/views/khazanah/bajet.blade.php | 662 ++++++++++-------- .../views/khazanah/laporan/index.blade.php | 2 +- .../laporan_ringkasanterkumpul.blade.php | 539 +++++++------- 4 files changed, 631 insertions(+), 581 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index f8d035e..05b803a 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2215,7 +2215,7 @@ class KhazanahController extends Controller $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - return view('print.laporan_ringkasanterkumpulv2', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); + return view('print.laporan_ringkasanterkumpul', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); } public function laporanKawalanStok(){ @@ -2309,7 +2309,12 @@ class KhazanahController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - return view('khazanah.bajet',compact('cawangan_info','api_url')); + + $data_sebenar = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'sebenar'])->json(); + $data_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'datalelong'])->json(); + $data_filter = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'filter'])->json(); + + return view('khazanah.bajet',compact('cawangan_info','api_url','data_sebenar','data_lelong','data_filter')); } diff --git a/resources/views/khazanah/bajet.blade.php b/resources/views/khazanah/bajet.blade.php index eae6de3..10ee3ce 100644 --- a/resources/views/khazanah/bajet.blade.php +++ b/resources/views/khazanah/bajet.blade.php @@ -5,24 +5,27 @@
- + +
- - + +
- +
Pembiayaan
-
0%
+
0%
@@ -34,7 +37,7 @@
-100%
- +
@@ -51,7 +54,10 @@
Penebusan
-
0%
+
0%
@@ -63,7 +69,7 @@
0%
- +
@@ -80,7 +86,10 @@
Keuntungan
-
0%
+
0%
@@ -92,7 +101,7 @@
0%
- +
@@ -116,7 +125,7 @@
- +
Penebusan Bulanan
@@ -124,7 +133,7 @@
- +
Keuntungan Bulanan
@@ -156,7 +165,7 @@
Penebusan Terkumpul
- +
ACTUAL : @@ -172,7 +181,7 @@
Keuntungan Terkumpul
- +
ACTUAL : @@ -188,6 +197,103 @@
+
+
+
Data Sebenar
+
+ + + + + + + + + + @for($i=0;$i<13;$i++) + + + + + + @endfor + + + + + + + + +
TempohBilRM
{{ ($i == 12) ? '12 >' : ($i + 1) }} bulan{{ number_format($data_sebenar['count'][$i]) }}{{ number_format($data_sebenar['sum'][$i],2) }}
Keseluruhan{{ number_format($data_sebenar['count'][13]) }}{{ number_format($data_sebenar['sum'][13],2) }}
+ +
+
+
+
Data Lelong
+
+ +
+ + + + + + + + + @for($i=0;$i<13;$i++) + + + + + + @endfor + + + + + + + + +
TempohBilRM
{{ ($i == 12) ? '12 >' : ($i + 1) }} bulan{{ number_format($data_lelong['count'][$i]) }}{{ number_format($data_lelong['sum'][$i],2) }}
Keseluruhan{{ number_format($data_lelong['count'][13]) }}{{ number_format($data_lelong['sum'][13],2) }}
+ +
+
+
+
Data Filter
+
+ + + + + + + + + + @for($i=0;$i<13;$i++) + + + + + + @endfor + + + + + + + + +
TempohBilRM
{{ ($i == 12) ? '12 >' : ($i + 1) }} bulan{{ number_format($data_filter['count'][$i]) }}{{ number_format($data_filter['sum'][$i],2) }}
Keseluruhan{{ number_format($data_filter['count'][13]) }}{{ number_format($data_filter['sum'][13],2) }}
+ +
+
+
+
@@ -199,208 +305,207 @@
- +
diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index 53d0ac2..5f124b3 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -27,7 +27,7 @@ Pelanggan Baru
- {{-- Ringkasan Terkumpul --}} + Ringkasan Terkumpul
Aging Bulan diff --git a/resources/views/print/laporan_ringkasanterkumpul.blade.php b/resources/views/print/laporan_ringkasanterkumpul.blade.php index c2f46ea..96fc774 100644 --- a/resources/views/print/laporan_ringkasanterkumpul.blade.php +++ b/resources/views/print/laporan_ringkasanterkumpul.blade.php @@ -1,317 +1,262 @@ - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - -
LAPORAN RINGKASAN TERKUMPUL Tarikh Cetak: - @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate) - @endphp -
TARIKH@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate) - @endphp -
- -
- - - + #header { + font-family: Arial, Helvetica, sans-serif; + border-collapse: collapse; + width: 100%; + } + + #header td, #customers th { - - + padding:4px; + font-size:10px; + } + + #header tr:nth-child(even){background-color: #ffffff;} + + #header tr:hover {background-color: #ddd;} + + #header th { + padding-top: 12px; + padding-bottom: 12px; + text-align: left; + padding:4px; + color:black; + } + .box{ + border:1px solid black; + padding:3px; + } + + {{-- + + --}} + {{--
JUMLAHJUMLAH PENDAPATAN
- - - + + + + + - - - - - - - - - - - + - - - - + + + --}} + +
LAPORAN RINGKASAN TRANSAKSI TERKUMPUL - {{ $cawangan_detail['namacaw'] }}
+ +

Tarikh Mula: {{ $mula_date }} Tarikh Hingga : {{ $hingga_date }} Tarikh Cetak : {{ $tarikh_cetak }}

+ +
+
+
+
+

A) TRANSAKSI TERKUMPUL

+
+ +
1. PEMBIAYAAN
+
RM {{ number_format($laporan_ringkasan['total_gadai'],2) }}
+
{{ $laporan_ringkasan['bilangan_gadai'] }}
+ +
2. PENYELESAIAN PEMBIAYAAN
+ +
a. PEMBIAYAAN DIBAYAR
+
{{ 'RM '. number_format($laporan_ringkasan['total_tebus'],2) }}
+
{{ $laporan_ringkasan['bilangan_tebus'] + $laporan_ringkasan['bilangan_lelong'] }}
+ +
b. KEUNTUNGAN DIBAYAR
+
{{ 'RM '. number_format($laporan_ringkasan['upahsimpankaunter'],2) }}
+
+ +
3. ANSURAN PEMBIAYAAN
+ +
a. PEMBIAYAAN DIBAYAR
+
{{ 'RM '. number_format($laporan_ringkasan['total_ansuran'],2) }}
+
{{ $laporan_ringkasan['bilangan_ansuran'] }}
+ +
b. KEUNTUNGAN DIBAYAR
+
{{ 'RM '. number_format($laporan_ringkasan['keuntungansebenarkaunter'],2) }}
+
+ +
4. BAYARAN ONLINE
+ +
a. PEMBIAYAAN DIBAYAR
+
{{ 'RM '. number_format($laporan_ringkasan['total_ansuranonline'],2) }}
+
{{ $laporan_ringkasan['bilangan_ansuranonline'] }}
+ +
b. KEUNTUNGAN DIBAYAR
+
{{ 'RM '. number_format($laporan_ringkasan['total_keuntungan_online'],2) }}
+
+ +
5. PELANGGAN BARU
+
+
{{ $laporan_ringkasan['bilangan_customer_baru'] }}
- {{ $marhun['lelong'][0]['bilangan'] }}
- {{ number_format($marhun['lelong'][0]['jumlahmarhun'],2) }}
- {{ number_format($marhun['lelong'][0]['jumlahpinjaman'],2) }}
- {{ number_format($marhun['lelongupahsimpan'],2) }}
- {{ number_format($marhun['cajlelong'],2) }}
- {{ number_format($marhun['lelongbaki'],2) }}
- {{ number_format($marhun['lelongrugi'],2) }}

- {{ number_format($marhun['terimarugilelong'],2) }}

- {{ number_format($marhun['bayarlebihanlelong'],2) }} - - - - - - - - - - - -
..................................................................
-

DI SEMAK

- ..................................................................
-

DI SAHKAN

- -
- - - - - - HAPUS KIRA - BIL
- N. MARHUN
- PEMBIAYAAN - - {{ $marhun['hapuskira'][0]['bilangan'] }}
- {{ number_format($marhun['hapuskira'][0]['jumlahmarhun'],2) }}
- {{ number_format($marhun['hapuskira'][0]['jumlahpinjaman'],2) }}
+
+
+
+
+
+

B) PENDAHULUAN/SERAHAN HQ

+
+ +
1. PENDAHULUAN
+
{{ 'RM '. number_format($laporan_ringkasan['totalpendahuluan'],2) }}
+ +
2. SERAHAN
+
{{ 'RM '. number_format($laporan_ringkasan['totalserahan'],2) }}
+ +
3. SERAHAN ONLINE
+
{{ 'RM '. number_format($laporan_ringkasan['serahanbayaranOnline'],2) }}
- - - - -
-
- - - - - - +
+
+
+ +
+
+
+
+

C) LELONG

+
+
+

D) BAYARAN LELONG

+
+
1. LELONG HARI INI
+
RM {{ number_format($laporan_ringkasan['jumlah_lelong'],2) }}
+
+
2. BAKI
+
RM {{ number_format($laporan_ringkasan['baki_lelong'],2) }}
+
{{ 'RM '. number_format($laporan_ringkasan['bayar_baki_lelong'],2) }}
+
3. RUGI
+
RM {{ number_format($laporan_ringkasan['rugi_lelong'],2) }}
+
{{ 'RM '. number_format($laporan_ringkasan['bayar_rugi_lelong'],2) }}
+
4. CAJ LELONG
+
RM {{ number_format($laporan_ringkasan['cas_lelong'],2) }}
+
+
5. BIL
+
{{ $laporan_ringkasan['bilangan_lelong'] }}
+
+
+
+
+
+
+

E) PERBELANJAAN

+
+
1. BELANJA AM
+
{{ 'RM '. number_format($laporan_ringkasan['belanjaam'],2) }}
+
2. BAIKI DAN SELENGGARA
+
{{ 'RM '. number_format($laporan_ringkasan['baikidanselenggara'],2) }}
+
3. KERAIAN & PROMOSI
+
{{ 'RM '. number_format($laporan_ringkasan['keraian'],2) }}
+
4. JUMLAH
+
@php $total = $laporan_ringkasan['belanjaam'] + $laporan_ringkasan['baikidanselenggara'] + $laporan_ringkasan['keraian']; echo 'RM '. number_format($total,2); @endphp
+
+
+
+ +
+
+
+
+

F) PERATUSAN PEMBIAYAAN

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MARGIN70%75%80%JUMLAH
1PEMBIAYAANRM {{ number_format($laporan_ringkasan['gadai_70'],2) }}RM {{ number_format($laporan_ringkasan['gadai_75'],2) }}RM {{ number_format($laporan_ringkasan['gadai_80'],2) }}RM {{ number_format($laporan_ringkasan['total_gadaian'],2) }}
2NILAI MARHUNRM {{ number_format($laporan_ringkasan['nilaimarhun_70'],2) }}RM {{ number_format($laporan_ringkasan['nilaimarhun_75'],2) }}RM {{ number_format($laporan_ringkasan['nilaimarhun_80'],2) }}RM {{ number_format($laporan_ringkasan['total_nm'],2) }}
3BILANGAN{{ $laporan_ringkasan['bilangan_70'] }}{{ $laporan_ringkasan['bilangan_75'] }}{{ $laporan_ringkasan['bilangan_80'] }}{{ number_format($laporan_ringkasan['total_bilangan']) }}
+
+
+
+
+ +
+
+
+
DISEMAK
+
+
+
................................................
+
+
+
+
+
DISAHKAN
+
+
+
................................................
+
+
+
\ No newline at end of file