diff --git a/resources/views/print/laporan_upah.blade.php b/resources/views/print/laporan_upah.blade.php
index 397a3e5..ddf3776 100644
--- a/resources/views/print/laporan_upah.blade.php
+++ b/resources/views/print/laporan_upah.blade.php
@@ -225,26 +225,55 @@
JBG |
Upah Dibayar |
- @php $counter = 1; $totalbayaran = 0;@endphp
+ @php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
@foreach($advansur as $index=>$item)
- @php $totalbayaran += $item['upahDibayar']; @endphp
+ @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman'];$totalbayaranteller += $item['upahDibayar']; $totalpembiayaanteller += $item['pinjaman']; @endphp
| {{ $counter }} |
{{ $item['tarikh'] }} |
{{ $item['norujukan'] }} |
{{ $item['teller'] }} |
- {{ $item['pinjaman'] }} |
- {{$item['jbg']}} |
- {{$item['upahDibayar']}} |
+ {{ number_format($item['pinjaman'],2) }} |
+ {{ $item['jbg'] }} |
+ {{ number_format($item['upahDibayar'],2) }} |
@php $counter++; @endphp
+ @if($index+1 < sizeof($advansur))
+ @if($item['teller'] != $advansur[$index + 1]['teller'])
+
+ | {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} |
+ {{ number_format($totalpembiayaanteller,2) }} |
+ |
+ {{ number_format($totalbayaranteller,2) }} |
+
+ @php $counter = 0;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
+ @endif
+@else
+
+ | {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} |
+ {{ number_format($totalpembiayaanteller,2) }} |
+ |
+ {{ number_format($totalbayaranteller,2) }} |
+
+@endif
@endforeach
-
-JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}
+
+
+
+ |
+ Pembiayaan (RM) |
+ Upah Dibayar (RM) |
+
+
+ | JUMLAH KESELURUHAN |
+ {{ number_format($totalpembiayaan,2) }} |
+ {{ number_format($totalbayaran,2) }} |
+
+
-
+