update thousand seperator semakan marhun dan update taglel selepas tangguh lelong

app/Http/Controllers/MarhunController.php

@@ -11,7 +11,7 @@ use PDF;
 use App\Models\Cawangan;
 use App\Models\JenisEmas;
 use App\Models\JenisKarat;
-
+use App\Models\Gadai;
 use App\Models\Lelong;
 use App\Models\CawanganLelong;
 use App\Models\LelongBid;
@@ -522,6 +522,7 @@ class MarhunController extends Controller
         {
 
             $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            
             ->where('lelong_id',$info['lelong_id'])
             ->get()
             ->toArray();
@@ -591,6 +592,7 @@ class MarhunController extends Controller
                     'lelongbid.jbg',
                     'lelongbid.kadarupah',
                     'lelongbid.upahsimpan',
+                    'lelongbid.bakiupah',
                     'lelongbid.ansuran',
                     'lelongbid.nilaimarhun',
                     'lelongbid.pinjaman',
@@ -610,7 +612,10 @@ class MarhunController extends Controller
             ->where('id', $lelbidmarhun->lelongbidmarhun_id)
             ->get()->toArray();
             
-            $lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->where('lelong_id', $id)->first();
+            $lelongbid = LelongBid::where('lelongbid.id', $lelbidmarhun->lelongbid_id)
+            ->where('lelongbid.lelong_id', $id)
+            ->first();
+            
             $karat = Lelkarat::where('lelong_id', $id)->get();
     
             foreach($marhuns as $index1=>$marhun)
@@ -624,13 +629,18 @@ class MarhunController extends Controller
                 ->where('norujukan', $lelongbid->norujukan) 
                 ->first();
 
-                if($lelongbid->baki > 0)
+                $lelong = Lelong::where('id',$id)->get();
+                $sumcajlelong =  $lelongbid->hargaasas * ($lelong[0]['cajlelong']/100);
+                //$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+                $totalbaki = $lelongbid->hargaasas - $lelongbid->pinjaman - $lelongbid->bakiupah - bcdiv($sumcajlelong,1,1);
+                //dd($totalbaki);
+                if($totalbaki > 0)
                 {
-                    $bakilelong = $bakilelong + $lelongbid->baki; 
+                    $bakilelong = $totalbaki; 
                 }
                 else
                 {
-                    $rugilelong = $rugilelong - $lelongbid->baki;
+                    $rugilelong = $totalbaki;
                 }
                 
                 $marhuns[$index1]['harga_gadai'] = $gadaimarhun->harga;
@@ -638,6 +648,7 @@ class MarhunController extends Controller
                 $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun;
                 $marhuns[$index1]['status_ubah'] = $status;
                 $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
+                $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah;
                 $marhuns[$index1]['baki_lelong'] = $bakilelong;
                 $marhuns[$index1]['rugi_lelong'] = $rugilelong;
             }
@@ -724,6 +735,10 @@ class MarhunController extends Controller
                 $tangguhlelong->ditangguh_pada = $currentdate;
                 $tangguhlelong->nota = $request->nota;
                 $tangguhlelong->save();
+
+                $updategadai = Gadai::where('norujukan','=',$request->norujukan)->first();
+                $updategadai->taglel = 0;
+                $updategadai->update();  
                     
                 $marhundelete = LelongBid::where('id', $request->lelongbid_id)->delete();
             }

app/Http/Controllers/SimulasiController.php

@@ -240,7 +240,7 @@ class SimulasiController extends Controller
         $arrayinfo = [];
 
         $simulasi = Simulasi::join('cawangan_simulasi','simulasi.id','=','cawangan_simulasi.simulasi_id')
-        ->select('simulasi_id','tarikh_lelong', 'simulasi.fasa')
+        ->select('simulasi_id','tarikh_lelong', 'simulasi.fasa','simulasi.harga_emas_asas')
         ->groupBy('simulasi_id')
         ->get()
         ->toArray();