From 7da837b13ef59074a1e4294e9d9eb40d42970ac8 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Tue, 8 Jun 2021 14:17:53 +0800
Subject: [PATCH] fix upah skit2

---
 resources/views/print/laporan_upah.blade.php | 45 ++++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

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 @@
     <th>JBG</th>
     <th>Upah Dibayar</th>
   </tr>
-  @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
     <tr>
       <td>{{ $counter }}</td>
       <td>{{ $item['tarikh'] }}</td>
       <td><b>{{ $item['norujukan'] }}</b></td>
       <td>{{ $item['teller'] }}</td>
-      <td>{{ $item['pinjaman'] }}</td>
-      <td>{{$item['jbg']}}</td>
-      <td>{{$item['upahDibayar']}}</td>
+      <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>{{ $item['jbg'] }}</td>
+      <td>{{ number_format($item['upahDibayar'],2) }}</td>
     </tr>
     @php $counter++; @endphp
+    @if($index+1 < sizeof($advansur))
+    @if($item['teller'] != $advansur[$index + 1]['teller'])
+        <tr>
+            <td colspan="4">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+            <td><b>{{ number_format($totalpembiayaanteller,2) }} </b></td>
+            <td></td>
+            <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
+        </tr>
+        @php $counter = 0;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
+    @endif
+@else
+    <tr>
+        <td colspan="4">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+        <td><b>{{ number_format($totalpembiayaanteller,2) }} </b></td>
+        <td></td>
+        <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
+    </tr>
+@endif
   @endforeach
 </table>
-
-<h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5>
+<br><br>
+<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
+  <tr>
+    <th colspan="9"></th>
+    <th style="text-align:center;">Pembiayaan (RM)</th>
+    <th style="text-align:center;">Upah Dibayar (RM)</th>
+  </tr>
+  <tr>
+    <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+    <td>{{ number_format($totalpembiayaan,2) }}</td>
+    <td>{{ number_format($totalbayaran,2) }}</td>
+  </tr>
+</table>
 
 <br>
-<br>
+<br><br><br>
 <table id="sign">
   <tr>
     <td></td>