diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index e70aa5b4..dd95e54e 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -55,7 +55,7 @@ class LelongController extends Controller
         $arrayinfo = [];
 
         $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('fasa','lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->groupBy('lelong_id')
         ->get()
         ->toArray();
@@ -113,23 +113,27 @@ 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());
             $packet = 0;
             $berat = 0;
             $pinjaman =0;
+            $nilai_marhun = 0;
             $upah = 0;
             $hargaasas = 0;
             $cajlelong = 0;
             $rugilelong = 0;
             $bakilelong = 0;
+            $totalkeuntungan = 0;
 
             foreach($databid as $index1=>$bid)
             {
@@ -146,7 +150,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 +218,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 +235,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 +272,8 @@ class LelongController extends Controller
                                                 'keuntungan',
                                                 'total_upahkeuntungan',
                                                 'total_nilaimarhun',
-                                                'total_upahkeuntungan2'));
+                                                'total_upahkeuntungan2',
+                                                'totalkeuntungan2'));
     }
 
     public function create($id)
@@ -281,6 +288,7 @@ class LelongController extends Controller
         $lelong->harga_emas_asas = $simulasi->harga_emas_asas;
         $lelong->jbg = $simulasi->jbg;
         $lelong->cajlelong = $simulasi->cajlelong;
+        $lelong->fasa = $simulasi->fasa;
         $lelong->save();
         
        
@@ -315,65 +323,102 @@ class LelongController extends Controller
             $caw_lelong->save();
 
             $datasimbid = SimulasiBid::where('caw_id','=',$caw->caw_id)->where('simulasi_id',$id)->get();
-            
-            foreach ($datasimbid as $simulasibid ) {
-                $lelongbid = new LelongBid;
-                $lelongbid->lelong_id = $lelong->id;
-                $lelongbid->caw_id = $simulasibid->caw_id;
-                $lelongbid->kodcaw =$simulasibid->kodcaw;
-                $lelongbid->norujukan =$simulasibid->norujukan;
-                $lelongbid->t_lelong =$simulasibid->t_lelong;
-                $lelongbid->hargaasas =$simulasibid->hargaasas;
-                $lelongbid->hargajual =$simulasibid->hargajual;
-                $lelongbid->t_jual =$simulasibid->t_jual;
-                $lelongbid->nopembeli =$simulasibid->nopembeli;
-                $lelongbid->jbg =$simulasibid->jbg;
-                $lelongbid->kadarupah =$simulasibid->kadarupah;
-                $lelongbid->upahsimpan =$simulasibid->upahsimpan;
-                $lelongbid->ansuran =$simulasibid->ansuran;
-                $lelongbid->nilaimarhun =$simulasibid->nilaimarhun;
-                $lelongbid->pinjaman =$simulasibid->pinjaman;
-                $lelongbid->bakiupah =$simulasibid->bakiupah;
-                $lelongbid->cajlain =$simulasibid->cajlain;
-                $lelongbid->cajlelong =$simulasibid->cajlelong;
-                $lelongbid->baki =$simulasibid->baki;
-                $lelongbid->berat =$simulasibid->berat;
-                $lelongbid->marhun =$simulasibid->marhun;
-                $lelongbid->percent =$simulasibid->percent;
-                $lelongbid->status_jual =$simulasibid->status_jual;
-                $lelongbid->status_payment =$simulasibid->status_payment;
-                $lelongbid->mora_upah =$simulasibid->mora_upah;
-                $lelongbid->save();
-                if($lelongbid->save())
+            $suratcaw = $datasimbid->all();
+            // foreach ($datasimbid as $simulasibid ) {
+            //     $lelongbid = new LelongBid;
+            //     $lelongbid->lelong_id = $lelong->id;
+            //     $lelongbid->caw_id = $simulasibid->caw_id;
+            //     $lelongbid->kodcaw =$simulasibid->kodcaw;
+            //     $lelongbid->norujukan =$simulasibid->norujukan;
+            //     $lelongbid->t_lelong =$simulasibid->t_lelong;
+            //     $lelongbid->hargaasas =$simulasibid->hargaasas;
+            //     $lelongbid->hargajual =$simulasibid->hargajual;
+            //     $lelongbid->t_jual =$simulasibid->t_jual;
+            //     $lelongbid->nopembeli =$simulasibid->nopembeli;
+            //     $lelongbid->jbg =$simulasibid->jbg;
+            //     $lelongbid->kadarupah =$simulasibid->kadarupah;
+            //     $lelongbid->upahsimpan =$simulasibid->upahsimpan;
+            //     $lelongbid->ansuran =$simulasibid->ansuran;
+            //     $lelongbid->nilaimarhun =$simulasibid->nilaimarhun;
+            //     $lelongbid->pinjaman =$simulasibid->pinjaman;
+            //     $lelongbid->bakiupah =$simulasibid->bakiupah;
+            //     $lelongbid->cajlain =$simulasibid->cajlain;
+            //     $lelongbid->cajlelong =$simulasibid->cajlelong;
+            //     $lelongbid->baki =$simulasibid->baki;
+            //     $lelongbid->berat =$simulasibid->berat;
+            //     $lelongbid->marhun =$simulasibid->marhun;
+            //     $lelongbid->percent =$simulasibid->percent;
+            //     $lelongbid->status_jual =$simulasibid->status_jual;
+            //     $lelongbid->status_payment =$simulasibid->status_payment;
+            //     $lelongbid->mora_upah =$simulasibid->mora_upah;
+            //     $lelongbid->fasa =$simulasibid->fasa;
+            //     $lelongbid->save();
+            //dd($suratcaw);
+                foreach(array_chunk($suratcaw,100) as $data_chunk)
                 {
-                    $updategadai = Gadai::where('norujukan','=',$simulasibid->norujukan)->first();
-                    $updategadai->taglel = 1;
-                    $updategadai->save();
-                }
+                    //dd($data);
+                    foreach($data_chunk as $data)
+                   {
+                            //dd($simulasi->id);
+                            $lelongbid = LelongBid::create([
+                                "lelong_id" => $lelong->id,
+                                "caw_id" => $data->caw_id,
+                                "kodcaw" => $data->kodcaw,
+                                "norujukan" => $data->norujukan,
+                                "t_lelong" => $data->t_lelong,
+                                "hargaasas" => $data->hargaasas,
+                                "hargajual" => 0.00,
+                                "jbg" => $data->jbg,
+                                "kadarupah" => $data->kadarupah,
+                                "ansuran" => $data->ansuran,
+                                "nilaimarhun" => $data->nilaimarhun,
+                                "pinjaman" => $data->pinjaman,
+                                "bakiupah" => $data->bakiupah,
+                                "upahsimpan" => $data->bakiupah,
+                                "cajlain" =>  $data->cajlain,
+                                "cajlelong" => 0.00,
+                                "baki" => 0.00,
+                                "berat" => $data->berat,
+                                "marhun" => $data->marhun,
+                                "percent" => $data->percent,
+                                "status_jual" => 0,
+                                "status_payment" => 0,
+                                "mora_upah" => 0,
+                                "fasa" => $data->fasa        
+                            ]);
 
-                $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$simulasibid->id)->get();
-                foreach($simulasibidmarhun as $simbidmarhun)
-                {
-                    $lelongbidmarhun = new LelongBidMarhun;
-                    $lelongbidmarhun->lelongbid_id = $lelongbid->id;
-                    $lelongbidmarhun->bil = $simbidmarhun->bil;
-                    $lelongbidmarhun->marhun = $simbidmarhun->marhun;
-                    $lelongbidmarhun->nota = $simbidmarhun->nota;
-                    $lelongbidmarhun->old_karat = $simbidmarhun->karat;
-                    $lelongbidmarhun->old_berat = $simbidmarhun->berat;
-                    $lelongbidmarhun->old_harga = $simbidmarhun->harga;
-                    $lelongbidmarhun->old_nmarhun = $simbidmarhun->n_marhun;
-                    $lelongbidmarhun->old_hargaasas = $simbidmarhun->hargaasas;
-                    $lelongbidmarhun->karat = $simbidmarhun->karat;
-                    $lelongbidmarhun->berat = $simbidmarhun->berat;
-                    $lelongbidmarhun->harga = $simbidmarhun->harga;
-                    $lelongbidmarhun->n_marhun = $simbidmarhun->n_marhun;
-                    $lelongbidmarhun->hargaasas = $simbidmarhun->hargaasas;
-                    $lelongbidmarhun->save();
 
+                        if($lelongbid->save())
+                        {
+                            $updategadai = Gadai::where('norujukan','=', $data->norujukan)->first();
+                            $updategadai->taglel = 1;
+                            $updategadai->save();
+                        }
+
+                        $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$data->id)->get();
+                        foreach($simulasibidmarhun as $simbidmarhun)
+                        {
+                            $lelongbidmarhun = new LelongBidMarhun;
+                            $lelongbidmarhun->lelongbid_id = $lelongbid->id;
+                            $lelongbidmarhun->bil = $simbidmarhun->bil;
+                            $lelongbidmarhun->marhun = $simbidmarhun->marhun;
+                            $lelongbidmarhun->nota = $simbidmarhun->nota;
+                            $lelongbidmarhun->old_karat = $simbidmarhun->karat;
+                            $lelongbidmarhun->old_berat = $simbidmarhun->berat;
+                            $lelongbidmarhun->old_harga = $simbidmarhun->harga;
+                            $lelongbidmarhun->old_nmarhun = $simbidmarhun->n_marhun;
+                            $lelongbidmarhun->old_hargaasas = $simbidmarhun->hargaasas;
+                            $lelongbidmarhun->karat = $simbidmarhun->karat;
+                            $lelongbidmarhun->berat = $simbidmarhun->berat;
+                            $lelongbidmarhun->harga = $simbidmarhun->harga;
+                            $lelongbidmarhun->n_marhun = $simbidmarhun->n_marhun;
+                            $lelongbidmarhun->hargaasas = $simbidmarhun->hargaasas;
+                            $lelongbidmarhun->save();
+
+                        }
+                    }
                 }
