From a229ef4572ded7beca4c44e3e23d9bebdf0fc40f Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Thu, 22 Apr 2021 16:00:49 +0800 Subject: [PATCH] fix tunaiditangan --- app/Http/Controllers/KhazanahController.php | 12 +++- .../views/print/laporan_gadaian.blade.php | 9 +-- .../views/print/laporan_penebusan.blade.php | 59 +++++++++++-------- 3 files changed, 49 insertions(+), 31 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index f22c378..fff8c8b 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2694,14 +2694,22 @@ class KhazanahController extends Controller $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); - + //TunaiDitangan Sementara Upah + if($tarikh_imbangan2 >= '2021-04-22') + { + $advansurharini = Http::get(config('api.url').'/api/advansurharini/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + $totaltunaiditangan = floatval($tunaiditangan) - floatval($advansur); + }else{ + $totaltunaiditangan = $tunaiditangan; + } + //Terkumpul $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpul/'. $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $hartasemasa = []; // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']]; - array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan]); + array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]); array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]); array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index a5c3aaa..2e0567f 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -150,7 +150,7 @@ {{-- KOPERASI PERMODALAN KELANTAN BERHAD --}} - {{ $cawangan_detail['namacaw'] }} + {{ $cawangan_detail['namacaw'] }} {{-- @@ -268,13 +268,10 @@ @endif @endforeach - - JUMLAH KESELURUHAN : - {{ number_format($totalpinjaman,2) }} - - +
JUMLAH KESELURUHAN GADAIAN : RM {{ number_format($totalpinjaman,2) }}
+

diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index 5ca2f41..a4c31c5 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -135,6 +135,13 @@ padding:4px; color:black; } + +@media print { + .new-page { + page-break-before: always; + } +} + @@ -146,21 +153,21 @@
- - + {{-- --}} + {{-- --}} - + - + {{-- - + --}}
@@ -206,25 +213,25 @@ T Gadai T Tebus JBG - Pembiayaan - Upah Asal - Upah Percuma - Upah Dibayar - N Marhun - Jenis Tebus + Pembiayaan(RM) + Upah/Keuntungan(RM) + Bayaran(RM) - @php $counter = 1; $totalpembiayaan = 0;@endphp + @php $counter = 1; $totalbayaran = 0;@endphp @foreach($tebus as $index=>$item) + @php $totalbayaran += $item['bakipjm'] @endphp @if($index > 0) @if($item['teller'] != $tebus[$index - 1]['teller']) - Teller : {{ $item['teller'] }} + Teller : {{ $item['teller'] }} + @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp @endif @else - Teller : {{ $item['teller'] }} + Teller : {{ $item['teller'] }} + @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp @endif {{ $counter }} @@ -248,28 +255,34 @@ {{$item['t_tebus']}} {{$item['jbg']}} {{$item['pinjaman']}} - {{$item['upahasal']}} - {{$item['upahpercuma']}} - {{$item['upahdibayar']}} - {{$item['nilaimarhun']}} - {{$item['jenistebus']}} + {{$item['bakiupah']}} + {{$item['bakipjm']}} @php $counter++; @endphp + @php $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp @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($totalpinjamanteller,2) }} + {{ number_format($totalupahteller,2) }} + {{ number_format($totalbayaranteller,2) }} @php $counter = 0; @endphp @endif @else - - {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + + {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ number_format($totalpinjamanteller,2) }} + {{ number_format($totalupahteller,2) }} + {{ number_format($totalbayaranteller,2) }} @endif @endforeach +
JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}
+