From 8fe347d9e9a420302c449124dc58a321d383397b Mon Sep 17 00:00:00 2001
From: Afiq Hamzah <afiq.hamzah@pkb.net.my>
Date: Mon, 22 Apr 2024 11:22:32 +0800
Subject: [PATCH] Add changes to report keseluruhan stokaudit

- Change header columns
- Change column orders
---
 .../LaporanKeseluruhan/StokAuditExport.php    | 26 ++++++++++---------
 .../views/reports/stok-audit/show.blade.php   | 24 ++++++++---------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/Exports/LaporanKeseluruhan/StokAuditExport.php b/app/Exports/LaporanKeseluruhan/StokAuditExport.php
index c1eb095..dd56c50 100644
--- a/app/Exports/LaporanKeseluruhan/StokAuditExport.php
+++ b/app/Exports/LaporanKeseluruhan/StokAuditExport.php
@@ -26,12 +26,12 @@ class StokAuditExport extends DefaultValueBinder implements FromArray, WithStric
     {
         return [
             'Cawangan',
-            'Jumlah Pinjaman',
-            'Total Pinjaman',
-            'Total Berat',
-            'Total Nilai Marhun',
-            'Total Baki Pinjaman',
-            'Total Upah Belum Bayar',
+            'Bilangan Pembiayaan',
+            'Berat',
+            'Nilai Marhun',
+            'Baki Pembiayaan',
+            'Pembiayaan',
+            'Upah Belum Bayar',
             'Total Untung 1%',
             'Total Ujrah',
         ];
@@ -49,14 +49,16 @@ class StokAuditExport extends DefaultValueBinder implements FromArray, WithStric
 
     public function map($data): array
     {
+
+
         return [
             $data['cawangan'],
-            $data['jumlah_pinjaman'],
-            number_format($data['total_pinjaman'], 2),
-            number_format($data['total_berat'], 2),
-            number_format($data['total_nilai_marhun'], 2),
-            number_format($data['total_baki_pinjaman'], 2),
-            number_format($data['total_upah_belum_bayar'], 2),
+            $data['bilangan_pembiayaan'],
+            number_format($data['berat'], 2),
+            number_format($data['nilai_marhun'], 2),
+            number_format($data['baki_pembiayaan'], 2),
+            number_format($data['pembiayaan'], 2),
+            number_format($data['upah_belum_bayar'], 2),
             number_format($data['total_utg_onepercent'], 2),
             number_format($data['total_ujrah'], 2),
         ];
diff --git a/resources/views/reports/stok-audit/show.blade.php b/resources/views/reports/stok-audit/show.blade.php
index 36b137a..ef80d3e 100644
--- a/resources/views/reports/stok-audit/show.blade.php
+++ b/resources/views/reports/stok-audit/show.blade.php
@@ -188,24 +188,24 @@
 <table id="details">
   <thead>
     <th>Cawangan</th>
-    <th>Jumlah Pinjaman</th>
-    <th>Total Pinjaman</th>
-    <th>Total Berat</th>
-    <th>Total Nilai Marhun</th>
-    <th>Total Baki Pinjaman</th>
-    <th>Total Upah Belum Bayar</th>
+    <th>Bilangan Pembiayaan</th>
+    <th>Berat</th>
+    <th>Nilai Marhun</th>
+    <th>Baki Pembiayaan</th>
+    <th>Pembiayaan</th>
+    <th>Upah Belum Bayar</th>
     <th>Total Untung 1% Percent</th>
     <th>Total Ujrah</th>
   </thead>
   @foreach($stokAudit as $item)
     <tr>
       <td>{{$item['cawangan']}}</td>
-      <td>{{ $item['jumlah_pinjaman'] }}</td>
-      <td>{{ number_format($item['total_pinjaman'],2) }}</td>
-      <td>{{ number_format($item['total_berat'],2) }}</td>
-      <td>{{ number_format($item['total_nilai_marhun'],2) }}</td>
-      <td>{{ number_format($item['total_baki_pinjaman'],2) }}</td>
-      <td>{{ number_format($item['total_upah_belum_bayar'],2) }}</td>
+      <td>{{ $item['bilangan_pembiayaan'] }}</td>
+      <td>{{ number_format($item['berat'],2) }}</td>
+      <td>{{ number_format($item['nilai_marhun'],2) }}</td>
+      <td>{{ number_format($item['baki_pembiayaan'],2) }}</td>
+      <td>{{ number_format($item['pembiayaan'],2) }}</td>
+      <td>{{ number_format($item['upah_belum_bayar'],2) }}</td>
       <td>{{ number_format($item['total_utg_onepercent'],2) }}</td>
       <td>{{ number_format($item['total_ujrah'],2) }}</td>
     </tr>