-            }
-         }
+        }
 
         return redirect()->route('analisa.senaraisimulasi')
                         ->with('success','Create Lelong Berjaya');
@@ -465,10 +510,14 @@ class LelongController extends Controller
         }
 
         //update marhun
-        $lelongbid = LelongBid::where('lelong_id','=',$request->idlelong)->get();
+        $lelongbid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
+        ->select('lelongbid.id','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.tempohbayar','gadai.kadarupah','gadai.norujukan','lelongbid.lelong_id')
+        ->where('lelong_id','=',$request->idlelong)
+        ->get();
 
-        foreach($lelongbid as $bid)
+        foreach($lelongbid as $index1=>$bid)
         {
+            $keuntungan = $bid['bakipjm'] - ($bid['bakihargajualan'] - ($bid['upah12'] - $bid['ansakhir'])-(($bid['tempoh']-$bid['tempohbayar'])*$bid['kadarupah']/100*$bid['bakipjm']) );
             $sumhargaasas = 0;
             $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id','=',$bid->id)->get();
             foreach($lelongbidmarhun as $marhun)
@@ -491,15 +540,25 @@ class LelongController extends Controller
                         $marhun->save();
                     }
                 }
+                $karat916 = LelKarat::where('karat','=',"22.0K")->get();
+                //dd($karat916);
+                foreach($karat916 as $k916)
+                {
+                    
+                    $updatelelong = Lelong::where('id',$request->idlelong)
+                      ->update([
+                          'harga_emas_asas'=> $k916->harga2,
+                               ]);
+                }
             }
-
             $lelong = Lelong::where('id',$request->idlelong)->get();
-            $bid->hargaasas = $sumhargaasas;
             $sumcajlelong = $sumhargaasas * ($lelong[0]['cajlelong']/100);
-            $bid->cajlelong = bcdiv($sumcajlelong,1,1);
-            $bid->baki = $sumhargaasas-$bid->pinjaman - $bid->bakiupah - $sumcajlelong;
-            $bid->save();
-            
+            $totalbaki = $sumhargaasas -$bid->bakipjm - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1);
+            $kirakeuntungan = LelongBid::where('norujukan',$bid['norujukan'])
+            ->update([
+                'bakiupah'=> bcdiv($keuntungan,1,1),
+                'hargaasas'=> $sumhargaasas
+                      ]);
         }
 
         return redirect()->route('lelong.show',$request->idlelong)
@@ -835,6 +894,7 @@ class LelongController extends Controller
             'lelongbid.upahsimpan',
             'lelongbid.cajlelong',
             'lelongbid.baki',
+            'lelongbid.bakiupah',
             'lelongbid.status_jual',
             'lelongbid.jbg',
             'gadai.bakipjm',
@@ -866,13 +926,11 @@ class LelongController extends Controller
         {
             $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$laporan['lelong_id'])
+            ->where('caw_id',$cawid)
             ->get()
             ->toArray();
             array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
         }
-
-
-        
         return view('lelong.senaraimarhun',compact('marhuns','lelongid','cawid','arrayinfo'));
     }
 
@@ -1280,6 +1338,284 @@ class LelongController extends Controller
         return $pdf->download('Laporan Barang Lelong Pembida.pdf');
         
     }
+
+    public function showsimulasi($id)
+    {
+        $lelong_id = $id;
+        $lelong = Lelong::where('id','=',$id)->first();
+        $cawanganlel = CawanganLelong::where('lelong_id','=',$id)->get();
+        $lelkarat = LelKarat::where('lelong_id','=',$id)->get();
+        $jeniskarat = JenisKarat::all();
+
+        $arraydata = [];
+        $arraycaw = [];
+        $data = [];
+
+        $total_marhun = 0;
+        $total_berat = 0;
+        $total_nmarhun = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_cazlelong = 0;
+        $total_rugilelong = 0;
+        $total_bakilelong = 0;
+
+        $total24Kgb = 0;
+        $total24K = 0;
+        $total23k = 0;
+        $total22K = 0;
+        $total21K = 0;
+        $total20K = 0;
+        $total18Kp = 0;
+        $total18K = 0;
+        $total14Kp = 0;
+        $total14K = 0;
+        $total9K = 0;
+
+        $keuntungan = 0;
+        $total_upahkeuntungan = 0;
+        $total_upahkeuntungan2 = 0;
+        $total_nilaimarhun = 0;
+        $nilai_marhun = 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.t_lelong','lelongbid.bakiupah','lelongbid.hargaasas','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());
+            $packet = 0;
+            $berat = 0;
+            $pinjaman =0;
+            $nilai_marhun = 0;
+            $upah = 0;
+            $hargaasas = 0;
+            $cajlelong = 0;
+            $rugilelong = 0;
+            $bakilelong = 0;
+            $cajlelong = 0;
+            $totalkeuntungan = 0;
+
+            foreach($databid as $index1=>$bid)
+            {
+                $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get();
+                $berat = $berat + $bid['berat']; 
+                $nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
+                $pinjaman =$pinjaman + $bid['pinjaman'];
+                // $upah = $upah + $bid['upah'];
+                $hargaasas = $hargaasas + $bid['hargaasas'];
+                $cajlelong = $cajlelong + $bid['cajlelong'];
+
+                 
+                $keuntungan = $bid['bakipjm'] - ($bid['bakihargajualan'] - ($bid['upah12'] - $bid['ansakhir'])-(($bid['tempoh']-$bid['tempohbayar'])*$bid['kadarupah']/100*$bid['bakipjm']) );
+                $databid[$index1]['keuntungan'] = $keuntungan;
+
+                $total_upahkeuntungan =  bcdiv($total_upahkeuntungan,1,1) + bcdiv($keuntungan,1,1);
+                $totalkeuntungan =  $totalkeuntungan + $bid['bakiupah'];
+
+                $lelongsim = Lelong::where('id',$id)->get();
+                $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
+                $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+                $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1);
+                //dd($sumcajlelong);
+                if($totalbaki > 0)
+                {
+                    $bakilelong = $bakilelong + $totalbaki;  
+                }
+                else
+                {
+                    $rugilelong = $rugilelong - $totalbaki;
+                }
+                
+                
+                $total24Kgb += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','24.0Kgb')
+                                            ->sum('berat');
+                
+                $total24K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','24.0K')
+                                            ->sum('berat');
+                                            
+                $total23k += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','23.0K')
+                                            ->sum('berat');
+                                            
+                $total22K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','22.0K')
+                                            ->sum('berat');
+                                            
+                $total21K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','21.0K')
+                                            ->sum('berat');
+                                            
+                $total20K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','20.0K')
+                                            ->sum('berat');
+                                            
+                $total18Kp += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','18.0Kp')
+                                            ->sum('berat');
+                                            
+                $total18K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','18.0K')
+                                            ->sum('berat');
+                                            
+                $total14Kp += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','14.0Kp')
+                                            ->sum('berat');
+                                            
+                $total14K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','14.0K')
+                                            ->sum('berat');
+                                            
+                $total9K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','9.0K')
+                                            ->sum('berat');
+                            
+                            
+                
+            }
+            array_push($arraycaw,[
+                'id_cawangan'=> $cawangan['id'],
+                'cawangan'=>$cawangan['caw_name'],
+                't_lelong'=>$lelong['tarikh_lelong'],
+                'bil_marhun'=>sizeof($databid),
+                'berat'=>$berat,
+                'n_marhun'=>$nilai_marhun,
+                'pinjaman'=>$pinjaman,
+                'upahsimpan'=>bcdiv($total_upahkeuntungan,1,1),
+                'bakiupah'=>$totalkeuntungan,
+                'hargaasas'=>$hargaasas,
+                'cajlelong'=>$cajlelong,
+                'rugilelong'=>$rugilelong,
+                'bakilelong'=>$bakilelong,
+            ]);
+            //dd($bakilelong);
+            $total_upahkeuntungan2 = $total_upahkeuntungan2 + $total_upahkeuntungan;
+            $total_marhun = $total_marhun + sizeof($databid);
+            $total_berat = $total_berat + $berat;
+            $total_pinjaman = $total_pinjaman + $pinjaman;
+            $total_upah = $total_upah + 0;
+            $total_hargaasas = $total_hargaasas  + $hargaasas;
+            $total_cazlelong = $total_cazlelong + $cajlelong;
+            $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)
+            ->get();
+        }
+
+
+        return view('lelong.showsimulasi',compact(
+                                                'arraycaw',
+                                                'total_marhun',
+                                                'total_berat',
+                                                'total_nmarhun',
+                                                'total_pinjaman',
+                                                'total_upah',
+                                                'total_hargaasas',
+                                                'total_cazlelong',
+                                                'total_rugilelong',
+                                                'total_bakilelong',
+                                                'total24Kgb',
+                                                'total24K',
+                                                'total23k',
+                                                'total22K',
+                                                'total21K',
+                                                'total20K',
+                                                'total18Kp',
+                                                'total18K',
+                                                'total14Kp',
+                                                'total14K',
+                                                'total9K',
+                                                'lelkarat',
+                                                'lelong_id',
+                                                'jeniskarat',
+                                                'data',
+                                                'keuntungan',
+                                                'total_upahkeuntungan',
+                                                'total_nilaimarhun',
+                                                'total_upahkeuntungan2',
+                                                'totalkeuntungan2'));
+    }
+
+    public function senaraimarhunsimulasi($lelongid, $cawid){
+        // $marhun = LelongBid::->get();
+
+        $keuntungan = 0;
+        
+
+        $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
+        ->join('gadai','lelongbid.norujukan','=','gadai.norujukan')
+        ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
+        ->select(
+            'lelongbid.t_lelong',
+            'lelongbid.kodcaw',
+            'cawangan.caw_name',
+            'lelongbid.norujukan',
+            'lelongbid.pinjaman',
+            'lelongbid.berat',
+            'lelongbid.nilaimarhun',
+            'lelongbid.hargaasas',
+            'lelongbid.upahsimpan',
+            'lelongbid.cajlelong',
+            'lelongbid.baki',
+            'lelongbid.bakiupah',
+            'lelongbid.status_jual',
+            'lelongbid.jbg',
+            'gadai.bakipjm',
+            'gadai.bakihargajualan',
+            'gadai.upah12',
+            'gadai.ansakhir',
+            'gadai.tempoh',
+            'gadai.tempohbayar',
+            'gadai.kadarupah'
+        )
+        ->get()->toArray();
+
+        foreach ($marhuns as $index1=> $cal) {
+            
+            $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
+            $marhuns[$index1]['keuntungan'] = bcdiv($keuntungan,1,1); 
+
+            $simulasilel = Lelong::where('id',$lelongid)->get();
+            $sumcajlelong =  $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100);
+            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1);
+
+            $marhuns[$index1]['cajlelong'] =  bcdiv($sumcajlelong,1,1);
+            $marhuns[$index1]['baki'] =  $totalbaki;
+        }
+
+        $arrayinfo = [];
+
+        $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->where('cawangan_lelong.lelong_id','=',$lelongid)
+        ->select('lelong_id','tarikh_lelong')
+        ->groupBy('lelong_id')
+        ->get()->toArray();
+
+
+        foreach($lelong_id as $laporan)
+        {
+            $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$laporan['lelong_id'])
+            ->where('caw_id',$cawid)
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
+        }
+        return view('lelong.senaraimarhunsimulasi',compact('marhuns','lelongid','cawid','arrayinfo'));
+    }
+
  
 }
        
