From b78bf7c56c17fcd6ec2a31a47c079db927ba6af5 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Thu, 2 Jun 2022 14:58:53 +0800
Subject: [PATCH] update show lelong

---
 app/Http/Controllers/LelongController.php   | 11 ++++++++---
 resources/views/lelong/showlelong.blade.php |  6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 2282c9a2..a4a85d25 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -113,12 +113,14 @@ class LelongController extends Controller
         $total_upahkeuntungan2 = 0;
         $total_nilaimarhun = 0;
         $nilai_marhun = 0;
+        $totalkeuntungan = 0;
+        $totalkeuntungan2 = 0;
 
         foreach($cawanganlel as $cawlel)
         {
             $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
             $databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
-            ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar')
+            ->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar')
             ->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
             
             // dd($databid->toArray());
@@ -146,7 +148,7 @@ class LelongController extends Controller
                 $databid[$index1]['keuntungan'] = $keuntungan;
 
                 $total_upahkeuntungan =  bcdiv($total_upahkeuntungan,1,1) + bcdiv($keuntungan,1,1);
-                
+                $totalkeuntungan =  $totalkeuntungan + $bid['bakiupah'];
                 
                 if($bid['baki'] > 0)
                 {
@@ -214,6 +216,7 @@ class LelongController extends Controller
                 'n_marhun'=>$nilai_marhun,
                 'pinjaman'=>$pinjaman,
                 'upahsimpan'=>bcdiv($total_upahkeuntungan,1,1),
+                'bakiupah'=>$totalkeuntungan,
                 'hargaasas'=>$hargaasas,
                 'cajlelong'=>$cajlelong,
                 'rugilelong'=>$rugilelong,
@@ -230,6 +233,7 @@ class LelongController extends Controller
             $total_rugilelong = $total_rugilelong + $rugilelong;
             $total_bakilelong = $total_bakilelong + $bakilelong;
             $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
+            $totalkeuntungan2 = $totalkeuntungan2 + $totalkeuntungan;
 
 
             $data = Lelong::where('lelong.id','=',$lelong_id)
@@ -266,7 +270,8 @@ class LelongController extends Controller
                                                 'keuntungan',
                                                 'total_upahkeuntungan',
                                                 'total_nilaimarhun',
-                                                'total_upahkeuntungan2'));
+                                                'total_upahkeuntungan2',
+                                                'totalkeuntungan2'));
     }
 
     public function create($id)
diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php
index 4672b458..1e90b92d 100644
--- a/resources/views/lelong/showlelong.blade.php
+++ b/resources/views/lelong/showlelong.blade.php
@@ -27,7 +27,7 @@
                                         <td>Bilangan Lelong : {{$total_marhun}}</td>
                                     </tr>
                                     <tr>
-                                        <td>Nilai Marhun Keseluruhan : RM{{ number_format($total_nmarhun, 2, '.', ',') }}</td>
+                                        <td>Nilai Marhun Keseluruhan : RM{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
                                     </tr>
                                     <tr>
                                         <td>Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',')  }}</td>
@@ -97,7 +97,7 @@
                                     <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
-                                    <td>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['bakiupah'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
@@ -112,7 +112,7 @@
                                     <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
                                     <td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
                                     <td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_upahkeuntungan2, 2, '.', ',') }}</td>
+                                    <td>{{ number_format($totalkeuntungan2, 2, '.', ',') }}</td>
                                     <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
                                     <td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
                                     <td>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>