From 77519d63d58719def67fa8c0c7fcc5c28781a78e Mon Sep 17 00:00:00 2001
From: Amirah <nuramirahzulkipli22@gmail.com>
Date: Thu, 25 Jan 2024 08:51:14 +0800
Subject: [PATCH] add column marhun stock audit

---
 resources/views/akaun/laporan_stokaudit.blade.php           | 3 +++
 resources/views/akaun/laporan_stokaudit_combine.blade.php   | 6 ++++++
 resources/views/akaun/laporan_stokauditbelumaktif.blade.php | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/resources/views/akaun/laporan_stokaudit.blade.php b/resources/views/akaun/laporan_stokaudit.blade.php
index fc082b7..4574f39 100644
--- a/resources/views/akaun/laporan_stokaudit.blade.php
+++ b/resources/views/akaun/laporan_stokaudit.blade.php
@@ -205,6 +205,7 @@
     <th>No. KP</th>
     <th>Berat</th>
     <th>Nilai Marhun (RM)</th>
+    <th>Marhun</th>
     <th>Pembiayaan Asal (RM)</th>
     <th>Baki Pembiayaan (RM)</th>
     <th>Kadar Upah</th>
@@ -222,6 +223,7 @@
       <td>{{$item['nokp']}}</td>
       <td>{{ number_format($item['berat'],2) }}</td>
       <td>{{ number_format($item['nilaimarhun'],2) }}</td>
+      <td>{{ $item['marhun']}}</td>
       <td>{{ number_format($item['pinjaman'],2) }}</td>
       <td>{{ number_format($item['bakipjm'],2) }}</td>
       <td>{{ number_format($item['kadarupah'],2) }}</td>
@@ -236,6 +238,7 @@
     <th colspan='4'>Jumlah</th>
     <th>{{ number_format($stokaudit['totalberat'],2) }}</th>
     <th>{{ number_format($stokaudit['totalnilaimarhun'],2) }}</th>
+    <th></th>
     <th>{{ number_format($stokaudit['totalpinjaman'],2) }}</th>
     <th>{{ number_format($stokaudit['totalbakipjm'],2) }}</th>
     <th></th>
diff --git a/resources/views/akaun/laporan_stokaudit_combine.blade.php b/resources/views/akaun/laporan_stokaudit_combine.blade.php
index 997b600..129dae3 100644
--- a/resources/views/akaun/laporan_stokaudit_combine.blade.php
+++ b/resources/views/akaun/laporan_stokaudit_combine.blade.php
@@ -231,6 +231,7 @@
             <th>No. KP</th>
             <th>Berat</th>
             <th>Nilai Marhun (RM)</th>
+            <th>Marhun</th>
             <th>Pembiayaan Asal (RM)</th>
             <th>Baki Pembiayaan (RM)</th>
             <th>Kadar Upah</th>
@@ -249,6 +250,7 @@
             <td>{{$item['nokp']}}</td>
             <td>{{ number_format($item['berat'],2) }}</td>
             <td>{{ number_format($item['nilaimarhun'],2) }}</td>
+            <td>{{ $item['marhun']}}</td>
             <td>{{ number_format($item['pinjaman'],2) }}</td>
             <td>{{ number_format($item['bakipjm'],2) }}</td>
             <td>{{ number_format($item['kadarupah'],2) }}</td>
@@ -263,6 +265,7 @@
             <th colspan='4'>Jumlah</th>
             <th>{{ number_format($stokaudit_aktif['totalberat'],2) }}</th>
             <th>{{ number_format($stokaudit_aktif['totalnilaimarhun'],2) }}</th>
+            <th></th>
             <th>{{ number_format($stokaudit_aktif['totalpinjaman'],2) }}</th>
             <th>{{ number_format($stokaudit_aktif['totalbakipjm'],2) }}</th>
             <th></th>
@@ -318,6 +321,7 @@
             <th>No. KP</th>
             <th>Berat</th>
             <th>Nilai Marhun (RM)</th>
+            <th>Marhun</th>
             <th>Pembiayaan</th>
             <th>Lanjutan</th>
         </thead>
@@ -332,6 +336,7 @@
             <td>{{$item['nokp']}}</td>
             <td>{{ number_format($item['berat'],2) }}</td>
             <td>{{ number_format($item['nilaimarhun'],2) }}</td>
+            <td>{{ $item['marhun']}}</td>
             <td>@php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo
                 number_format($item['bakipjm'],2); @endphp</td>
             <td>{{$item['lelong_tawarruq']}}</td>
@@ -342,6 +347,7 @@
             <th colspan='4'>Jumlah</th>
             <th>{{ number_format($stokaudit_takaktif['totalberat'],2) }}</th>
             <th>{{ number_format($stokaudit_takaktif['totalnilaimarhun'],2) }}</th>
+            <th></th>
             <th>{{ number_format($totalpinjaman,2) }}</th>
             <th></th>
         </tfoot>
diff --git a/resources/views/akaun/laporan_stokauditbelumaktif.blade.php b/resources/views/akaun/laporan_stokauditbelumaktif.blade.php
index de071c4..e35aa92 100644
--- a/resources/views/akaun/laporan_stokauditbelumaktif.blade.php
+++ b/resources/views/akaun/laporan_stokauditbelumaktif.blade.php
@@ -205,6 +205,7 @@
     <th>No. KP</th>
     <th>Berat</th>
     <th>Nilai Marhun (RM)</th>
+    <th>Marhun</th>
     <th>Pembiayaan</th>
     <th>Lanjutan</th>
   </thead>
@@ -218,6 +219,7 @@
       <td>{{$item['nokp']}}</td>
       <td>{{ number_format($item['berat'],2) }}</td>
       <td>{{ number_format($item['nilaimarhun'],2) }}</td>
+      <td>{{ $item['marhun']}}</td>
       <td>@php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo number_format($item['bakipjm'],2); @endphp</td>
       <td>{{$item['lelong_tawarruq']}}</td>
     </tr>
@@ -227,6 +229,7 @@
     <th colspan='4'>Jumlah</th>
     <th>{{ number_format($stokaudit['totalberat'],2) }}</th>
     <th>{{ number_format($stokaudit['totalnilaimarhun'],2) }}</th>
+    <th></th>
     <th>{{ number_format($totalpinjaman,2) }}</th>
     <th></th>
   </tfoot>