From 30fca76da5c5b95a52da431a6126bd37097d156b Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Wed, 28 Sep 2022 09:30:01 +0800
Subject: [PATCH] fix laporan yang dikehendaki

---
 resources/views/print/laporan_serahmarhun.blade.php        | 5 +++--
 resources/views/print/laporan_serahpetibesigadai.blade.php | 5 +----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/resources/views/print/laporan_serahmarhun.blade.php b/resources/views/print/laporan_serahmarhun.blade.php
index bbf9a93..bc14a02 100644
--- a/resources/views/print/laporan_serahmarhun.blade.php
+++ b/resources/views/print/laporan_serahmarhun.blade.php
@@ -211,13 +211,14 @@
       <th>Tarikh</th>
       <th>N Marhun</th>
       <th>Pembiayaan</th>
-      <th>Tag Terima</th>
+      <th>Status Scan</th>
     </tr>
     @php $counter = 1;@endphp
 
     @foreach($serahmarhun as $index=>$item)
       @if($index > 0)
           @if($item['teller'] != $serahmarhun[$index - 1]['teller'])
+          @php $counter = 1; @endphp
               <tr>
                   <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
               </tr>
@@ -233,7 +234,7 @@
         <td>{{ $item['t_tebus'] }}</td>
         <td>{{ number_format($item['nilaimarhun'],2) }}</td>
         <td>{{ number_format($item['pinjaman'],2) }}</td>
-        <td>{{ $item['tagterima'] }}</td>
+        <td>{{ ($item['tagterima'] == 0) "Belum Scan" : "Sudah Scan" }}</td>
       </tr>
       @php $counter++; @endphp
     @endforeach
diff --git a/resources/views/print/laporan_serahpetibesigadai.blade.php b/resources/views/print/laporan_serahpetibesigadai.blade.php
index 131ad29..1ee4e39 100644
--- a/resources/views/print/laporan_serahpetibesigadai.blade.php
+++ b/resources/views/print/laporan_serahpetibesigadai.blade.php
@@ -213,14 +213,13 @@
     <th>Masa</th>
     <th>N Marhun</th>
     <th>Pembiayaan</th>
-    <th>Cetak</th>
-    <th>Tag Serah</th>
     <th>Semak Barcode</th>
   </tr>
   @php $counter = 1;@endphp
   @foreach($serahbarcode as $index=>$item)
     @if($index > 0)
         @if($item['teller'] != $serahbarcode[$index - 1]['teller'])
+        @php $counter = 1;@endphp
             <tr>
                 <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
             </tr>
@@ -240,8 +239,6 @@
       <td>{{ $item['masa'] }}</td>
       <td>{{ number_format($item['nilaimarhun'],2) }}</td>
       <td>{{ number_format($item['pinjaman'],2) }}</td>
-      <td>{{ $item['cetak'] }}</td>
-      <td>{{ $item['tagserah'] }}</td>
       <td>{{ $item['semakbarcode'] }}</td>
     </tr>
     @php $counter++; @endphp