\ No newline at end of file
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 378412d6..fa036bf9 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/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;
@@ -316,6 +316,7 @@ class MarhunController extends Controller
 
             $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$info['lelong_id'])
+            ->where('cawangan.caw_code', $user->kodcaw)
             ->get()
             ->toArray();
             array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
@@ -475,6 +476,7 @@ class MarhunController extends Controller
 
             $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$info['lelong_id'])
+            ->where('cawangan.caw_code', $user->kodcaw)
             ->get()
             ->toArray();
             array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
@@ -530,6 +532,7 @@ class MarhunController extends Controller
         {
 
             $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            
             ->where('lelong_id',$info['lelong_id'])
             ->get()
             ->toArray();
@@ -599,6 +602,7 @@ class MarhunController extends Controller
                     'lelongbid.jbg',
                     'lelongbid.kadarupah',
                     'lelongbid.upahsimpan',
+                    'lelongbid.bakiupah',
                     'lelongbid.ansuran',
                     'lelongbid.nilaimarhun',
                     'lelongbid.pinjaman',
@@ -618,7 +622,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();
     
             // dd($lelbidmarhuns);
@@ -634,13 +641,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;
                 }
                 
                 // if($gadaimarhun)
@@ -664,6 +676,14 @@ class MarhunController extends Controller
                 //     $marhuns[$index1]['rugi_lelong'] = 0;
                 // }
                 
+                // $marhuns[$index1]['harga_gadai'] = $gadaimarhun->harga;
+                // $marhuns[$index1]['nmarhun_gadai'] = $gadaimarhun->n_marhun;
+                // $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;
             }
             // dd($marhuns);
             array_push($arraylelbidmarhun,$marhuns);
@@ -749,6 +769,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();
             }
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 3b862e44..c39fb06a 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -64,6 +64,15 @@ class SimulasiController extends Controller
         $jbg = $request->jbg;
        // dd($fasa);
       // dd($fasa);
+       //create simulasi
+       $simulasi = new Simulasi;
+       $simulasi->tarikh_lelong = $request->tarikh_lelong;
+       $simulasi->harga_emas_asas = $request->hargaasas;
+       $simulasi->jbg = $request->jbg;
+       $simulasi->cajlelong = $request->cajlelong;
+       $simulasi->fasa = $request->fasa;
+       $simulasi->save();
+       $simulasi_id = $simulasi->id;
         $jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
         if($request->fasa == '1'){
             $surat = Gadai::where('t_gadai','<=',$jbgadai)
@@ -72,6 +81,8 @@ class SimulasiController extends Controller
                         ->where('tagpalsu2','=',0)
                         ->where('taglel','=',0)
                         ->where('lelong_tawarruq','=',1)
+                        ->select('kodcaw','norujukan','t_lelong','tempoh','kadarupah','upahSim','ansuran','nilaimarhun','pinjaman','bakiupah','cajlain',
+                        'berat','marhun','percentpinj','bakipjm')
                         ->get();   
         }
         else if($request->fasa == '2'){
@@ -80,6 +91,8 @@ class SimulasiController extends Controller
                         ->where('tagpalsu','=',0)
                         ->where('tagpalsu2','=',0)
                         ->where('taglel','=',0)
+                        ->select('kodcaw','norujukan','t_lelong','tempoh','kadarupah','upahSim','ansuran','nilaimarhun','pinjaman','bakiupah','cajlain',
+                        'berat','marhun','percentpinj','bakipjm')
                         ->get();   
           
         } 
@@ -90,14 +103,7 @@ class SimulasiController extends Controller
                         ->with('failed','Tiada surat untuk di lelong');
         }          
         $cawangan = Cawangan::all();
-        //create simulasi
-        $simulasi = new Simulasi;
-        $simulasi->tarikh_lelong = $request->tarikh_lelong;
-        $simulasi->harga_emas_asas = $request->hargaasas;
-        $simulasi->jbg = $request->jbg;
-        $simulasi->cajlelong = $request->cajlelong;
-        $simulasi->fasa = $request->fasa;
-        $simulasi->save();
+       
 
         //create harga asas berdasarkan input harga asas
         $karat = JenisKarat::all();
@@ -115,50 +121,56 @@ class SimulasiController extends Controller
 
         //$fasa = $request->fasa;
         // join cawangan yang terlibat dengan simulasi
