From b46d62e7e9c8bfbd7876c02ee76c91fbcfffc1f0 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 4 May 2021 16:34:47 +0800 Subject: [PATCH] fix laporan --- app/Http/Controllers/KhazanahController.php | 16 +++++++-- .../views/khazanah/alirantunai.blade.php | 4 +-- .../views/print/laporan_ansuran.blade.php | 11 ++++-- .../views/print/laporan_gadaian.blade.php | 10 ++++-- .../views/print/laporan_penebusan.blade.php | 34 +++++++++++++++++++ .../print/laporan_ringkasanharian.blade.php | 2 +- 6 files changed, 67 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index c127b4f..a0b6055 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1978,10 +1978,13 @@ class KhazanahController extends Controller $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json(); + $tebuspengasingan = Http::get(config('api.url'). '/api/tebus/laporanjenistawarruq/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json(); + $upahlama = Http::get(config('api.url'). '/api/advansurdetails/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json(); + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; // dd($gadai); - return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','api_url')); + return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','api_url','upahlama')); } public function laporanLelongan(){ @@ -2353,6 +2356,15 @@ class KhazanahController extends Controller return view('print.laporan_marhunterkumpul', compact('marhun','cawangan_detail','tarikh_cetak','tebus_date','api_url')); } + public function laporanRingkasanHarian(){ + $auth_user = Auth::user(); + $api_url = config('api.url'); + + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + return view('khazanah.laporan.ringkasanharian',compact('cawangan_info','api_url')); + } public function cetakLaporanRingkasanHarian(Request $request){ // dd($request); @@ -2859,7 +2871,7 @@ class KhazanahController extends Controller // $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong]; array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); - array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Keuntungan Sebenar','amaun' => $keuntungansebenar]); + array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]); diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php index 94f8573..9a00108 100644 --- a/resources/views/khazanah/alirantunai.blade.php +++ b/resources/views/khazanah/alirantunai.blade.php @@ -152,7 +152,7 @@
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}
-

Tunai Diterima

+

Pendahuluan

@@ -165,7 +165,7 @@
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}
-

Tunai Dikeluar

+

Serahan

diff --git a/resources/views/print/laporan_ansuran.blade.php b/resources/views/print/laporan_ansuran.blade.php index 71b5791..c72a728 100644 --- a/resources/views/print/laporan_ansuran.blade.php +++ b/resources/views/print/laporan_ansuran.blade.php @@ -208,8 +208,9 @@ Bayaran (RM) Keuntungan (RM) - @php $counter = 1; @endphp + @php $counter = 1;$totalduitmasuk = 0;$totalkeuntungan = 0; @endphp @foreach($tebus as $index=>$item) + @php $totalduitmasuk += $item['duit_masuk'];$totalkeuntungan += $item['bayaran_keuntungan']; @endphp {{ $counter }} {{$item['norujukan']}} @@ -232,13 +233,17 @@ @if($index+1 < sizeof($tebus)) @if($item['teller'] != $tebus[$index + 1]['teller']) - {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ number_format($totalduitmasuk,2) }} + {{ number_format($totalkeuntungan,2) }} @php $counter = 0; @endphp @endif @else - {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ number_format($totalduitmasuk,2) }} + {{ number_format($totalkeuntungan,2) }} @endif @endforeach diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index 2e0567f..031a6b8 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -211,6 +211,7 @@ Berat N Marhun Pembiayaan + Keuntungan Peratus (%) @php $counter = 1; $totalpinjaman = 0; @endphp @@ -227,7 +228,7 @@ Teller : {{ $item['teller'] }} - @php $totalpinjamanteller = 0;$totalnmteller = 0;$totalberatteller = 0; @endphp + @php $totalpinjamanteller = 0;$totalnmteller = 0;$totalberatteller = 0;$totalupah12 = 0; @endphp @endif @@ -245,10 +246,11 @@ {{ number_format($item['berat'],2) }} {{ number_format($item['nilaimarhun'],2) }} {{ number_format($item['pinjaman'],2) }} + {{ number_format($item['upah12'],2) }} {{ $item['percentpinj'] }} @php $counter++; @endphp - @php $totalpinjamanteller += $item['pinjaman'];$totalnmteller += $item['nilaimarhun'];$totalberatteller += $item['berat']; @endphp + @php $totalpinjamanteller += $item['pinjaman'];$totalnmteller += $item['nilaimarhun'];$totalberatteller += $item['berat'];$totalupah12 += $item['upah12']; @endphp @if($index+1 < sizeof($gadai)) @if($item['teller'] != $gadai[$index + 1]['teller']) @@ -256,6 +258,8 @@ {{ number_format($totalberatteller,2) }} {{ number_format($totalnmteller,2) }} {{ number_format($totalpinjamanteller,2) }} + {{ number_format($totalupah12,2) }} + @php $counter = 1; @endphp @endif @@ -265,6 +269,8 @@ {{ number_format($totalberatteller,2) }} {{ number_format($totalnmteller,2) }} {{ number_format($totalpinjamanteller,2) }} + {{ number_format($totalupah12,2) }} + @endif @endforeach diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index a4c31c5..0a0a048 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -302,6 +302,40 @@ +

Laporan Transaksi Penebusan

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
BilJenisPenebusan(RM)Keuntungan(RM)Rebate(RM)
{{ $tebuspengasingan['biltawarruq'] }}Tawarruq{{ number_format($tebuspengasingan['totaltawarruq'],2) }}{{ number_format($tebuspengasingan['keuntungantawarruq'],2) }}{{ number_format($tebuspengasingan['totalrebate'],2) }}
{{ $tebuspengasingan['bilarrahn'] }}Ar-Rahn{{ number_format($tebuspengasingan['totalarrahn'],2) }}{{ number_format($tebuspengasingan['keuntunganarrahn'],2) }} Not Applicable
{{ $upahlama['bil'] }}Bayaran Upah Not Applicable {{ number_format($upahlama['total'],2) }} Not Applicable
+ diff --git a/resources/views/print/laporan_ringkasanharian.blade.php b/resources/views/print/laporan_ringkasanharian.blade.php index 4b6c6fb..fb57412 100644 --- a/resources/views/print/laporan_ringkasanharian.blade.php +++ b/resources/views/print/laporan_ringkasanharian.blade.php @@ -65,7 +65,7 @@
4. BAYARAN ONLINE
5. KEUNTUNGAN
-
+
{{ 'RM '. number_format($laporan['total_keuntungan'],2) }}