From b4230fef9e70d8b448579aed69bb86e633667eda Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Wed, 29 Jun 2022 10:26:07 +0800
Subject: [PATCH] update kemaskini keuntungan dalam kemaskini data

---
 app/Http/Controllers/LelongController.php   | 11 ++++++++---
 app/Http/Controllers/SimulasiController.php |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 7a08cbf4..c07e9ee0 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -1813,17 +1813,22 @@ class LelongController extends Controller
             $query->select('norujukan')
                   ->from('gadai');
         })
-        ->select('gadai.norujukan','gadai.tempoh')
+        ->select('gadai.norujukan','gadai.tempoh','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.tempoh','gadai.ansakhir','gadai.tempohbayar','gadai.kadarupah','gadai.bakiupah')
         ->get()->toArray();
         // dd($senaraisagtempoh);
 
-        foreach($senaraisagtempoh as $datatempoh)
+        foreach($senaraisagtempoh as $index1=>$datatempoh)
         {
+             //kemaskini keuntungan baru
+            $keuntungan = $datatempoh['bakipjm'] - ($datatempoh['bakihargajualan'] - ($datatempoh['upah12'] - $datatempoh['ansakhir'])-(($datatempoh['tempoh']-$datatempoh['tempohbayar'])*$datatempoh['kadarupah']/100*$datatempoh['bakipjm']) );
+            $senaraisagtempoh[$index1]['keuntungan'] = $keuntungan;
+
             // dd($data['norujukan']);
             $updatetempoh = LelongBid::where('norujukan', $datatempoh['norujukan'])
                             ->where('lelong_id', $lelong_id)
                             ->first();
             $updatetempoh->jbg = $datatempoh['tempoh'];
+            $updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
             $updatetempoh->update();
              //insert loguser
              $loguser = new LogUser;
@@ -1832,7 +1837,7 @@ class LelongController extends Controller
              $loguser->username = $user->username;
              $loguser->nama_user = $user->name;
              $loguser->norujukan = $datatempoh['norujukan'];
-             $loguser->nota = ' Kemaskini Tempoh '.$lelong_id;
+             $loguser->nota = ' Kemaskini Tempoh '.$lelong_id.' Keuntungan:'.$datatempoh['bakiupah'].' to '.bcdiv($keuntungan,1,1);
              $loguser->save();
         } 
 
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 7bf8f626..219ed235 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -1117,7 +1117,7 @@ class SimulasiController extends Controller
             
         } 
 
-        $data1 = [];
+        $datatempoh = [];
         $senaraisagtempoh = SimulasiBid::join('gadai','gadai.norujukan','=','simulasibid.norujukan')
         ->where('simulasibid.simulasi_id', $simulasi_id)
         ->whereIn('simulasibid.norujukan', function($query) {