-        if($request->caw && $request->caw == 'all')
+       if($request->caw && $request->caw != 'all')
         {
-            //dd($request->fasa);
-            foreach($cawangan as $key=>$caw)
-            {
-                
-                $caw_simulasi = new CawanganSimulasi;
-                $caw_simulasi->simulasi_id = $simulasi->id;
-                $caw_simulasi->caw_id = $caw->id;
-                $caw_simulasi->online = 'Online';
-                $caw_simulasi->lokasi = $caw->lokasi;
-                $caw_simulasi->fasa = $request->fasa;
-                $caw_simulasi->save();
+            //dd($request->caw);
+            $caw = Cawangan::whereIn('caw_code',$request->caw)->get();
+            // dd($caw);
+            foreach($caw as $index=>$cawsimulasi){ 
+                // dd($cawsimulasi->id);
+            $caw_simulasi = new CawanganSimulasi;
+            $caw_simulasi->simulasi_id = $simulasi->id;
+            $caw_simulasi->caw_id = $cawsimulasi->id;
+            $caw_simulasi->online = 'Online';
+            $caw_simulasi->lokasi = $cawsimulasi->lokasi;
+            $caw_simulasi->fasa = $request->fasa;
+            $caw_simulasi->save();
+            // dd($caw_simulasi);
+            
+            $suratcaw = $surat->where('kodcaw','=',$cawsimulasi->caw_code)->all();
 
-                $suratcaw = $surat->where('kodcaw','=',$caw->caw_code)->all();
-                // $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get();
-                foreach($suratcaw as $data)
+            // $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get();
+            foreach(array_chunk($suratcaw,100) as $data_chunk)
+            {
+                //dd($data);
+                foreach($data_chunk as $data)
                 {
-                    $simulasibid = new SimulasiBid;
-                    $simulasibid->simulasi_id = $simulasi->id;
-                    $simulasibid->caw_id = $caw->id;
-                    $simulasibid->kodcaw = $data->kodcaw;
-                    $simulasibid->norujukan = $data->norujukan;
-                    $simulasibid->t_lelong = $request->tarikh_lelong;
-                    $simulasibid->hargaasas = 0.00;
-                    $simulasibid->hargajual = 0.00;
-                    $simulasibid->jbg = $data->jbg;
-                    $simulasibid->kadarupah = $data->kadarupah;
-                    $simulasibid->upahsimpan = $data->upahSim;
-                    $simulasibid->ansuran = $data->ansuran;
-                    $simulasibid->nilaimarhun = $data->nilaimarhun;
-                    $simulasibid->pinjaman = $data->pinjaman;
-                    $simulasibid->bakiupah = $data->bakiupah;
-                    $simulasibid->cajlain = $data->cajlain;
-                    $simulasibid->cajlelong = 0.00;
-                    $simulasibid->baki = 0.00;
-                    $simulasibid->berat = $data->berat;
-                    $simulasibid->marhun = $data->marhun;
-                    $simulasibid->percent = $data->percentpinj;
-                    $simulasibid->status_jual = 0;
-                    $simulasibid->status_payment = 0;
-                    $simulasibid->mora_upah = 0;
-                    $simulasibid->fasa = $request->fasa;
-                    $simulasibid->save();
+                    $simulasibid = SimulasiBid::create([
+                        "simulasi_id" => $simulasi->id,
+                        "caw_id" => $cawsimulasi->id,
+                        "kodcaw" => $data->kodcaw,
+                        "norujukan" => $data->norujukan,
+                        "t_lelong" => $request->tarikh_lelong,
+                        "hargaasas" => 0.00,
+                        "hargajual" => 0.00,
+                        "jbg" => $data->tempoh,
+                        "kadarupah" => $data->kadarupah,
+                        "upahsimpan" => $data->upahSim,
+                        "ansuran" => $data->ansuran,
+                        "nilaimarhun" => $data->nilaimarhun,
+                        "pinjaman" => $data->bakipjm,
+                        "bakiupah" => $data->bakiupah,
+                        "cajlain" =>  $data->cajlain,
+                        "cajlelong" => 0.00,
+                        "baki" => 0.00,
+                        "berat" => $data->berat,
+                        "marhun" => $data->marhun,
+                        "percent" => $data->percentpinj,
+                        "status_jual" => 0,
+                        "status_payment" => 0,
+                        "mora_upah" => 0,
+                        "fasa" => $request->fasa        
+                    ]);
 
                     $sumhargaasas = 0;
                     $berat = 0;
@@ -166,6 +178,7 @@ class SimulasiController extends Controller
                     foreach($gadaimarhun as $marhun)
                     {
                         $simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
+                        // dd($simkarat);
                         foreach($simkarat as $karat)
                         {
                             
@@ -189,9 +202,9 @@ class SimulasiController extends Controller
                             }
                         }
 
-                        
-                    }
                     
+                    }
+                
 
                     // $calcaj = ($request->cajlelong/100)*$sumhargaasas;
                     // $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first();
@@ -200,108 +213,17 @@ class SimulasiController extends Controller
                     // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj;
                     // $updatesimbid->berat = $berat;
                     // $updatesimbid->save();  
+
+                    $updategadai = Gadai::where('norujukan','=',$data->norujukan)->first();
+                    $updategadai->taglel = 1;
+                    $updategadai->update();  
+                    // $updatesimbid->cajlelong = $calcaj;
+                    // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj;
+                    // $updatesimbid->berat = $berat;
+                    // $updatesimbid->save();  
                 }
             }
         }
-        elseif($request->caw && $request->caw != 'all')
-        {
-            //dd($request->caw);
-            $caw = Cawangan::whereIn('caw_code',$request->caw)->get();
-            // dd($caw);
-            foreach($caw as $index=>$cawsimulasi){ 
-                // dd($cawsimulasi->id);
-            $caw_simulasi = new CawanganSimulasi;
-            $caw_simulasi->simulasi_id = $simulasi->id;
-            $caw_simulasi->caw_id = $cawsimulasi->id;
-            $caw_simulasi->online = 'Online';
-            $caw_simulasi->lokasi = $cawsimulasi->lokasi;
-            $caw_simulasi->fasa = $request->fasa;
-            $caw_simulasi->save();
-            // dd($caw_simulasi);
-            
-            $suratcaw = $surat->where('kodcaw','=',$cawsimulasi->caw_code)->all();
-
-            // $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get();
-            foreach($suratcaw as $data)
-            {
-                $simulasibid = new SimulasiBid;
-                $simulasibid->simulasi_id = $simulasi->id;
-                $simulasibid->caw_id = $cawsimulasi->id;
-                $simulasibid->kodcaw = $data->kodcaw;
-                $simulasibid->norujukan = $data->norujukan;
-                $simulasibid->t_lelong = $request->tarikh_lelong;
-                $simulasibid->hargaasas = 0.00;
-                $simulasibid->hargajual = 0.00;
-                $simulasibid->jbg = $data->jbg;
-                $simulasibid->kadarupah = $data->kadarupah;
-                $simulasibid->upahsimpan = $data->upahSim;
-                $simulasibid->ansuran = $data->ansuran;
-                $simulasibid->nilaimarhun = $data->nilaimarhun;
-                $simulasibid->pinjaman = $data->pinjaman;
-                $simulasibid->bakiupah = $data->bakiupah;
-                $simulasibid->cajlain = $data->cajlain;
-                $simulasibid->cajlelong = 0.00;
-                $simulasibid->baki = 0.00;
-                $simulasibid->berat = $data->berat;
-                $simulasibid->marhun = $data->marhun;
-                $simulasibid->percent = $data->percentpinj;
-                $simulasibid->status_jual = 0;
-                $simulasibid->status_payment = 0;
-                $simulasibid->mora_upah = 0;
-                $simulasibid->fasa = $request->fasa;
-                $simulasibid->save();
-
-                $sumhargaasas = 0;
-                $berat = 0;
-                $gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get();
-                foreach($gadaimarhun as $marhun)
-                {
-                    $simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
-                    // dd($simkarat);
-                    foreach($simkarat as $karat)
-                    {
-                        
-                        if($karat->karat == $marhun->karat)
-                        {
-                            $val = round($marhun->berat * $karat->harga); 
-                            $sumhargaasas = $sumhargaasas + $val;
-                            $berat = $berat + $marhun->berat;
-
-                            $simmarhun = new SimulasiBidMarhun;
-                            $simmarhun->simulasibid_id = $simulasibid->id;
-                            $simmarhun->bil = $marhun->bil;
-                            $simmarhun->marhun = $marhun->marhun;
-                            $simmarhun->nota = $marhun->nota;
-                            $simmarhun->karat = $marhun->karat;
-                            $simmarhun->berat = $marhun->berat;
-                            $simmarhun->harga = $karat->harga;
-                            $simmarhun->n_marhun = $marhun->n_marhun;
-                            $simmarhun->hargaasas = $val;
-                            $simmarhun->save();
-                        }
-                    }
-
-                    
-                }
-                
-
-                // $calcaj = ($request->cajlelong/100)*$sumhargaasas;
-                // $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first();
-                // $updatesimbid->hargaasas = $sumhargaasas;
-                // $updatesimbid->cajlelong = $calcaj;
-                // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj;
-                // $updatesimbid->berat = $berat;
-                // $updatesimbid->save();  
-
-                $updategadai = Gadai::where('norujukan','=',$data->norujukan)->first();
-                $updategadai->taglel = 1;
-                $updategadai->save();  
-                // $updatesimbid->cajlelong = $calcaj;
-                // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj;
-                // $updatesimbid->berat = $berat;
-                // $updatesimbid->save();  
-            }
-        }
         }
         else
         {
@@ -318,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();
@@ -395,6 +317,7 @@ class SimulasiController extends Controller
         
             $keuntungan = 0;
             $total_upahkeuntungan = 0;
+            
            
             foreach($databid as $index1=>$bid)
             {
@@ -590,12 +513,17 @@ class SimulasiController extends Controller
         }
 
         //update marhun
-        $simulasibid = SimulasiBid::where('simulasi_id','=',$request->idsimulasi)->get();
-        
+        $simulasibid = SimulasiBid::join('gadai','simulasibid.norujukan','=','gadai.norujukan')
+        ->select('simulasibid.id','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.tempohbayar','gadai.kadarupah','gadai.norujukan','simulasibid.simulasi_id')
+        ->where('simulasi_id','=',$request->idsimulasi)
+        ->get();
+        //dd($simulasibid);
         foreach($simulasibid as $bid)
         {
+            $keuntungan = $bid['bakipjm'] - ($bid['bakihargajualan'] - ($bid['upah12'] - $bid['ansakhir'])-(($bid['tempoh']-$bid['tempohbayar'])*$bid['kadarupah']/100*$bid['bakipjm']) );
             $sumhargaasas = 0;
-            $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid->id)->get();
+            $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid['id'])->get();
+            // dd($simulasibidmarhun);
             foreach($simulasibidmarhun as $marhun)
             {
                 $simkarat = SimKarat::where('simulasi_id','=',$bid->simulasi_id)->get();
@@ -615,14 +543,30 @@ class SimulasiController extends Controller
                         $marhun->save();
                     }
                 }
