From b0b7d3a8ee796e662cc4227e9e7660ee73e3b109 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Thu, 15 Dec 2022 14:57:33 +0800
Subject: [PATCH] update laporan lelongan

---
 app/Http/Controllers/ReportController.php  | 6 +++---
 resources/views/pdf/pdflaplelong.blade.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 907bc39d..d276938f 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -444,8 +444,8 @@ class ReportController extends Controller
         ->where('lelongbid.lelong_id','=',$lelong_id)        
         ->where('lelongbidder.status_bidder','=','1')
         ->where('lelongbid.kodcaw',$kodcaw)
-        ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan',
-        'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder','bakiupah')
+        ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.bakiupah',
+        'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder')
         ->get()->toArray();
 
         foreach($laporanlelong as $index1=>$laplelong)
@@ -476,7 +476,7 @@ class ReportController extends Controller
                                  
             $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun'];
             $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman'];
-            $total_upahsimpan = $total_upahsimpan + $laplelong['upahsimpan'];
+            $total_upahsimpan = $total_upahsimpan + $laplelong['bakiupah'];
             $total_cajlelong = $total_cajlelong + $laplelong['cajlelong'];
             $total_hargalelong = $total_hargalelong + $laplelong['hargabida'];
             $total_bakirugi = $total_bakirugi + $laplelong['baki'];
diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php
index 465ca9e9..3355d3f8 100644
--- a/resources/views/pdf/pdflaplelong.blade.php
+++ b/resources/views/pdf/pdflaplelong.blade.php
@@ -180,7 +180,7 @@ tr:nth-child(even) {
                     <td align="right">{{ number_format($laporan['laplelong']['nilaimarhun'], 2, '.', ',')}}</td>
                     <td align="right">{{ number_format($laporan['laplelong']['pinjaman'], 2, '.', ',')}}</td>
                     <td align="right">{{ number_format($laporan['margin'], 2, '.', ',')}}</td>
-                    <td align="right">{{ number_format($laporan['laplelong']['upahsimpan'], 2, '.', ',')}}</td>
+                    <td align="right">{{ number_format($laporan['laplelong']['bakiupah'], 2, '.', ',')}}</td>
                     <td align="right">{{ number_format($laporan['laplelong']['cajlelong'], 2, '.', ',')}}</td>
                     <td align="right">{{ number_format($laporan['laplelong']['hargabida'], 2, '.', ',')}}</td>