+                $karat916 = SimKarat::where('karat','=',"22.0K")->get();
+                //dd($karat916);
+                foreach($karat916 as $k916)
+                {
+                    
+                    $updatesimulasi = Simulasi::where('id',$request->idsimulasi)
+                      ->update([
+                          'harga_emas_asas'=> $k916->harga2,
+                               ]);
+                }
+                // dd($sumhargaasas);
             }
-            $lelong = Simulasi::where('id',$request->idsimulasi)->get();
-            $bid->hargaasas = $sumhargaasas;
-            // $bid->baki = $sumhargaasas-$bid->pinjaman - $bid->bakiupah - $bid->cajlelong;
-            $sumcajlelong = $sumhargaasas * ($lelong[0]['cajlelong']/100);
-            $bid->cajlelong = bcdiv($sumcajlelong,1,1);
-            $bid->baki = $sumhargaasas-$bid->pinjaman - $bid->bakiupah - $sumcajlelong;
-            $bid->save();
+            $simulasi = Simulasi::where('id',$request->idsimulasi)->get();
+            $sumcajlelong = $sumhargaasas * ($simulasi[0]['cajlelong']/100);
+            $totalbaki = $sumhargaasas -$bid->bakipjm - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1);
+            $kirakeuntungan = SimulasiBid::where('norujukan',$bid['norujukan'])
+            ->update([
+                'bakiupah'=> bcdiv($keuntungan,1,1),
+                'hargaasas'=> $sumhargaasas,
+                'cajlelong'=> bcdiv($sumcajlelong,1,1),
+                'baki'=> $totalbaki,
+                      ]);
+           
+            //dd($sumcajlelong);
             
         }
 
@@ -831,7 +775,7 @@ class SimulasiController extends Controller
             'simulasibid.berat',
             'simulasibid.nilaimarhun',
             'simulasibid.hargaasas',
-            'simulasibid.upahsimpan',
+            'simulasibid.bakiupah',
             'simulasibid.cajlelong',
             'simulasibid.baki',
             'simulasibid.status_jual',
@@ -855,6 +799,7 @@ class SimulasiController extends Controller
             
             
         }
+      
         
         return view('simulasi.senaraimarhunlel',compact('marhuns','simulasi_id','cawid','keuntungan','cal'));
     }
diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php
index 304d1bbc..f167a401 100644
--- a/app/Models/LelongBid.php
+++ b/app/Models/LelongBid.php
@@ -12,7 +12,9 @@ class LelongBid extends Model
     protected $table = 'lelongbid';
 
     protected $fillable = [
+        'lelong_id',
         'caw_id',
+        'kodcaw',
         'norujukan',
         't_lelong',
         'hargaasas',
@@ -20,7 +22,7 @@ class LelongBid extends Model
         't_jual',
         'nopembeli',
         'jbg',
-        'kadarupdah',
+        'kadarupah',
         'upahsimpan',
         'ansuran',
         'nilaimarhun',
@@ -35,5 +37,6 @@ class LelongBid extends Model
         'status_jual',
         'status_payment',
         'mora_upah',
+        'fasa'
     ];
 }
diff --git a/app/Models/SimulasiBid.php b/app/Models/SimulasiBid.php
index 32787ab8..4ce3baf6 100644
--- a/app/Models/SimulasiBid.php
+++ b/app/Models/SimulasiBid.php
@@ -12,7 +12,9 @@ class SimulasiBid extends Model
     protected $table = 'simulasibid';
 
     protected $fillable = [
+        'simulasi_id',
         'caw_id',
+        'kodcaw',
         'norujukan',
         't_lelong',
         'hargaasas',
@@ -20,7 +22,7 @@ class SimulasiBid extends Model
         't_jual',
         'nopembeli',
         'jbg',
-        'kadarupdah',
+        'kadarupah',
         'upahsimpan',
         'ansuran',
         'nilaimarhun',
@@ -35,5 +37,6 @@ class SimulasiBid extends Model
         'status_jual',
         'status_payment',
         'mora_upah',
+        'fasa',
     ];
 }
diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php
index 6cf26509..d5a81fb5 100644
--- a/resources/views/lelong/senarailelong.blade.php
+++ b/resources/views/lelong/senarailelong.blade.php
@@ -18,6 +18,7 @@
                             <th>No</th>
                             <th>Lelong ID</th>
                             <th>Tarikh Lelong</th>
+                            <th>Fasa</th>
                             <th>Cawangan</th>
                             <th>Masa Tamat Lelong</th>
                             <th>Harga Emas Asas</th>
@@ -32,8 +33,13 @@
                         <tr>
                             <td>{{$loop->iteration}}</td>
                             <td>{{ $lel['info']['lelong_id'] }}</td>
-                            <td>{{ $lel['info']['tarikh_lelong']}}</td>
-                            <td>
+                            <td>@php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] );
+                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                echo($t_lelong);
+                            @endphp</td>
+                            <td>{{$lel['info']['fasa']}}</td>
+                            <td align = 'left'>
                                 @foreach($lel['detailsinfo'] as $details)
                                 <span class="m-2">{{$details['caw_name']}}</span><br>
                                 @endforeach
@@ -62,7 +68,8 @@
                             @hasrole('operasi')
                                 
                                 @if($lel['info']['sts_lelong'] == 0)
-                                    <a  href="{{ route('lelong.show',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                    <a  href="{{ route('lelong.show',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                    <a  href="{{ route('lelong.showsimulasi',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Simulasi" style="margin-right:40px" ><i class="far fa-edit"></i></a>
                                     <a class="confirmdel" href="{{ route('lelong.delete',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a>
                                 @else
                                     <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php
index de84ef1a..0953e904 100644
--- a/resources/views/lelong/senaraimarhun.blade.php
+++ b/resources/views/lelong/senaraimarhun.blade.php
@@ -35,11 +35,11 @@
                         <tr>
                             <th>No.</th>
                             <th>Norujukan</th>
-                            <th>Pinjaman (RM)</th>
                             <th>Tempoh</th>
                             <th>Berat (gm)</th>
                             <th>Nilai Marhun (RM)</th>
                             <th>Harga Asas (RM)</th>
+                            <th>Pembiayaan (RM)</th>
                             <th>Keuntungan (RM)</th>
                             <th>Caj Lelong (%)</th>
                             <th>Rugi Lelong (RM)</th>
@@ -52,12 +52,12 @@
                             <tr>
                                 <td>{{$loop->iteration}}</td>
                                 <td>{{ $marhun['norujukan']}}</td>
-                                <td>{{ $marhun['pinjaman'] }}</td>
                                 <td>{{ $marhun['jbg']}}</td>
                                 <td>{{ $marhun['berat'] }}</td>
                                 <td>{{ $marhun['nilaimarhun'] }}</td>
                                 <td>{{ $marhun['hargaasas'] }}</td>
-                                <td>{{ number_format($marhun['keuntungan'], 2, '.', ',') }}</td>
+                                <td>{{ $marhun['pinjaman'] }}</td>
+                                <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
 
                                 {{-- <td>{{ $marhun['keuntungan'] }}</td> --}}
                                 <td>{{ $marhun['cajlelong'] }}</td>
diff --git a/resources/views/lelong/senaraimarhunsimulasi.blade.php b/resources/views/lelong/senaraimarhunsimulasi.blade.php
new file mode 100644
index 00000000..4132c732
--- /dev/null
+++ b/resources/views/lelong/senaraimarhunsimulasi.blade.php
@@ -0,0 +1,183 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-11 mx-auto card p-4">
+        <span class="pt-3" style="margin-left:1%; font-size:20px"><b>Senarai Simulasi Lelong</b></span>
+             @foreach ($arrayinfo as $laporan)
+        
+            <span class="pt-3" style="margin-left:1%;"><b>Lelong ID : {{ $laporan['laporan']['lelong_id']}}</b></span>
+            <span class="pt-3" style="margin-left:1%;"><b>Tarikh Lelong : @php 
+                $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
+                  $datez = $myDateTime->format('d-m-Y');
+                  echo($datez);
+              
+              @endphp</b></span>
+            @foreach($laporan['details'] as $details)
+            <span class="pt-3" style="margin-left:1%;"><b>Nama Cawangan : {{ $details['caw_name']}}</b></span>
+            <span class="pt-3" style="margin-left:1%;"><b>Kod Cawangan : {{ $details['caw_code']}}</b></span>
+            @endforeach
+           
+        @endforeach
+            
+            @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
+            <form id="deletesag" action="{{route('lelong.deletemarhun')}}" method="POST">
+                @csrf
+                <input type="hidden" name="lelongid" value="{{$lelongid}}">
+                <input type="hidden" name="cawid" value="{{$cawid}}">
+                <table class="table table-striped  table-xl" id="marhun" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>No.</th>
+                            <th>Norujukan</th>
+                            <th>Tempoh</th>
+                            <th>Berat (gm)</th>
+                            <th>Nilai Marhun (RM)</th>
+                            <th>Harga Asas (RM)</th>
+                            <th>Pembiayaan (RM)</th>
+                            <th>Keuntungan (RM)</th>
+                            <th>Caj Lelong (%)</th>
+                            <th>Rugi Lelong (RM)</th>
+                            <th>Baki Lelong (RM)</th>
+                            <th>Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach ($marhuns as $index=> $marhun)
+                            <tr>
+                                <td>{{$loop->iteration}}</td>
+                                <td>{{ $marhun['norujukan']}}</td>
+                                <td>{{ $marhun['jbg']}}</td>
+                                <td>{{ $marhun['berat'] }}</td>
+                                <td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
+                                <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                                <td>{{ number_format($marhun['pinjaman'] , 2, '.', ',') }}</td>
+                                <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
+
+                                {{-- <td>{{ $marhun['keuntungan'] }}</td> --}}
+                                <td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
+                                <?php
+                                    $rugi = 0;
+                                    $baki = 0;
+                                     if(strpos($marhun['baki'], '-') !== false)
+                                     {
+                                        $rugi  = $marhun['baki'];
+                                     }
+                                     else {
+                                        $baki = $marhun['baki'];
+                                     }
+                                ?>
+                                <td>{{number_format($rugi, 2, '.', ',')}}</td>
+                                <td>{{number_format($baki, 2, '.', ',')}}</td>
+                                
+                                <td class="text-center">
+                                    <input type="checkbox" aria-label="Checkbox for following text input" onclick="btnDelete(this)" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
+                                </td>
+                               
+                            </tr>
+                        @endforeach
+                    </tbody>
+                    
+                </table>
+                <div class="text-right pt-4">
+                    <a  href="{{ route('lelong.show',$lelongid) }}" class="btn btn-primary">Kembali</a>
+                    <button type="button" class="btn btn-danger" id="btndelete" onclick="confirm()">Delete</button>
+                </div>
+                {{-- <a href="{{url('lelong/senarailelong')}}" class="btn btn-primary">Kembali</a> --}}
+                
+            </form>
+        </div>
+        
+    </div>
+</div>
+<script>
+    $("#btndelete").prop("disabled", true);
+    function btnDelete(e) {
+        var count = 0;
+        tablemarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            if($(this).prop('checked') === true)
+            {
+                count = count + 1;
+            }
+            // $(this).prop('checked', e.checked);
+        })
+        if(count != 0)
+        {
+            $("#btndelete").prop("disabled", false);
+        }
+        else
+        {
+            $("#btndelete").prop("disabled", true);
+        }
+        // let checkbox = $('#checkboxdata').val();
+        // console.log(checkbox)
+        // $("#btndelete").prop("disabled", checkboxdata.length === 0);
+    }
+    function confirm() {
+        $.confirm({
+        title: 'Confirmation',
+        content: 'Anda pasti?',
+        type: 'red',
+        typeAnimated: true,
+        buttons: {
+            Delete: {
+                btnClass: 'btn-danger',
+                action: function () {
+                    $("#deletesag").submit();
+                }
+            },  
+            Batal: {
+                btnClass: 'btn-default',
+                action: function () {}
+            }
+        }
+    });
+    }
+
+    var tablemarhun = $('#marhun').DataTable( {
+            "columnDefs": [ 
+                {
+                "targets": 13,
+                "orderable": false
+                }, 
+                // {
+                // "targets": 4,
+                // "orderable": false
+                // }
+            ],
+            // order: [[1, 'asc']],
+            // "ordering": false,
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 999999,
+            dom: 'Bfrtip',
+            // buttons: [
+            //     // 'copy', 'excel', 'pdf'
+            //     // { text: 'copy', className: 'btn btn-primary' },
+            //     {
+            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm adduser',
+            //         text: '<i class="fas fa-plus" id="test"></i>',
+            //         titleAttr: 'Tambah Pengguna',
+            //         action: function ( e, dt, node, config ) {
+            //             alert( 'Button activated' );
+            //         }
+            //     },
+            //     {
+            //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+            //         titleAttr: 'Export to CSV',
+            //         text: '<i class="fas fa-download"></i>',
+            //         action: function ( e, dt, node, config ) {
+            //             $("#exportform").submit();
+            //         }
+            //     }
+            // ]
+        });
+    
+</script>
+@endsection
diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php
index 4672b458..d8977268 100644
--- a/resources/views/lelong/showlelong.blade.php
+++ b/resources/views/lelong/showlelong.blade.php
@@ -27,13 +27,13 @@
                                         <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>
                                     </tr>
                                     <tr>
-                                        <td>Keuntungan Keseluruhan : RM{{ number_format($total_upahkeuntungan2, 2, '.', ',') }}</td>
+                                        <td>Keuntungan Keseluruhan : RM{{ number_format($totalkeuntungan2, 2, '.', ',') }}</td>
                                     </tr>
                                     <tr>
                                         @foreach($data as $data1)
@@ -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>
diff --git a/resources/views/lelong/showsimulasi.blade.php b/resources/views/lelong/showsimulasi.blade.php
new file mode 100644
index 00000000..bebce235
--- /dev/null
+++ b/resources/views/lelong/showsimulasi.blade.php
@@ -0,0 +1,415 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-11 mx-auto card p-4">
+            <nav>
+                <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                  <a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Lelong</a>
+                  <!-- <a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a> -->
+                </div>
+              </nav>
+              <div class="tab-content" id="nav-tabContent">
+                <div class="tab-pane fade show active" id="nav-simulasi" role="tabpanel" aria-labelledby="nav-simulasi-tab">
+                <br>
+                @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        <p>{{ $message }}</p>
+                    </div>
+                @endif
+                    <form id="exportform" action="" method="POST">
+                        <input type="hidden" name="type" value="User">
+                        <div class="row">
+                            <div class="col-md-5">
+                                <table class="table table-striped table-xl" id="conclusion" style="width:100%">
+                                    <tr>
+                                        <td>Bilangan Lelong : {{$total_marhun}}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>Nilai Marhun Keseluruhan : RM{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',')  }}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>Keuntungan Keseluruhan : RM{{ number_format($totalkeuntungan2, 2, '.', ',') }}</td>
+                                    </tr>
+                                    <tr>
+                                        @foreach($data as $data1)
+                                        <td>Tarikh Lelong : 
+                                            @php 
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
+                                              $datez = $myDateTime->format('d-m-Y');
+                                              echo($datez);
+                                          
+                                          @endphp
+                                        </td>
+                                        @endforeach
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="col-md-2"></div>
+                            <div class="col-md-5">
+                                <table class="table table-striped table-xl" id="conclusion2" style="width:100%">
+                                    <tr>
+                                        <td>Rugi Lelong Keseluruhan : -RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>Baki Lelong Keseluruhan : RM{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
+                                    </tr>
+                                    <tr>
+                                        <td>Caj Lelong Keseluruhan : RM{{ number_format($total_cazlelong, 2, '.', ',')  }}</td>
+                                    </tr>
+                                    <tr>
+                                        @foreach($data as $data)
+                                        <td>Tempoh : {{$data['jbg'] }}</td>
+                                        @endforeach
+                                    </tr>
+                                </table>
+                            </div>
+                        </div>
+                        
+        
+                        <table class="table table-striped  table-xl" id="simulasi" style="width:100%">
+                            <thead class="bg-primary text-white">
+                                <tr class="text-center">
+                                    <th>No</th>
+                                    <th>Cawangan</th>
+                                    <th>Bil Marhun (Paket)</th>
+                                    <th>Berat (gm)</th>
+                                    <th>Nilai Marhun (RM)</th>
+                                    <th>Pembiayaan (RM)</th>
+                                    <th>Keuntungan (RM)</th>
+                                    <th>Harga Asas (RM)</th>
+                                    <th>Caj Lelong (RM)</th>
+                                    <th>Baki Lelong (RM)</th>
+                                    <th>Rugi Lelong (RM)</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                
+                                @foreach ($arraycaw as $index=>$caw)
+                                <tr>
+                                    <td>{{$index+1}}</td>
+                                    <td><a href=" {{ route('lelong.senaraimarhunsimulasi',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
+                                    <td>{{ $caw['bil_marhun'] }}</td>
+                                    <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['bakiupah'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
+                                    <td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
+                                </tr>
+                                @endforeach
+                            </tbody>
+                            <tfoot>
+                                <tr>
+                                    <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td>{{ $total_marhun }}</td>
+                                    <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
+                                    <td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
+                                    <td>{{ number_format($total_pinjaman, 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>
+                                    <td>({{ number_format($total_rugilelong, 2, '.', ',') }})</td>
+                                </tr>
+                            </tfoot>
+                            
+                        </table>
+        {{-- {{dd($lelkarat)}}; --}}
+                        <table class="table table-striped  table-xl" id="jumlahberat" style="width:80%">
+                            <thead class="bg-primary text-white">
+                                <tr class="text-center">
+                                    <th colspan="12">JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</th>
+
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr>
+                                    <td>MUTU</td>
+                                    @foreach ($lelkarat as $index=>$karat)
+                                    <td>{{$karat->karat}}</td>
+                                    @endforeach
+                                </tr>
+                                <tr>
+                                    <td>BERAT (gm)</td>
+                                    <td>{{$total24Kgb}}</td>
+                                    <td>{{$total24K}}</td>
+                                    <td>{{$total23k}}</td>
+                                    <td>{{$total22K}}</td>
+                                    <td>{{$total21K}}</td>
+                                    <td>{{$total20K}}</td>
+                                    <td>{{$total18Kp}}</td>
+                                    <td>{{$total18K}}</td>
+                                    <td>{{$total14Kp}}</td>
+                                    <td>{{$total14K}}</td>
+                                    <td>{{$total9K}}</td>
+                                    
+                                </tr>
+                            </tbody>
+                            
+                        </table>
+                    </form>
+                    <div class="row">
+                        <div class="text-center">
+                            {{-- <a class="btn btn-primary" href="{{ route('lelong.create',$lelong_id) }}">Create Lelong</a> --}}
+                        </div>
+                    </div>
+                </div>
+                <div class="tab-pane fade" id="nav-hargaasas" role="tabpanel" aria-labelledby="nav-hargaasas-tab">
+                    <br>
+                    <div class="row ">
+                        <div class="col-md-10 mx-auto ">
+                            <button class="btn btn-primary float-right " onclick="kemaskini()" id="btnkemaskini" >Kemaskini</button>
+                            
+                            <div id="hideform">
+                                <label for="hargaasas" class="d-inline float-left pr-2 pl-2 pt-2" id="lblhargaasas">Harga Emas Asas</label>
+                                <input type="text" class="form-control col-md-4 d-inline float-left" id="txthargaasas" name="hargaasas" placeholder="RM" data-jeniskarat="{{$jeniskarat}}" oninput="calculate(this)">
+                                <button class="btn btn-success float-right" onclick="save()" id="btnsimpan">Simpan</button>
+                                <button class="btn btn-danger float-right" onclick="kemaskini()" id="btncancel">Cancel</button>
+                            </div>
+                            
+                        </div>
+                    </div>
+                    <div class="row ">
+                        <div class="col-md-10 mx-auto">
+                            
+                            <form action="{{ route('lelong.kemaskinihargaasas') }}" method="POST" id="formhargaasas">
+                                @csrf
+                                <input type="hidden" name="idlelong" value="{{$lelong_id}}">
+                                <table class="table table-striped  table-xl" id="kemaskinikarat" style="width:100%" >
+                                    <thead class="bg-primary text-white">
+                                        <tr class="text-center">
+                                            <th>Karat</th>
+                                            <th>Keterangan</th>
+                                            <th>Harga</th>
+                                            {{-- <th>Harga</th> --}}
+                                        </tr>
+                                    </thead>
+                                    <tbody class="text-center">
+                                        @foreach ($lelkarat as $index=>$karat)
+                                            <tr>
+                                                <td>{{$karat->karat}}</td>
+                                                <td>{{$karat->keterangan}}</td>
+                                                <td class="input">{{$karat->harga2}}</td>
+                                                {{-- <td class="input">{{$karat->harga}}</td> --}}
+                                            </tr>
+                                        @endforeach
+                                    </tbody>
+                                    
+                                </table>
+                            </form>
+                        </div>
+                    </div>
+                    {{-- <a class="btn btn-primary" href="{{ route('lelong.kemaskinihargaasas',$lelong_id) }}">Kemaskini</a> --}}
+                    
+                    
+                </div>
+              </div>
+            @if ($message = Session::get('success'))
+            <div class="alert alert-success">
+                <p>{{ $message }}</p>
+            </div>
+            @endif
+            {{-- {{$cawangan[0] }} --}}
+        </div>
+        <div class="modal fade" tabindex="-1" id="modalfilter">
+            <div class="modal-dialog modal-lg">
+              <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">Filter By</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                    <form action="{{ route('analisa.filter') }}" method="POST" id="formfilter">
+                        @csrf
+                        <div class="row justify-content-center">
+                            <div class="col-md-8">
+                                <div class="form-group row">
+                                    <input type="hidden" name="idmarhun" id="idmarhun" >
+                                    
+                                </div>
+                            </div>                       
+                          </div>
+                      </form>
+                </div>
+                <div class="modal-footer">
+                  <button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
+                  <button type="button" class="btn btn-primary" onclick="">Jana Semula Simulasi</button>
+                </div>
+              </div>
+            </div>
+          </div>
+    </div>
+</div>
+<script>
+    $("#hideform").hide();
+    $('#btnsimpan').prop('disabled', true)
+    function kemaskini() {
+       var inputdata =  $("td.input").find("input");
+       if(inputdata.length ==0)
+       {
+        $("td.input").each(function(index) {
+            // console.log(index)
+            var la = $(this).html();
+            // if(index%2 ==0 ) //even-0-2-4
+            // { 
+                $(this).html("<input type='text' name='harga2[]' id=harga2"+index+" value="+la+" />");
+            // }
+            // else //odd-1-3-5-7
+            // {
+            //     $(this).html("<input type='text' name='harga[]' id=harga"+index+" value="+la+" />");
+            // }
+            
+        })
+        $("#hideform").show();
+        $("#btnkemaskini").hide();
+       }
+       else
+       {
+            $("td.input").each(function() {
+                var la = $(this).html();
+                $(this).html($(la).val());
+            })
+            $("#hideform").hide();
+            $("#btnkemaskini").show();
+       }
+        
+    }
+
+    function calculate(e)
+    {
+        let hargaasasbaru = $('#txthargaasas').val();
+
+        let jeniskarat = $(e).data('jeniskarat');
+        
+        // let maxcolumn = 2;
+        let count = 0;
+        let indexarray = 0;
+        $("td.input").each(function(index) {
+            if(hargaasasbaru)
+            {
+                $('#btnsimpan').prop('disabled', false)
+                // if(index%2 == 0)
+                // {
+                    let harga1 = parseFloat(hargaasasbaru);
+                    let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']);
+                    let newhargaasas = harga1 + (harga2); 
+                    count++;
+                    $('#harga2'+index).val(newhargaasas.toFixed(2));
+                // }
+                // else
+                // {
+                //     let harga1 = parseFloat(hargaasasbaru);
+                //     let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']);
+                //     let newhargaasas = (harga1 + (harga2))/2.72;; 
+                //     count++;
+                //     $('#harga'+index).val(newhargaasas.toFixed(2));
+                // }
+
+                // if(count == maxcolumn)
+                // {
+                //     count = 0;
+                    indexarray++;
+                // }
+            }
+            else
+            {
+                $('#btnsimpan').prop('disabled', true)
+                let dummy =0;
+                if(index%2 == 0)
+                {
+                    $('#harga2'+index).val(dummy.toFixed(2));
+                }
+                // else
+                // {
+
+                //     $('#harga'+index).val(dummy.toFixed(2));
+                // }
+            }
+            
+        })
+        
+    }
+
+    function save(){
+        $('#formhargaasas').submit();
+    }
+
+    $('a.confirmdel').confirm({
+        title: 'Confirmation',
+        content: 'Anda pasti?',
+        type: 'orange',
+        typeAnimated: true,
+        buttons: {
+            Delete: {
+                btnClass: 'btn-warning',
+                action: function () {
+                    location.href = this.$target.attr('href');
+                }
+            },  
+            Batal: {
+                btnClass: 'btn-default',
+                action: function () {}
+            }
+        }
+    });
+
+        var tablesimulasi = $('#simulasi').DataTable( {
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                }
+            ],
+            order: [[0, 'asc']],
+            // "ordering": false,
+            "searching":false,
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 15,
+            dom: 'Bfrtip',
+            buttons: [
+                // 'copy', 'excel', 'pdf'
+                // { text: 'copy', className: 'btn btn-primary' },
+                // {
+                //     className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
+                //     text: '<i class="fas fa-filter"></i>',
+                //     titleAttr: 'Filter By',
+                //     action: function ( e, dt, node, config ) {
+                //         $('#modalfilter').modal("show");
+                //     }
+                // },
+                {
+                    className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+                    titleAttr: 'Export to CSV',
+                    text: '<i class="fas fa-download"></i>',
+                    action: function ( e, dt, node, config ) {
+                        $("#exportform").submit();
+                    }
+                }
+            ]
+        });
+
+        $('.addsim').tooltip();
+        $('.export').tooltip();
+        // $( '.dt-buttons').addClass('btn-group');
+        $( '.addsim').removeClass('dt-button');
+        $( '.export').removeClass('dt-button');
+
+
+    function selectall(cb) {
+        tablesimulasi.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            $(this).prop('checked', cb.checked);
+        })
+    }
+</script>
+     
+@endsection
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index 51478209..c0af3dd3 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -68,16 +68,16 @@
                             </td>
                             <td>
                                 @if($item->n_marhun != null)
-                                    {{ $item->n_marhun }}
+                                    {{ number_format($item->n_marhun, 2, '.', ',') }}
                                 @else
-                                    {{ $item->old_nmarhun }}
+                                    {{ number_format($item->old_nmarhun, 2, '.', ',') }}
                                 @endif
                             </td>
                             <td>
                                 @if($item->hargaasas != null)
-                                    {{ $item->hargaasas }}
+                                    {{ number_format($item->hargaasas, 2, '.', ',') }}
                                 @else
-                                    {{ $item->old_hargaasas }}
+                                    {{ number_format($item->old_hargaasas, 2, '.', ',') }}
                                 @endif
                             </td>
                             <td>{{ $item->nota }}</td>
@@ -336,9 +336,9 @@
                 {
                     console.log(item);
                     var beratemas = $('#berat_emastambahan').val();
-                    var total_tambahan = item.harga * parseFloat(beratemas);
+                    var total_tambahan = item.harga2 * parseFloat(beratemas);
                     var harga_asastambahan = Math.round(total_tambahan);
-                    $('#hargatambahan').val(parseFloat(item.harga).toFixed(2));
+                    $('#hargatambahan').val(parseFloat(item.harga2).toFixed(2));
                     $('#nilai_marhuntambahan').val(parseFloat(total_tambahan).toFixed(2));
                     $('#harga_asastambahan').val(parseFloat(harga_asastambahan).toFixed(2));
                 }
@@ -388,9 +388,9 @@
             karatall.forEach((item) =>{
                 if(item.karat == $(e).val())
                 {
-                    var total = item.harga * $('#berat_emas').val();
+                    var total = item.harga2 * $('#berat_emas').val();
                     var hargaasas = Math.round(total);
-                    $('#harga').val(parseFloat(item.harga).toFixed(2));
+                    $('#harga').val(parseFloat(item.harga2).toFixed(2));
                     $('#nilai_marhun').val(parseFloat(total).toFixed(2));
                     $('#harga_asas').val(parseFloat(hargaasas).toFixed(2));
                 }
diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php
index 169b4120..1d7e786c 100644
--- a/resources/views/pengesahan/mutumarhun.blade.php
+++ b/resources/views/pengesahan/mutumarhun.blade.php
@@ -22,10 +22,10 @@
                     <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
                         <p> <b>Norujukan : </b> {{ $lelongbid->norujukan }}</p>
                         <p> <b>Tempoh / JBG : </b> {{ $lelongbid->jbg }}</p>
-                        <p> <b>Pembiayaan : </b> {{ $marhuns[0]['pembiayaan'] }}</p>
-                        <p> <b>Keuntungan : </b></p>
-                        <p> <b>Baki Lelong : </b>{{ $marhuns[0]['baki_lelong'] }}</p>
-                        <p> <b>Rugi Lelong : </b>{{ $marhuns[0]['rugi_lelong'] }}</p>
+                        <p> <b>Pembiayaan(RM) : </b> {{ number_format($marhuns[0]['pembiayaan'], 2, '.', ',') }}</p>
+                        <p> <b>Keuntungan(RM) : </b> {{ number_format($marhuns[0]['bakiupah'], 2, '.', ',') }}</p>
+                        <p> <b>Baki Lelong(RM) : </b>{{ number_format($marhuns[0]['baki_lelong'], 2, '.', ',') }}</p>
+                        <p> <b>Rugi Lelong(RM) : </b>{{ number_format($marhuns[0]['rugi_lelong'], 2, '.', ',') }}</p>
                     </div>
                 </div>
             </div>
diff --git a/resources/views/pengesahan/senarailelongubahmutu.blade.php b/resources/views/pengesahan/senarailelongubahmutu.blade.php
index 24c51083..7d0efdbc 100644
--- a/resources/views/pengesahan/senarailelongubahmutu.blade.php
+++ b/resources/views/pengesahan/senarailelongubahmutu.blade.php
@@ -29,12 +29,17 @@
                         @foreach($arrayinfo as $lel)
                         <tr>
                             <td>{{$loop->iteration}}</td>
-                            <td>
+                            <td align = 'left'>
                                 @foreach($lel['detailsinfo'] as $details)
                                 <span class="m-2">{{$details['caw_name']}}</span><br>
                                 @endforeach
                             </td>
-                            <td>{{ $lel['info']['tarikh_lelong']}}</td>
+                            <td>  @php 
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']);
+                                              $datez = $myDateTime->format('d-m-Y');
+                                              echo($datez);
+                                          
+                                          @endphp</td>
                             <td>{{ $lel['info']['harga_emas_asas'] }}</td>
                             <td>{{ $lel['info']['jbg'] }}</td>
                             <td>{{ $lel['info']['cajlelong'] }}</td>
diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php
index a56425d8..d41fdb08 100644
--- a/resources/views/simulasi/senaraimarhunlel.blade.php
+++ b/resources/views/simulasi/senaraimarhunlel.blade.php
@@ -24,11 +24,12 @@
                             <th>Kod Cawangan</th>
                             <th>Nama Cawangan</th> -->
                             <th>Norujukan</th>
-                            <th>Pembiayaan (RM)</th>
+                           
                             <th>Tempoh</th>
                             <th>Berat (gm)</th>
                             <th>Nilai Marhun (RM)</th>
                             <th>Harga Asas (RM)</th>
+                            <th>Pembiayaan (RM)</th>
                             <th>Keuntungan (RM)</th>
                             <th>Caj Lelong (%)</th>
                             <th>Rugi Lelong (RM)</th>
@@ -44,12 +45,12 @@
                                 <td class="text-center">{{ $marhun['kodcaw'] }}</td>
                                 <td>{{ $marhun['caw_name'] }}</td> -->
                                 <td>{{ $marhun['norujukan']}}</td>
-                                <td>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
                                 <td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td> 
                                 <td>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                                 <td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
                                 <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td> 
-                                <td>{{ number_format($marhun['keuntungan'], 2, '.', ',') }}</td>
+                                <td>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
+                                <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
                                 <td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
                                 <?php
                                     $rugi = 0;
diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php
index 70f1fe6b..871c75da 100644
--- a/resources/views/simulasi/senaraisimulasi.blade.php
+++ b/resources/views/simulasi/senaraisimulasi.blade.php
@@ -19,7 +19,8 @@
                             <th>Lelong ID</th>
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
-                            <th>Cawangan</th>                   
+                            <th>Cawangan</th>   
+                            <th>Harga Asas (RM)</th>                   
                             <th class="text-center">Action</th>
                         </tr>
                     </thead>
@@ -40,6 +41,7 @@
                            {{$info2['caw_name']}}<br>
                             @endforeach
                             </td>
+                             <td>{{ $info['info']['harga_emas_asas'] }}</td>
                             <td class="text-center">
                                 <a  href="{{ route('analisa.show',$info['info']['simulasi_id']) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
                                 <a class="confirmdel" href="{{ route('analisa.delete',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php
index da78bd15..05093856 100644
--- a/resources/views/simulasi/showsimulasi.blade.php
+++ b/resources/views/simulasi/showsimulasi.blade.php
@@ -24,13 +24,13 @@
                                         <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>
                                     </tr>
                                     <tr>
-                                        <td>Keuntungan Keseluruhan : RM{{ number_format($total_upahkeuntungan, 2, '.', ',') }}</td>
+                                        <td>Keuntungan Keseluruhan : RM{{ number_format($total_upahkeuntungan2, 2, '.', ',') }}</td>
                                     </tr>
                                     <tr>
                                         @foreach($data as $data1)
diff --git a/routes/web.php b/routes/web.php
index d9d23fbe..0f189f01 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -107,6 +107,8 @@ Route::group(['prefix'=>'lelong'], function () {
     Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']);
     Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']);
     Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']);
+    Route::get('/showsimulasi/{id}',['as'=>'lelong.showsimulasi','uses'=>'LelongController@showsimulasi']); 
+    Route::get('/senaraimarhunsimulasi/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhunsimulasi','uses'=>'LelongController@senaraimarhunsimulasi']);
 
 
     Route::get('/lapbrglelongindex',['as'=>'lelong.lapbrglelongindex','uses'=>'LelongController@lapbrglelongindex']);