diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index c2d1fce4..2ce9c71e 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -7,6 +7,10 @@ use Spatie\Permission\Models\Role;
 use Spatie\Permission\Models\Permission;
 use Illuminate\Support\Facades\Auth;
 
+use App\Models\Lelong;
+use App\Models\CawanganLelong;
+use Carbon\Carbon;
+
 class HomeController extends Controller
 {
     /**
@@ -28,7 +32,29 @@ class HomeController extends Controller
     {
         // $user =  Auth::user();
         // $user->assignRole('admin');
-        return view('home');
+        $dateTime = date('Y-m-d');
+        $arrayinfo = [];
+
+        $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->select('fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->where('tarikh_lelong', $dateTime)
+        ->groupBy('lelong_id')
+        ->get()
+        ->toArray();
+
+        foreach($lelong as $info)
+        {
+
+            $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->select('batchlel','lelong_id','cawangan_lelong.caw_id','cawangan.caw_name','cawangan.caw_code','status_online','cawangan_lelong.masamula_lelong','cawangan_lelong.masatamat_lelong')
+            ->where('lelong_id',$info['lelong_id'])
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
+            
+
+        }//dd($detailsinfo);
+        return view('home',compact('lelong', 'arrayinfo'));
     }
 
     public function about()
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index ec8aaa14..978591c6 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','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,
@@ -232,6 +237,9 @@ class LelongController extends Controller
             $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
             
             
+            $totalkeuntungan2 = $totalkeuntungan2 + $totalkeuntungan;
+
+
             $data = Lelong::where('lelong.id','=',$lelong_id)
             ->get();
         }
@@ -266,7 +274,8 @@ class LelongController extends Controller
                                                 'keuntungan',
                                                 'total_upahkeuntungan',
                                                 'total_nilaimarhun',
-                                                'total_upahkeuntungan2'));
+                                                'total_upahkeuntungan2',
+                                                'totalkeuntungan2'));
     }
 
     public function create($id)
@@ -281,6 +290,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,66 +325,103 @@ 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');
         
@@ -425,14 +472,22 @@ class LelongController extends Controller
         $lelong->sts_lelong = 1;   //start lelong
         $lelong->save();
         
+
+        $cawlelong = CawanganLelong::where('lelong_id','=',$id)->first();
+        $cawlelong->masamula_lelong = $currenttime;
+        $cawlelong->masatamat_lelong = $endtime->toTimeString();
+        $cawlelong->status_online = 1;   //start lelong
+        $cawlelong->save();
+
         return redirect()->route('lelong.senarailelong')
         ->with('success','Lelongan bermula');
     }
     
     public function refresh($id)
     {
+        $date = Carbon::now()->toDateTimeString();
         $lelong = Lelong::where('id','=',$id)->first();
-        $lelong->masakemaskini_data = '2021-12-20 04:51:50';
+        $lelong->masakemaskini_data = $date;
         $lelong->save();
         
         return redirect()->route('lelong.senarailelong')
@@ -466,12 +521,14 @@ class LelongController extends Controller
         }
 
         //update marhun
-        $lelongbid = LelongBid::where('lelong_id','=',$request->idlelong)->get();
-        // $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)
@@ -494,29 +551,25 @@ class LelongController extends Controller
                         $marhun->save();
                     }
                 }
-
-                $keuntungan = 0;
-                $keuntungan = $bid->bakipjm- ($bid->bakihargajualan - ($bid->upah12 - $bid->ansakhir)-(($bid->tempoh-$bid->tempohbayar)
-                *$bid->kadarupah/100*$bid->bakipjm) );
-
-                dd($keuntungan);
-                $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 - $keuntungan - $sumcajlelong;
-                $bid->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 - $keuntungan - $sumcajlelong;
-            // $bid->save();
-            
+            $lelong = Lelong::where('id',$request->idlelong)->get();
+            $sumcajlelong = $sumhargaasas * ($lelong[0]['cajlelong']/100);
+            $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)
@@ -650,6 +703,7 @@ class LelongController extends Controller
         $lelong->masatamat_lelong = $currenttime;
         $lelong->sts_lelong = 2;   //stop lelong
         $lelong->save(); 
+        
 
         return redirect()->route('lelong.senarailelong')
                         ->with('success','Lelongan berhenti');
@@ -852,6 +906,7 @@ class LelongController extends Controller
             'lelongbid.upahsimpan',
             'lelongbid.cajlelong',
             'lelongbid.baki',
+            'lelongbid.bakiupah',
             'lelongbid.status_jual',
             'lelongbid.jbg',
             'gadai.bakipjm',
@@ -883,13 +938,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'));
     }
 
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index d953a7ca..1bf4ba43 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;
@@ -41,6 +41,8 @@ class MarhunController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
+
+    //Khazanah
     public function index($lelong_id)
     {
         $user =  Auth::user();
@@ -51,7 +53,56 @@ class MarhunController extends Controller
         ->where('caw_id','=', $caw->id)
         ->get();
 
-        return view('marhun.senaraimarhun',compact('lelongbid','lelong_id'));
+        $sag = LelongBid::where('lelong_id', $lelong_id)
+        ->where('caw_id', $caw->id)
+        ->where('status_semak', 0)
+        ->get();
+        // dd($sag);
+
+        $sdhdisemak = LelongBid::where('lelong_id', $lelong_id)
+        ->where('caw_id', $caw->id)
+        ->where('status_semak', 1)
+        ->get();
+
+        $dalamproses = Pengesahan::where('pengesahan.lelong_id', $lelong_id)
+        ->whereNull('pengesahan.disahkan_oleh')
+        ->get();
+       
+        $sdhdisahkan = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id')
+        ->where('pengesahan.lelong_id', $lelong_id)
+        ->whereNotNull('pengesahan.disahkan_oleh')
+        ->where('lelongbid.status_semak', 1)
+        ->get();
+
+        foreach($lelongbid as $index1=>$bid)
+        {
+            $sudahdisahkan = Pengesahan::where('lelongbid_id', $bid['id'])
+            ->where('lelong_id', $lelong_id)
+            ->get();
+
+            if($sudahdisahkan)
+            {
+                foreach($sudahdisahkan as $sahkan)
+                {
+                    // dd($sahkan);
+                    $lelongbidmarhun = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id')
+                    ->where('lelongbidmarhun.id', $sahkan['lelongbidmarhun_id'])
+                    ->select('pengesahan.disahkan_oleh',
+                             'pengesahan.disahkan_pada'
+                    )
+                    ->first();
+    
+                    $lelongbid[$index1]['pengesahan'] = $lelongbidmarhun;
+                    // dd($lelongbid[$index1]['pengesahan']);
+                }
+            }
+            else
+            {
+                //
+            }
+        }
+
+        return view('marhun.senaraimarhun',compact('lelongbid','lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan'));
     }
 
     public function kemaskini(Request $request)
@@ -231,7 +282,7 @@ class MarhunController extends Controller
         }
 
         return redirect()->route('marhun.show', [$lelongbid->id, $lelong->id])
-                        ->with('success','Kemaskini Marhun Berjaya');
+                        ->with('success','Kemaskini Marhun Berjaya, SILA KLIK BUTANG SEMAK DIBAWAH UNTUK MEMBUAT PENGEMASKINIAN');
     }
 
     public function show($id, $lelong_id)
@@ -247,19 +298,31 @@ class MarhunController extends Controller
 
     public function senarailelongmarhun(Request $request){
 
-        $user =  Auth::user();
+        $user = Auth::user();
+        $arrayinfo = [];
 
-        // $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
-        // ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-        // ->where('cawangan.caw_code','=',$user->kodcaw)
-        // ->get();
-        $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
+        $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
-        ->where('lelong.sts_lelong', 0)
-        ->where('cawangan.caw_code','=',$user->kodcaw)
-        ->get();
+        ->where('cawangan.caw_code', $user->kodcaw)
+        ->where('sts_lelong', 0)
+        ->select('lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->get()
+        ->toArray();
 
-        return view('marhun.senarailelongmarhun',compact('senarai'));
+        foreach($lelong as $info)
+        {
+
+            $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]);
+
+        }
+
+        return view('marhun.senarailelongmarhun',compact('lelong', 'arrayinfo'));
+        
     }
 
     public function semak($id, $lelong_id)
@@ -338,8 +401,15 @@ class MarhunController extends Controller
         
     public function exportmarhundetails($lelong_id)
     {
+        $user = Auth::user();
+        //dd($user);
         $lelongs= LelongBid::where('lelong_id','=',$lelong_id)
-        ->get()->toArray();
+        ->where('kodcaw','=',$user['kodcaw'])
+        ->get()
+        ->toArray();
+        //dd($lelongs);
+
+        
 
         $arraycaw= [];
 
@@ -386,12 +456,85 @@ class MarhunController extends Controller
 
     }
 
+    public function senlelmarhun()
+    {
+        $user = Auth::user();
+
+        $arrayinfo = [];
+
+        $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
+        ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+        ->where('cawangan.caw_code', $user->kodcaw)
+        ->where('sts_lelong', 0)
+        ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->groupBy('lelong_id')
+        ->get()
+        ->toArray();
+
+        foreach($lelong as $info)
+        {
+
+            $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]);
+
+        }
+
+        return view('marhun.senlelmarhun',compact('lelong', 'arrayinfo'));
+    }
+
+    public function sentangguhlelongsah($lelong_id)
+    {
+        $user = Auth::user();
+        // dd($user);
+
+        $sdhdisahkan = TangguhLelong::join('gadai', 'tangguhlelong.norujukan', '=', 'gadai.norujukan')
+        ->where('gadai.kodcaw', $user['kodcaw'] )
+        ->where('tangguhlelong.lelong_id', $lelong_id)
+        // ->where('lelongbid.status_semak', 1)
+        ->select('tangguhlelong.id as tangguhlelong_id',
+                 'tangguhlelong.norujukan',
+                 'gadai.marhun',
+                 'gadai.berat',
+                 'tangguhlelong.ditangguh_pada',
+                 'tangguhlelong.pinjaman',
+                 'tangguhlelong.nota'
+        )
+        ->get();
+        
+        return view('marhun.sentangguhlelongsah', compact('sdhdisahkan'));
+
+    }
+    //Khazanah
+
+    //Operasi
     public function senarailelongubahmutu()
     {
-        $lelong = Lelong::where('sts_lelong', 0)
-        ->get();
+        $arrayinfo = [];
 
-        return view('pengesahan.senarailelongubahmutu',compact('lelong'));
+        $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
+        ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+        ->where('sts_lelong', 0)
+        ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->groupBy('lelong_id')
+        ->get()
+        ->toArray();
+
+        foreach($lelong as $info)
+        {
+
+            $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            
+            ->where('lelong_id',$info['lelong_id'])
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
+        }
+
+        return view('pengesahan.senarailelongubahmutu',compact('lelong', 'arrayinfo'));
     }
 
     public function sahubahmutu($id){
@@ -454,6 +597,7 @@ class MarhunController extends Controller
                     'lelongbid.jbg',
                     'lelongbid.kadarupah',
                     'lelongbid.upahsimpan',
+                    'lelongbid.bakiupah',
                     'lelongbid.ansuran',
                     'lelongbid.nilaimarhun',
                     'lelongbid.pinjaman',
@@ -473,8 +617,10 @@ class MarhunController extends Controller
             ->where('id', $lelbidmarhun->lelongbidmarhun_id)
             ->get()->toArray();
             
-            $lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->where('lelong_id', $id)->first();
-            // dd($lelongbid);
+            $lelongbid = LelongBid::where('lelongbid.id', $lelbidmarhun->lelongbid_id)
+            ->where('lelongbid.lelong_id', $id)
+            ->first();
+            
             $karat = Lelkarat::where('lelong_id', $id)->get();
     
             foreach($marhuns as $index1=>$marhun)
@@ -488,13 +634,18 @@ class MarhunController extends Controller
                 ->where('norujukan', $lelongbid->norujukan) 
                 ->first();
 
-                if($lelongbid->baki > 0)
+                $lelong = Lelong::where('id',$id)->get();
+                $sumcajlelong =  $lelongbid->hargaasas * ($lelong[0]['cajlelong']/100);
+                //$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+                $totalbaki = $lelongbid->hargaasas - $lelongbid->pinjaman - $lelongbid->bakiupah - bcdiv($sumcajlelong,1,1);
+                //dd($totalbaki);
+                if($totalbaki > 0)
                 {
-                    $bakilelong = $bakilelong + $lelongbid->baki; 
+                    $bakilelong = $totalbaki; 
                 }
                 else
                 {
-                    $rugilelong = $rugilelong - $lelongbid->baki;
+                    $rugilelong = $totalbaki;
                 }
                 
                 $marhuns[$index1]['harga_gadai'] = $gadaimarhun->harga;
@@ -502,6 +653,7 @@ class MarhunController extends Controller
                 $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun;
                 $marhuns[$index1]['status_ubah'] = $status;
                 $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
+                $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah;
                 $marhuns[$index1]['baki_lelong'] = $bakilelong;
                 $marhuns[$index1]['rugi_lelong'] = $rugilelong;
             }
@@ -522,80 +674,84 @@ class MarhunController extends Controller
         $currentdate = $currentdate->toDateTimeString();
 
         $pengesahan = Pengesahan::where('norujukan', $request->norujukan)
-        ->first();
+        ->where('lelong_id', $request->lelong_id)
+        ->where('lelongbid_id', $request->lelongbid_id)
+        ->get();
 
-        $pengesahan->id = $pengesahan['id'] ;
-        $pengesahan->disahkan_oleh = $user['id'];
-        $pengesahan->disahkan_pada = $currentdate;
-        $pengesahan->save();
-        
-        $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->get();
-        $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
+        foreach($pengesahan as $sah)
+        {
+            $updatepengesahan = Pengesahan::where('id', $sah['id'])->first();
+            $updatepengesahan->disahkan_oleh = $user['id'];
+            $updatepengesahan->disahkan_pada = $currentdate;
+            $updatepengesahan->save();
 
-        if($request->jenis_button == "terima")
-        {   
-            $lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id')
-            ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
-            ->where('pengesahan.id', $pengesahan->id)
-            ->get();
+            $lelongbid = LelongBid::where('id', $sah['lelongbid_id'])->first();      
 
-            foreach($lelongbidmarhuns as $bidmarhuns)
-            {
-                if($bidmarhuns->status_ubah == 3)
+        }
+
+            if($request->jenis_button == "terima")
+            {   
+                foreach($pengesahan as $terimalel)
                 {
-                    $bidmarhuns->delete();
+                    $lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id')
+                    ->where('pengesahan.lelongbid_id', $terimalel['lelongbid_id'])
+                    ->where('pengesahan.id', $terimalel['id'])
+                    ->get();
+    
+                    foreach($lelongbidmarhuns as $bidmarhuns)
+                    {
+                        if($bidmarhuns->status_ubah == 3)
+                        {
+                            $bidmarhuns->delete();
+                        }
+                        else
+                        {
+                            //
+                        }
+                        $txtmarhun = ",1 " . $bidmarhuns->marhun ;
+                    }
+    
+                    $pengesahans = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
+                    ->where('pengesahan.lelongbid_id', $terimalel['lelongbid_id'])
+                    ->select('pengesahan.id as pengesahan_id')
+                    ->first();
+    
+                    $lelongbids = LelongBid::where('id', $lelongbid['id'])->first();
+                    $lelongbids->marhun = str_replace( $txtmarhun,"",$lelongbids->marhun);
+                    $lelongbids->berat = $lelongbids->berat;
+                    $lelongbids->hargaasas = $lelongbids->hargaasas;
+                    $lelongbids->save();
+    
+                    // $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
                 }
-                else
-                {
-                    //
-                }
-                $txtmarhun = ",1 " . $bidmarhuns->marhun ;
             }
 
-            $pengesahans = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
-            ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
-            ->select('pengesahan.id as pengesahan_id')
-            ->first();
-
-            // $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
-            // ->where('lelongbid_id','=',$pengesahan->lelongbid_id)
-            // ->get();
-
-            $lelongbids = LelongBid::where('id', $lelongbid[0]['id'])->first();
-            $lelongbids->marhun = str_replace( $txtmarhun,"",$lelongbids->marhun);
-            $lelongbids->berat = $lelongbids->berat;
-            $lelongbids->hargaasas = $lelongbids->hargaasas;
-            $lelongbids->save();
-
-            // $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
-        }
-        
-        else if($request->jenis_button == "tangguhlelong")
-        {
-            $pengesahan = Pengesahan::where('norujukan', $request->norujukan)
-            ->get(); 
-            dd($pengesahan) ;
-            //add into table tangguhlelong
-            $tangguhlelong = new TangguhLelong;
-            $tangguhlelong->lelong_id = $pengesahan->lelong_id;
-            $tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id;
-            $tangguhlelong->norujukan = $pengesahan->norujukan;
-            $tangguhlelong->pinjaman = $lelongbid[0]['pinjaman'];
-            $tangguhlelong->tarikhtangguh = $currentdate;
-            $tangguhlelong->ditangguh_oleh = $user->id;
-            $tangguhlelong->ditangguh_pada = $currentdate;
-            $tangguhlelong->nota = $request->nota;
-            $tangguhlelong->save();
-            // dd($tangguhlelong);
             
-            $marhundelete = LelongBid::where('id', $pengesahan->lelongbid_id)->delete();
-            
-        }
+            else if($request->jenis_button == "tangguhlelong")
+            {
+                //add into table tangguhlelong
+                $tangguhlelong = new TangguhLelong;
+                $tangguhlelong->lelong_id = $request->lelong_id;
+                $tangguhlelong->lelongbid_id = $request->lelongbid_id;
+                $tangguhlelong->norujukan = $request->norujukan;
+                $tangguhlelong->pinjaman = $lelongbid['pinjaman'];
+                $tangguhlelong->tarikhtangguh = $currentdate;
+                $tangguhlelong->ditangguh_oleh = $user->id;
+                $tangguhlelong->ditangguh_pada = $currentdate;
+                $tangguhlelong->nota = $request->nota;
+                $tangguhlelong->save();
 
-        else
-        {
-            //
-        }
+                $updategadai = Gadai::where('norujukan','=',$request->norujukan)->first();
+                $updategadai->taglel = 0;
+                $updategadai->update();  
+                    
+                $marhundelete = LelongBid::where('id', $request->lelongbid_id)->delete();
+            }
+
+            else
+            {
+                //
+            }
         
         return redirect()->route('pengesahan.senarailelongubahmutu')->with('success','Pengesahan Mutu Marhun Berjaya');
     }
@@ -632,41 +788,21 @@ class MarhunController extends Controller
          
     }
 
-    public function pcdelete($id, $lelongbid_id)
-    {
-        $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid_id)->first();
-        $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
-        ->where('pengesahan.lelongbid_id', $lelongbid_id)
-        ->select('pengesahan.id as pengesahan_id')
-        ->first();
-
-        $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
-        ->where('lelongbid_id','=',$lelongbid_id)
-        ->get();
-        
-        $lelongbid = LelongBid::where('id', $lelongbid_id)->first();
-        $txtmarhun = ",1 " . $lelongbidmarhun->marhun ;
-        $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
-        $lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan;
-        $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
-        $lelongbid->save();
-
-    }
-
+    
     public function senarailelong()
     {
         $arrayinfo = [];
-
+        
         $lelong = Lelong::where('sts_lelong', 0)
         ->get()->toArray();
-
+        
         foreach($lelong as $details)
         {
             $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id', $details['id'])
             ->get()
             ->toArray();
-
+            
             array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
         }
 
@@ -679,35 +815,35 @@ class MarhunController extends Controller
         ->where('tangguhlelong.lelong_id', $id)
         ->whereNotNull('tangguhlelong.tarikhtangguh')
         ->select('tangguhlelong.id as tangguhlelong_id',
-                 'tangguhlelong.lelongbid_id',
-                 'tangguhlelong.norujukan',
-                 'tangguhlelong.tarikhtangguh', 
-                 'tangguhlelong.ditangguh_pada',
-                 'tangguhlelong.ditangguh_oleh',
-                 'tangguhlelong.nota',
-                 'lelong.id as lelong_id',
-                 'lelong.tarikh_lelong',
-                 'lelong.harga_emas_asas',
-                 'lelong.jbg',
-                 'lelong.cajlelong',
-                 'lelong.sts_lelong'
+        'tangguhlelong.lelongbid_id',
+        'tangguhlelong.norujukan',
+        'tangguhlelong.tarikhtangguh', 
+        'tangguhlelong.ditangguh_pada',
+        'tangguhlelong.ditangguh_oleh',
+        'tangguhlelong.nota',
+        'lelong.id as lelong_id',
+        'lelong.tarikh_lelong',
+        'lelong.harga_emas_asas',
+        'lelong.jbg',
+        'lelong.cajlelong',
+        'lelong.sts_lelong'
         )
         ->get();
         // dd($tangguhlelong);
-
+        
         foreach($tangguhlelong as $index1=>$tanguhlel)
         {
             $getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
             ->where('lelong_id', $id)
             ->first();
-
+            
             $tangguhlelong[$index1]['details'] = $tanguhlel;
             $tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
         }
-
+        
         return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_name'));
     }
-
+    
     public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
     {
         $tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
@@ -715,31 +851,53 @@ class MarhunController extends Controller
         ->where('tangguhlelong.id', $tangguhlelong_id)
         ->where('tangguhlelong.lelong_id', $id)
         ->select('tangguhlelong.id as tangguhlelong_id',
-                'tangguhlelong.lelong_id',
-                'tangguhlelong.lelongbid_id',
-                'tangguhlelong.norujukan',
-                'tangguhlelong.pinjaman',
-                'tangguhlelong.tarikhtangguh',
-                'tangguhlelong.nota as tangguh_nota',
-                'tangguhlelong.pinjaman',
-                'gadaimarhun.bil',
-                'gadaimarhun.marhun',
-                'gadaimarhun.nota as gadai_nota',
-                'gadaimarhun.karat',
-                'gadaimarhun.berat',
-                'gadaimarhun.harga',
+        'tangguhlelong.lelong_id',
+        'tangguhlelong.lelongbid_id',
+        'tangguhlelong.norujukan',
+        'tangguhlelong.pinjaman',
+        'tangguhlelong.tarikhtangguh',
+        'tangguhlelong.nota as tangguh_nota',
+        'tangguhlelong.pinjaman',
+        'gadaimarhun.bil',
+        'gadaimarhun.marhun',
+        'gadaimarhun.nota as gadai_nota',
+        'gadaimarhun.karat',
+        'gadaimarhun.berat',
+        'gadaimarhun.harga',
                 'gadaimarhun.n_marhun'
         )
         ->get();
-
+        
         $caw_names = GadaiMarhun::join('cawangan', 'gadaimarhun.kodcaw', '=', 'cawangan.caw_code')
         ->where('gadaimarhun.norujukan', $norujukan)
         ->select('cawangan.caw_name')
         ->first();
         // dd($caw_names);
-
+        
         return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan', 'caw_names'));
-
+        
     }
+
+    //Operasi
     
+    // public function pcdelete($id, $lelongbid_id)
+    // {
+    //     $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid_id)->first();
+    //     $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
+    //     ->where('pengesahan.lelongbid_id', $lelongbid_id)
+    //     ->select('pengesahan.id as pengesahan_id')
+    //     ->first();
+    
+    //     $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
+    //     ->where('lelongbid_id','=',$lelongbid_id)
+    //     ->get();
+        
+    //     $lelongbid = LelongBid::where('id', $lelongbid_id)->first();
+    //     $txtmarhun = ",1 " . $lelongbidmarhun->marhun ;
+    //     $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
+    //     $lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan;
+    //     $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
+    //     $lelongbid->save();
+    
+    // }
 }
diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php
index 02e700da..27fffe79 100644
--- a/app/Http/Controllers/Mobile/LelongMobileController.php
+++ b/app/Http/Controllers/Mobile/LelongMobileController.php
@@ -152,6 +152,29 @@ class LelongMobileController extends Controller
         return response()->json($lelongbidder);
     }
 
+    // please do not delete this changes
+    // backup web pembida
+    public function listBidItemWeb(Request $request){
+
+        $lelongbidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+        ->where('user_id','=', $request->user_id)
+        ->select('lelongbid.lelong_id')
+        ->groupBy('lelongbid.lelong_id')
+        ->get()->toArray();
+
+        foreach($lelongbidder as $index1=>$lelbid)
+        {
+            $lelongbid = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+            ->where('lelong_id', $lelbid['lelong_id'])
+            ->where('lelongbidder.user_id', $request->user_id)
+            ->get()->toArray();
+
+            $lelongbidder[$index1]['lelongbid'] = $lelongbid;
+        }
+
+        return response()->json($lelongbidder);
+    }
+
     public function searchLelByCaw(Request $request){
 
         $currentdate = Carbon::now();
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index d812c534..3b351d78 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -19,15 +19,30 @@ class PaymentController extends Controller
 {
     public function SenaraiLelongBayar(Request $request){
 
+        $arrayinfo = [];
+
         $user = Auth::user();
 
-        $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
+        $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
-        ->where('cawangan.caw_code', $user->kodcaw)
+        ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->where('lelong.sts_lelong', 3)
-        ->get();
+        ->where('cawangan.caw_code', $user->kodcaw)
+        ->groupBy('lelong_id')
+        ->get()
+        ->toArray();
 
-        return view('pembayaran.senarailelongbayaran',compact('senarai'));
+        foreach($lelong as $info)
+        {
+            $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$info['lelong_id'])
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
+
+        }
+
+        return view('pembayaran.senarailelongbayaran',compact('lelong', 'arrayinfo'));
 
     }
 
diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php
index 9f53592c..46909cf5 100644
--- a/app/Http/Controllers/PembidaController.php
+++ b/app/Http/Controllers/PembidaController.php
@@ -234,7 +234,6 @@ class PembidaController extends Controller
             $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index1]['totalPay'] = $total_payment;
             $listwinner[$index1]['payment_id'] = $payment_id;
-            $listwinner[$index1]['jenisbayaran']['remarks'] = $detailspayment['remark'];
             $listwinner[$index1]['jenisbayaran']['status_payment'] = $sag->status_payment;
             $listwinner[$index1]['jenisbayaran']['status'] = $detailspayment['status'];
 
@@ -266,8 +265,6 @@ class PembidaController extends Controller
                  'lelongbid.marhun',
                  'lelongbid.hargaasas',
                  'lelongbidder.hargabida',
-                 'lelongbid.nilaimarhun',
-                 'lelongbid.berat',
                  'lelongbidder.masa_bidaan',
                  'lelongbidder.notelbimbit'
                 )
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/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index 6e9cc4f1..f47b76ce 100644
--- a/app/Http/Controllers/TangguhLelongController.php
+++ b/app/Http/Controllers/TangguhLelongController.php
@@ -68,28 +68,35 @@ class TangguhLelongController extends Controller
             $lelong = Lelong::where('id', $request->lelong_id)->first();
             
             $getic = Customer::join('gadai', 'customer.kpbaru', '=', 'gadai.nokp')
-            ->where('customer.kpbaru', '=', $request->nokp)
-            ->where('gadai.tempoh', '=', $lelong->jbg)
+            ->where('gadai.nokp', '=', $request->nokp)
+            // ->where('gadai.tempoh', '=', $lelong->jbg)
             ->get();
+            // dd($getic);
             
             foreach($getic as $index1=>$ic)
             {
-                $getnorujukan = LelongBid::where('norujukan', $ic->norujukan)
+                // dd($ic);
+                $getnorujukan = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id')
+                ->where('norujukan', $ic->norujukan)
                 ->where('jbg', $ic->tempoh)
                 ->get();
+                // dd($getnorujukan);
                 
                 foreach($getnorujukan as $norujukan)
                 {
+                    // dd($norujukan);
                     $pengesahan = Pengesahan::where('lelongbidmarhun_id', $norujukan->id)
                     ->where('lelongbid_id', $norujukan->lelongbid_id)
                     ->where('norujukan', $norujukan->norujukan)
                     ->first();
+                    // dd($pengesahan);
 
                     $adapengesahan = Pengesahan::join('lelongbid', 'pengesahan.norujukan', '=', 'lelongbid.norujukan')
                     ->where('pengesahan.norujukan', $norujukan->norujukan)
                     ->where('pengesahan.status_ubah', 6)
                     ->where('pengesahan.lelong_id', $request->lelong_id)
                     ->get();
+                    // dd($adapengesahan);
 
                     if($pengesahan)
                     {
@@ -99,11 +106,16 @@ class TangguhLelongController extends Controller
                     {
                         //
                     }
+
+                    $getic[$index1]['user_details'] = $getnorujukan;
+                    // dd($getic[$index1]['user_details']);
+                    $getic[$index1]['sdhadapengesahan'] = $adapengesahan;
                 }
                 
-                $getic[$index1]['user_details'] = $getnorujukan;
-                $getic[$index1]['sdhadapengesahan'] = $adapengesahan;
             }
+            // dd($getic->toArray());
+            $getic_array = $getic->toArray();
+            dd($getic_array);
             $lelong_id = $request->lelong_id;
     
             return view('tangguhlelong.searchbyic', compact('getic', 'user', 'lelong_id'));
@@ -199,7 +211,7 @@ class TangguhLelongController extends Controller
         $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
         ->where('sts_lelong', 0)
-        ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->groupBy('lelong_id')
         ->get()
         ->toArray();
diff --git a/app/Models/CawanganLelong.php b/app/Models/CawanganLelong.php
index 2c86b25f..bef247b3 100644
--- a/app/Models/CawanganLelong.php
+++ b/app/Models/CawanganLelong.php
@@ -15,6 +15,9 @@ class CawanganLelong extends Model
         'batchlel',
         'lelong_id',
         'caw_id',
+        'status_online',
+        'masamula_lelong',
+        'masatamat_lelong',
         'online',
         'export_data_sts',
         'import_data_sts',
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/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php
index ce60c677..2e4bb3ae 100644
--- a/database/migrations/2021_12_14_041557_create_lelongs_table.php
+++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php
@@ -33,6 +33,9 @@ class CreateLelongsTable extends Migration
             $table->integer('batchlel')->nullable();
             $table->unsignedBigInteger('lelong_id')->unsigned();
             $table->unsignedBigInteger('caw_id')->unsigned();
+            $table->integer('status_online')->default(0)->nullable();
+            $table->time('masamula_lelong')->nullable();
+            $table->time('masatamat_lelong')->nullable();
             $table->string('online');
             $table->string('export_data_sts')->nullable();
             $table->string('import_data_sts')->nullable();
diff --git a/resources/views/account/senarailelongan.blade.php b/resources/views/account/senarailelongan.blade.php
index d2bc5771..646569fa 100644
--- a/resources/views/account/senarailelongan.blade.php
+++ b/resources/views/account/senarailelongan.blade.php
@@ -14,7 +14,7 @@
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
-                        <th>Kod Cawangan</th>
+                        <th>Cawangan</th>
                         <th>Tarikh Lelong</th>
                         <th>Status Lelong</th>
                         <th class="text-center">Action</th>
@@ -24,7 +24,7 @@
                 @foreach($senarai as $data)
                 <tr>
                     <td>{{$loop->iteration}}</td>
-                    <td>{{ $data->caw_code }}</td>
+                    <td>{{ $data->caw_name }}</td>
                     <td>{{ $data->tarikh_lelong }}</td>
                     <td>{{ $data->sts_lelong }}</td>
                     <td>
diff --git a/resources/views/home.blade copy.php b/resources/views/home.blade copy.php
new file mode 100644
index 00000000..d73f6b0f
--- /dev/null
+++ b/resources/views/home.blade copy.php	
@@ -0,0 +1,134 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12 mx-auto card p-1">
+            <div class="card">
+                <div class="card-header">{{ __('Dashboard') }}</div>
+                <div class="card-body">
+                    @if (session('status'))
+                        <div class="alert alert-success" role="alert">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    {{ __('You are logged in!') }}
+                    @hasrole('admin')
+                        I am a admin!
+                    @endhasrole
+                    @hasrole('khazanah')
+                        I am a khazanah!
+                    @endhasrole
+                    @hasrole('teller')
+                        I am a teller!
+                    @endhasrole
+                    @hasrole('pengurus-cawangan')
+                        I am a pengurus-cawangan!
+                    @endhasrole
+                    @hasrole('jurulelong')
+                        I am a jurulelong! 
+                        <table class="table table-striped  table-xl text-center"  id="tablelelong" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>No</th>
+                            <th>Lelong ID</th>
+                            <th>T.Lelong</th>
+                            <th>Fasa</th>
+                            <th>Cawangan</th>
+                            <th>Status</th>
+                            <th>Masa Tamat</th>
+                            <th>Harga Emas</th>
+                            <th>JBG</th>
+                            <!-- <th>Caj Lelong</th> -->
+                            <th class="text-center">Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        
+                        @foreach ($arrayinfo as $lel)
+                        <br><strong>LELONGAN HARI INI</strong>
+                        <tr>
+                            <td>{{$loop->iteration}}</td>
+                            <td>{{ $lel['info']['lelong_id'] }}</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
+                            </td>
+                            <td align = 'center'>
+                                @foreach($lel['detailsinfo'] as $details)
+                                    @if($details['status_online'] == '0')
+                                        <a class="startlelongcawangan" href="{{ route('lelong.startcawangan',[$lel['info']['lelong_id'],'cawid'=>$details['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Cawangan"><i class="fa fa-play"></i></a><br>
+                                    
+                                    @elseif($details['status_online'] == '1')
+                                        <a class="stoplelongcawangan" href="{{ route('lelong.stopcawangan',[$lel['info']['lelong_id'],'cawid'=>$details['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong Cawangan"><i class="fa fa-stop"></i></a> <br>  
+                                    @endif
+                                @endforeach
+                            </td>
+                            <td>  @foreach($lel['detailsinfo'] as $details)
+                                <span class="m-2">{{$details['masatamat_lelong']}}</span><br>
+                                @endforeach</td>
+                            <td>{{$lel['info']['harga_emas_asas']}}</td>
+                            <td>{{$lel['info']['jbg']}}</td>
+                            <!-- <td>{{$lel['info']['cajlelong']}}</td>                      -->
+                            
+                            <td class="text-center">
+                            @hasrole('jurulelong')
+                                
+                                <!-- @if($lel['info']['sts_lelong'] == 0) -->
+                                    <a  href="{{ route('lelong.refreshhome',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a>
+                                    <a class="startlelongall" href="{{ route('lelong.startall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Semua" style="margin-right:40px"><i class="fa fa-play"></i></a>
+                                    <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 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> -->
+                                <!-- @elseif ($lel['info']['sts_lelong'] == 2) -->
+                                    <a  href="{{ route('lelong.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a>
+                                <!-- @elseif ($lel['info']['sts_lelong'] == 3) -->
+                                    <a  href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
+                                <!-- @else -->
+                                    <a class="stoplelongall" href="{{ route('lelong.stopall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><i class="fa fa-stop"></i></a>
+                                <!-- @endif -->
+                            @endhasrole
+                            <!-- @hasrole('operasi')
+                                
+                                @if($lel['info']['sts_lelong'] == 0)
+                                    <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>
+                                @endif
+                            @endhasrole -->
+                            </td>
+                        </tr>
+                        @endforeach
+
+
+
+                    </tbody>
+                </table>
+                    @endhasrole
+                    @hasrole('operasi')
+                        I am a operasi!
+                    @endhasrole
+                    @hasrole('account')
+                        I am a account!
+                    @endhasrole
+                    @hasrole('pembida')
+                        I am a pembida!
+                    @endhasrole
+                </div>
+            </div>      
+        </div>
+    </div>
+
+            
+  
+</div>
+@endsection
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 4991a5c8..bef751b2 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -1,12 +1,11 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
+<div class="container-fluid">
+    <div class="row">
+    <div class="col-md-11 mx-auto">
             <div class="card">
                 <div class="card-header">{{ __('Dashboard') }}</div>
-
                 <div class="card-body">
                     @if (session('status'))
                         <div class="alert alert-success" role="alert">
@@ -28,7 +27,94 @@
                         I am a pengurus-cawangan!
                     @endhasrole
                     @hasrole('jurulelong')
-                        I am a jurulelong!
+                        I am a jurulelong! 
+                        <table class="table table-striped  table-xl text-center"  id="tablelelong" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>No</th>
+                            <th>Lelong ID</th>
+                            <th>T.Lelong</th>
+                            <th>Fasa</th>
+                            <th>Cawangan</th>
+                            <th>Status</th>
+                            <th>Masa Tamat</th>
+                            <th>Harga Emas</th>
+                            <th>JBG</th>
+                            <!-- <th>Caj Lelong</th> -->
+                            <th class="text-center">Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        
+                        @foreach ($arrayinfo as $lel)
+                        <br><strong>LELONGAN HARI INI</strong>
+                        <tr>
+                            <td>{{$loop->iteration}}</td>
+                            <td>{{ $lel['info']['lelong_id'] }}</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
+                            </td>
+                            <td align = 'center'>
+                                @foreach($lel['detailsinfo'] as $details)
+                                    @if($details['status_online'] == '0')
+                                        <a class="startlelongcawangan" href="{{ route('lelong.startcawangan',[$lel['info']['lelong_id'],'cawid'=>$details['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Cawangan"><i class="fa fa-play"></i></a><br>
+                                    
+                                    @elseif($details['status_online'] == '1')
+                                        <a class="stoplelongcawangan" href="{{ route('lelong.stopcawangan',[$lel['info']['lelong_id'],'cawid'=>$details['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong Cawangan"><i class="fa fa-stop"></i></a> <br>  
+                                    @endif
+                                @endforeach
+                            </td>
+                            <td>  @foreach($lel['detailsinfo'] as $details)
+                                <span class="m-2">{{$details['masatamat_lelong']}}</span><br>
+                                @endforeach</td>
+                            <td>{{$lel['info']['harga_emas_asas']}}</td>
+                            <td>{{$lel['info']['jbg']}}</td>
+                            <!-- <td>{{$lel['info']['cajlelong']}}</td>                      -->
+                            
+                            <td class="text-center">
+                            @hasrole('jurulelong')
+                                
+                                <!-- @if($lel['info']['sts_lelong'] == 0) -->
+                                    <a  href="{{ route('lelong.refreshhome',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a>
+                                    <a class="startlelongall" href="{{ route('lelong.startall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Semua" style="margin-right:40px"><i class="fa fa-play"></i></a>
+                                    <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.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"  style="margin-right:40px"><i class="fas fa-users-cog"></i></a>
+                                    <a  href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"  style="margin-right:40px"><i class="fas fa-trophy"></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> -->
+                                <!-- @elseif ($lel['info']['sts_lelong'] == 2) -->
+                                    <a  href="{{ route('lelong.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a>
+                                <!-- @elseif ($lel['info']['sts_lelong'] == 3) -->
+                                    <a  href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
+                                <!-- @else -->
+                                    <a class="stoplelongall" href="{{ route('lelong.stopall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><i class="fa fa-stop"></i></a>
+                                <!-- @endif -->
+                            @endhasrole
+                            <!-- @hasrole('operasi')
+                                
+                                @if($lel['info']['sts_lelong'] == 0)
+                                    <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>
+                                @endif
+                            @endhasrole -->
+                            </td>
+                        </tr>
+                        @endforeach
+
+
+
+                    </tbody>
+                </table>
                     @endhasrole
                     @hasrole('operasi')
                         I am a operasi!
@@ -40,8 +126,11 @@
                         I am a pembida!
                     @endhasrole
                 </div>
-            </div>
+            </div>      
         </div>
     </div>
+
+            
+  
 </div>
 @endsection
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 392f6c82..eea37d40 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -48,6 +48,15 @@
       <li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
         <a href="{{url('marhun/senarailelongmarhun')}}">Marhun</a>
       </li>
+
+      <li class="{{ (request()->is('marhun/*')) ? 'active' : '' }}">
+        <a href="#marhunSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Tangguh Lelong</a>
+        <ul class="list-unstyled collapse {{ (request()->is('marhun/*')) ? 'show' : '' }}" id="marhunSubmenu" >
+          <li class="{{ (request()->is('marhun/senlelmarhun/*') || request()->is('marhun/senlelmarhun') ) ? 'active' : '' }}">
+            <a href="{{url('marhun/senlelmarhun')}}">Senarai Lelong</a>
+          </li>
+        </ul>
+      </li>
       @endhasrole
       @hasrole('teller')
       <!-- <li class="{{ (request()->is('home')) ? 'active' : '' }}">
@@ -97,16 +106,27 @@
           <li class="{{ (request()->is('lelong/senarailelong/*') || request()->is('lelong/senarailelong') ) ? 'active' : '' }}">
             <a href="{{url('lelong/senarailelong')}}">Senarai Lelong</a>
           </li>
-         </ul>
+        </ul>
+      </li>
+      <li class="{{ (request()->is('pemenang/*')) ? 'active' : '' }}">
+        <a href="#pemenangSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Pemenang</a>
+        <ul class="list-unstyled collapse {{ (request()->is('pemenang/*')) ? 'show' : '' }}" id="pemenangSubmenu" >
+          <li class="{{ (request()->is('pemenang/listcawangan/*') || request()->is('pemenang/listcawangan') ) ? 'active' : '' }}">
+            <a href="{{url('pemenang/listcawangan')}}">Jana Pemenang</a>
+          </li>
+          <li class="{{ (request()->is('pemenang/listpemenang/*') || request()->is('pemenang/listpemenang') ) ? 'active' : '' }}">
+            <a href="{{url('pemenang/listpemenang')}}">Senarai Pemenang</a>
+          </li>
+          </ul>
       </li>
       @endhasrole
       @hasrole('operasi')
       <li class="{{ (request()->is('importdata/*')) ? 'active' : '' }}">
         <a href="{{url('importdata/importdatacawangan')}}">Import Data</a>
       </li>
-      <li class="{{ (request()->is('notistamatkontrak/*')) ? 'active' : '' }}">
+      <!-- <li class="{{ (request()->is('notistamatkontrak/*')) ? 'active' : '' }}">
         <a href="{{url('notistamatkontrak/sebelumtamatkont')}}">Notis Tamat Kontrak</a>
-      </li>
+      </li> -->
       <li class="{{ (request()->is('analisa/*')) ? 'active' : '' }}">
         <a href="#analisaSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Simulasi</a>
         <ul class="list-unstyled collapse {{ (request()->is('analisa/*')) ? 'show' : '' }}" id="analisaSubmenu" >
@@ -125,7 +145,7 @@
             <a href="{{url('lelong/senarailelong')}}">Senarai Lelong</a>
           </li>
           <li class="{{ (request()->is('lelong/senarailelongtaklaku/*') || request()->is('lelong/senarailelongtaklaku') ) ? 'active' : '' }}">
-            <a href="{{url('lelong/senarailelongtaklaku')}}">Senarai Lelong Tak Laku</a>
+            <a href="{{url('lelong/senarailelongtaklaku')}}">Senarai Lelong Tidak Laku</a>
           </li>
           </ul>
       </li>
diff --git a/resources/views/jurulelong/listcawangan.blade.php b/resources/views/jurulelong/listcawangan.blade.php
new file mode 100644
index 00000000..634fab2d
--- /dev/null
+++ b/resources/views/jurulelong/listcawangan.blade.php
@@ -0,0 +1,110 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-11 mx-auto card p-4">
+            
+            @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">
+                <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>No</th>
+                            <th>Tarikh Lelong</th>
+                            <th>Nama Cawangan</th>
+                            <th>Harga Emas Asas</th>
+                            <th>JBG</th>
+                            <th>Caj Lelong</th>
+                            <th class="text-center">Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach ($arrayinfo as $lel)
+                        <tr>
+                            <td>{{$loop->iteration}}</td>
+                            <td>{{ $lel['detail']['tarikh_lelong']}}</td>
+                            <td>
+                                @foreach($lel['detailsinfo'] as $details)
+                                    <span class="m-2">{{$details['caw_name']}}</span><br>
+                                @endforeach
+                            </td>
+                            <td>{{$lel['detail']['harga_emas_asas']}}</td>
+                            <td>{{$lel['detail']['jbg']}}</td>
+                            <td>{{$lel['detail']['cajlelong']}}</td>                     
+                            <td>
+                                <a  href="{{ route('pengesahan.senaraitangguhlelong', [ $lel['detail']['id'], 'caw_name'=>$details['caw_name'] ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </form>
+        </div>
+        
+    </div>
+</div>
+<script>
+    //Enable tooltips everywhere
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+
+    var tablelelong = $('#tablelelong').DataTable( {
+        "columnDefs": [ 
+            {
+            "targets": 0,
+            "orderable": false
+            }, 
+            {
+            "targets": 5,
+            "orderable": false
+            }
+        ],
+        order: [[0, 'asc']],
+        // "ordering": 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-plus" id="test"></i>',
+                titleAttr: 'Tambah Simulasi',
+                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();
+                }
+            }
+        ]
+    });
+
+    $('.addsim').tooltip();
+    $('.export').tooltip();
+    // $( '.dt-buttons').addClass('btn-group');
+    $( '.addsim').removeClass('dt-button');
+    $( '.export').removeClass('dt-button');
+
+    function selectall(cb) {
+        tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            $(this).prop('checked', cb.checked);
+        })
+    }
+</script>
+     
+@endsection
diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php
index 4ec82c05..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,8 +68,11 @@
                             @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>
                                 @endif
                             @endhasrole
                             </td>
diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php
index 58fa4c1a..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>
@@ -154,7 +154,7 @@
             // "ordering": false,
             "info": false,
             "lengthChange": false,
-            "pageLength": 100000000,
+            "pageLength": 999999,
             dom: 'Bfrtip',
             // buttons: [
             //     // 'copy', 'excel', 'pdf'
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/senaraisagpemenang.blade.php b/resources/views/lelong/senaraisagpemenang.blade.php
index bb12e6ba..065b6ac2 100644
--- a/resources/views/lelong/senaraisagpemenang.blade.php
+++ b/resources/views/lelong/senaraisagpemenang.blade.php
@@ -35,7 +35,7 @@
             </tbody>
         </table>
         <div class="modal-footer">
-            <a  href="{{ route('lelong.senarailelong') }}" class="btn btn-primary">Kembali</a>
+            <a  href="{{ route('lelong.senaraipemenang', ) }}" class="btn btn-primary">Kembali</a>
         </div>
         </div>
     </div>
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 426a2318..c0af3dd3 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -68,22 +68,25 @@
                             </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>
                             <td class="text-center">
-                                <a  onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{  $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
-                                <a class="confirmdel" id="btndelete" data-lelongbidmarhun="{{ $item->id }}" data-lelongbid="{{ $item->lelongbid_id }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
+                                @if($lelongbid->status_semak == 1)
+                                @else
+                                    <a  onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{  $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
+                                    <a class="confirmdel" id="btndelete" data-lelongbidmarhun="{{ $item->id }}" data-lelongbid="{{ $item->lelongbid_id }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
+                                @endif
                             </td>
                         </tr>
                         @endforeach
@@ -91,7 +94,11 @@
                     
                 </table>
             <div class="modal-footer" style="margin-top:2%;">
-            <a  href="{{ route('marhun.senaraimarhun', $lelong_id) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
+            @if($lelongbid->status_semak == 0)
+
+            @else
+                <a  href="{{ route('marhun.senaraimarhun', $lelong_id) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
+            @endif
             @if($lelongbid->status_semak == 0)
                 <button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak</button>
             @elseif($lelongbid->status_semak == 1)
@@ -223,8 +230,8 @@
 <script>
     function confirm() {
         $.confirm({
-        title: 'Confirmation',
-        content: 'Anda pasti?',
+        title: 'Perhatian!',
+        content: 'Anda pasti telah membuat semakan untuk kesemua marhun?',
         type: 'green',
         typeAnimated: true,
         buttons: {
@@ -329,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));
                 }
@@ -381,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/marhun/senarailelongmarhun.blade.php b/resources/views/marhun/senarailelongmarhun.blade.php
index 998d56b4..6b8f2539 100644
--- a/resources/views/marhun/senarailelongmarhun.blade.php
+++ b/resources/views/marhun/senarailelongmarhun.blade.php
@@ -14,23 +14,37 @@
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
+                        <th>Cawangan</th>
+                        <th>Batch Lelong</th>
                         <th>Tarikh Lelong</th>
                         <th>Status Lelong</th>
                         <th class="text-center">Action</th>
                     </tr>
             </thead>
             <tbody>
-                @foreach($senarai as $data)
+                @foreach($arrayinfo as $lel)
                 <tr>
                     <td>{{$loop->iteration}}</td>
-                    <td>{{ $data->tarikh_lelong }}</td>
+                   
                     <td>
-                        @if($data->sts_lelong == 0)
+                        @foreach($lel['detailsinfo'] as $details)
+                        <span class="m-2">{{$details['caw_name']}}</span><br>
+                        @endforeach
+
+                    </td>
+                    <td>{{ $lel['info']['lelong_id']}}</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>
+                        @if($lel['info']['sts_lelong'] == 0)
                             <button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
                         @endif
                     </td>
-                    <td><a href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$data['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px" ><i class="fas fa-download"></i></a>
-                        <a href=" {{ route('marhun.senaraimarhun', ['lelong_id'=>$data['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun" ><i class="far fa-edit"></i></a></td>
+                    <td><a href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px" ><i class="fas fa-download"></i></a>
+                        <a href=" {{ route('marhun.senaraimarhun', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun" ><i class="far fa-edit"></i></a></td>
                 </tr>
                 @endforeach
             </tbody>
diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php
index 6c876094..12e351ab 100644
--- a/resources/views/marhun/senaraimarhun.blade.php
+++ b/resources/views/marhun/senaraimarhun.blade.php
@@ -10,30 +10,51 @@
                     <p>{{ $message }}</p>
                 </div>
             @endif
+            <div class="container">
+                <div class="row mb-2">
+                    <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
+                        <p><u><b>Bilangan SAG {{ $caw['caw_name'] }}</b></u><p>
+                        <p><b>Keseluruhan : {{ sizeof($lelongbid) }}</b> </p>
+                        <p><b>Belum Disemak : {{ sizeof($sag) }}</b></p>
+                        <p><b>Dalam Proses : {{ sizeof($dalamproses) }}</b></p>
+                        <p><b>Sudah Disemak : {{ sizeof($sdhdisemak) }}</b></p>
+                        <p><b>Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkan) }}</b></p>
+                    </div>
+                </div>
+            </div>
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
                 <table class="table table-striped  table-xl text-center" id="senaraimarhun" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
-                            <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
-                            <th>Nombor Rujukan</th>
+                            <th>Bil</th>
+                            <th>No Rujukan</th>
                             <th>Tarikh Lelong</th>
                             <th>Status Semak</th>
                             <th class="text-center">Action</th>
                         </tr>
                     </thead>
                     <tbody>
-                        
                         @foreach ($lelongbid as $bid)
                         <tr>
-                            <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $bid->id }}"></td>
+                            <td>{{ $loop->iteration }}</td>
                             <td>{{ $bid->norujukan }}</td>
                             <td>{{ $bid->t_lelong }}</td>
                             <td>
                                 @if($bid->status_semak == 0)
-                                    <button class="btn btn-secondary btn-sm hovernone-secondary" disabled>BELUM DISEMAK</button>
-                                @elseif($bid->status_semak == 1)
-                                    <button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISEMAK</button>
+                                    @if($bid['pengesahan'] !== null)
+                                        <button class="btn btn-warning btn-sm hovernone-warning" disabled>DALAM PROSES</button>
+                                    @else
+                                        <button class="btn btn-danger btn-sm hovernone-danger" disabled>BELUM DISEMAK</button>
+                                    @endif
+                                @elseif($bid['pengesahan'] !== null && $bid->status_semak == 1)
+                                        @if($bid['pengesahan']['disahkan_oleh'] !== null)
+                                            <button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISAHKAN</button>
+                                        @else
+                                            <button class="btn btn-warning btn-sm hovernone-warning" disabled>DALAM PROSES</button>
+                                        @endif
+                                @elseif($bid->status_semak == 1 && $bid['pengesahan'] === null)
+                                    <button class="btn btn-outline-success btn-sm" disabled>SUDAH DISEMAK</button>
                                 @endif
                             </td>
                             <td class="text-center">
@@ -87,11 +108,11 @@
                 "orderable": false
                 }
             ],
-            order: [[1, 'asc']],
+            order: [[0, 'asc']],
             // "ordering": false,
             "info": false,
             "lengthChange": false,
-            "pageLength": 15,
+            "pageLength": 999999,
             dom: 'Bfrtip',
             buttons: [
                 // 'copy', 'excel', 'pdf'
diff --git a/resources/views/marhun/senlelmarhun.blade.php b/resources/views/marhun/senlelmarhun.blade.php
new file mode 100644
index 00000000..2528d9c1
--- /dev/null
+++ b/resources/views/marhun/senlelmarhun.blade.php
@@ -0,0 +1,105 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-11 mx-auto card p-4">
+        @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    <p>{{ $message }}</p>
+                </div>
+        @endif
+        <table class="table table-striped  table-xl text-center" id="senarailelongonline" style="width:100%">
+            <thead class="bg-primary text-white">
+                    <tr>
+                        <th>No</th>
+                        <th>Cawangan</th>
+                        <th>Tarikh Lelong</th>
+                        <th>Status Lelong</th>
+                        <th class="text-center">Action</th>
+                    </tr>
+            </thead>
+            <tbody>
+                @foreach($arrayinfo as $lel)
+                <tr>
+                    <td>{{$loop->iteration}}</td>
+                    <td>
+                        @foreach($lel['detailsinfo'] as $details)
+                        <span class="m-2">{{$details['caw_name']}}</span><br>
+                        @endforeach
+                    </td>
+                    <td>{{ $lel['info']['tarikh_lelong']}}</td>
+                    <td>
+                        @if($lel['info']['sts_lelong'] == 0)
+                            <button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
+                        @endif
+                    </td>
+                    <td>
+                        <a href=" {{ route('marhun.sentangguhlelongsah', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Tangguh Lelong" ><i class="fas fa-search"></i></a>
+                    </td>
+                </tr>
+                @endforeach
+            </tbody>
+        </table>
+        </div>
+    </div>
+</div>
+
+<script>
+    //Enable tooltips everywhere
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+
+    var tablesenarailelongonline = $('#senarailelongonline').DataTable({
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                }, 
+                {
+                "targets": 3,
+                "orderable": false
+                }
+            ],
+            order: [[1, 'asc']],
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 15,
+            dom: 'Bfrtip',
+            // buttons: [
+            //     {
+            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
+            //         text: '<i class="fas fa-plus" id="test"></i>',
+            //         titleAttr: 'Tambah Cawangan',
+            //         action: function ( e, dt, node, config ) {
+            //             // alert( 'Button activated' );
+            //             // console.log('hye');
+                        
+            //             $('#myModal').modal("show");
+            //             $('#myModal').on('shown.bs.modal', function () {
+            //                 $('#rolename').trigger('focus')
+            //             })
+            //         }
+            //     },
+            //     {
+            //         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();
+            //         }
+            //     }
+            // ]
+    });
+
+        // $('.addcaw').tooltip();
+        // $('.export').tooltip();
+        // // $( '.dt-buttons').addClass('btn-group');
+        // $( '.addcaw').removeClass('dt-button');
+        // $( '.export').removeClass('dt-button');
+
+</script>
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/marhun/sentangguhlelongsah.blade.php b/resources/views/marhun/sentangguhlelongsah.blade.php
new file mode 100644
index 00000000..8e985b6c
--- /dev/null
+++ b/resources/views/marhun/sentangguhlelongsah.blade.php
@@ -0,0 +1,108 @@
+@extends('layouts.app')
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-11 mx-auto card p-4">
+            
+            @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
+            <h3 class="pt-3" style="margin-left:1%;">Senarai Tangguh Lelong Yang Telah Disahkan Oleh Operasi</h3>
+            <br>
+            <form id="exportform" action="" method="POST">
+                <input type="hidden" name="type" value="User">
+                <table class="table table-striped  table-xl text-center" id="sentangguhlelongsah" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>Bil</th>
+                            <th>No Rujukan</th>
+                            <th>Marhun</th>
+                            <th>Berat</th>
+                            <th>Tarikh Tangguh</th>
+                            <th>Pinjaman</th>
+                            <th>Remark</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach ($sdhdisahkan as $sah)
+                        <tr>
+                            <td>{{ $loop->iteration }}</td>
+                            <td>{{ $sah['norujukan'] }}</td>
+                            <td>{{ $sah['marhun'] }}</td>
+                            <td>{{ $sah['berat'] }}</td>
+                            <td>{{ $sah['ditangguh_pada'] }}</td>
+                            <td>{{ $sah['pinjaman'] }}</td>
+                            <td>
+                                <button class="btn btn-primary btn btn-primary" disabled>{{ $sah['nota'] }}</button>
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </form>
+            <div class="modal-footer" style="margin-top:2%;">
+            <a  href="{{ route('marhun.senlelmarhun') }}" class="btn btn-primary">Kembali</a>
+            </div>
+        </div>
+        
+    </div>
+</div>
+
+<script>
+    //Enable tooltips everywhere
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+
+    var tablesentangguhlelongsah = $('#sentangguhlelongsah').DataTable({
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                }, 
+                {
+                "targets": 6,
+                "orderable": true
+                }
+            ],
+            order: [[1, 'asc']],
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 15,
+            dom: 'Bfrtip',
+            // buttons: [
+            //     {
+            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
+            //         text: '<i class="fas fa-plus" id="test"></i>',
+            //         titleAttr: 'Tambah Cawangan',
+            //         action: function ( e, dt, node, config ) {
+            //             // alert( 'Button activated' );
+            //             // console.log('hye');
+                        
+            //             $('#myModal').modal("show");
+            //             $('#myModal').on('shown.bs.modal', function () {
+            //                 $('#rolename').trigger('focus')
+            //             })
+            //         }
+            //     },
+            //     {
+            //         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();
+            //         }
+            //     }
+            // ]
+    });
+
+        // $('.addcaw').tooltip();
+        // $('.export').tooltip();
+        // // $( '.dt-buttons').addClass('btn-group');
+        // $( '.addcaw').removeClass('dt-button');
+        // $( '.export').removeClass('dt-button');
+
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php
index 0731fa08..cf058271 100644
--- a/resources/views/pembayaran/SAGBidItem.blade.php
+++ b/resources/views/pembayaran/SAGBidItem.blade.php
@@ -58,7 +58,7 @@
                     </table>
             </form>
                 <div class="text-right">
-                    <a  href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="btn btn-primary" style="width:15%; margin-right:53%;" >Kembali</a>
+                    <a  href="{{ route('pembayaran.kaunterpembayaran', $lelong_id ) }}" class="btn btn-primary" style="width:15%; margin-right:53%;" >Kembali</a>
                     <button type="button" class="btn btn-info" style="width:15%" id="btnbanktransfer" onclick="confirm()">CDM</button>
                     <button type="button" class="btn btn-success" style="width:15%" id="btnterima" onclick="functerima()">Tunai</button>
                 </div>
diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php
index 8c780cdc..bd932cf7 100644
--- a/resources/views/pembayaran/kaunterpembayaran.blade.php
+++ b/resources/views/pembayaran/kaunterpembayaran.blade.php
@@ -21,6 +21,7 @@
                         <th>Jumlah Bidaan(RM)</th>
                         <th>Amaun Telah Dibayar(RM)</th>
                         <th>Penyata Bayaran</th>
+                        <th>Resit Bayaran</th>
                         <th class="text-center">Action</th>
                     </tr>
             </thead>
@@ -34,6 +35,7 @@
                             <td>{{ $winner['total_surat']}}</td>
                             <td>{{ $winner['totalBid']}}</td>
                             <td>{{ $winner['totalPay']}}</td>
+                            <td></td>
                             <td>
                                 <a href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran" ><i class="fas fa-download"></i></a>
                             </td>
diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php
index 3d249baa..4a54f87b 100644
--- a/resources/views/pembayaran/senarailelongbayaran.blade.php
+++ b/resources/views/pembayaran/senarailelongbayaran.blade.php
@@ -14,22 +14,28 @@
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
+                        <th>Cawangan</th>
                         <th>Tarikh Lelong</th>
                         <th>Status Lelong</th>
                         <th class="text-center">Action</th>
                     </tr>
             </thead>
             <tbody>
-                @foreach($senarai as $data)
+                @foreach($arrayinfo as $data)
                 <tr>
                     <td>{{$loop->iteration}}</td>
-                    <td>{{ $data->tarikh_lelong }}</td>
                     <td>
-                        @if($data->sts_lelong == 3)
+                        @foreach($data['detailsinfo'] as $details)
+                            <span class="m-2">{{$details['caw_name']}}</span><br>
+                        @endforeach
+                    </td>
+                    <td>{{ $data['info']['tarikh_lelong'] }}</td>
+                    <td>
+                        @if($data['info']['sts_lelong'] == 3)
                             <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
                         @endif
                     </td>
-                    <td><a href=" {{ route('pembayaran.kaunterpembayaran', ['lelong_id'=>$data['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a></td>
+                    <td><a href=" {{ route('pembayaran.kaunterpembayaran', ['lelong_id'=>$data['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a></td>
                 </tr>
                 @endforeach
             </tbody>
diff --git a/resources/views/pembida/detailsbidaan.blade.php b/resources/views/pembida/detailsbidaan.blade.php
index 889a3da2..9f531df3 100644
--- a/resources/views/pembida/detailsbidaan.blade.php
+++ b/resources/views/pembida/detailsbidaan.blade.php
@@ -31,8 +31,6 @@
                                 <th>Marhun</th>
                                 <th>Harga Asas (RM)</th>
                                 <th>Harga Bida (RM)</th>
-                                <th>Nilai Marhun (RM)</th>
-                                <th>Berat (gm)</th>
                                 <th>Masa Bidaan</th>
                                 <th>Kaedah Pembayaran</th>
                                 <th>No Resit</th>
@@ -46,8 +44,6 @@
                                 <td>{{ $inf['info']['marhun'] }}</td>
                                 <td>{{ $inf['info']['hargaasas'] }}</td>
                                 <td>{{ $inf['info']['hargabida'] }}</td>
-                                <td>{{ $inf['info']['nilaimarhun'] }}</td>
-                                <td>{{ $inf['info']['berat'] }}</td>
                                 <td>{{ $inf['info']['masa_bidaan'] }}</td>
                                 <td>
                                     @foreach($inf['butiran_bidaan'] as $butiran_bidaan)
diff --git a/resources/views/pembida/pembayaranbidaan.blade.php b/resources/views/pembida/pembayaranbidaan.blade.php
index 74ea3941..ae908c15 100644
--- a/resources/views/pembida/pembayaranbidaan.blade.php
+++ b/resources/views/pembida/pembayaranbidaan.blade.php
@@ -20,7 +20,6 @@
                             <th> Jumlah Bidaan (RM)</th>
                             <th> Amaun Telah Dibayar (RM)</th>
                             <th>Status Pembayaran</th>
-                            <th>Remark</th>
                             <th>Status</th>
                             <th class="text-center">Action</th>
                         </tr>
@@ -41,9 +40,6 @@
                                 <button class="btn btn-info btn-sm" disabled>BIDAAN MENANG</button>
                             @endif
                         </td>
-                        <td>
-                            <button class="btn btn-info btn-sm" disabled>{{ $winner['jenisbayaran']['remarks'] }}</button>
-                        </td>
                         <td>
                             @if($winner['jenisbayaran']['status_payment'] == 1)
                                 <button class="btn btn-success btn-sm" disabled>BERJAYA</button>
diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php
index 33e9432a..1d7e786c 100644
--- a/resources/views/pengesahan/mutumarhun.blade.php
+++ b/resources/views/pengesahan/mutumarhun.blade.php
@@ -8,6 +8,7 @@
                                 @csrf
                     <input type="hidden" name="norujukan" value="{{ $norujukan }}" />
                     <input type="hidden" name="lelong_id" value="{{ $id }}" />
+                    <input type="hidden" name="lelongbid_id" value="{{ $lelongbid['id'] }}" />
                     <input type="hidden" name="jenis_button" value="terima" id="jenis_button" />
             
             @if ($message = Session::get('success'))
@@ -20,10 +21,11 @@
                 <div class="row mb-2">
                     <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>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>Tempoh / JBG : </b> {{ $lelongbid->jbg }}</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>
@@ -131,8 +133,17 @@
                     <input type="hidden" name="lelongbid_id" value="{{ $lelongbid->id }}" />
                     <input type="hidden" name="jenis_button" value="tangguhlelong" id="jenis_button" />
                     <div class="form-group">
-                        <label for="message-text" class="col-form-label">Sila Nyatakan Sebab Tangguh Lelong:</label>
-                        <textarea class="form-control" id="nota" name="nota"></textarea>
+                        <label for="message-text" class="col-form-label"><b>Sila Pilih Sebab Tangguh Lelong:</b></label>
+                        <br>
+                        <br>
+                        <input type="radio" id="mutu" name="nota" value="Perubahan Mutu Tinggi">
+                        <label for="mutu">Perubahan Mutu Tinggi</label><br>
+
+                        <input type="radio" id="berat" name="nota" value="Perubahan Berat Besar">
+                        <label for="berat">Perubahan Berat Besar</label><br>
+
+                        <input type="radio" id="rugi" name="nota" value="Rugi Besar">
+                        <label for="rugi">Rugi Besar</label><br>
                     </div>
                 </form>
             </div>
diff --git a/resources/views/pengesahan/perubahanmutumarhun.blade.php b/resources/views/pengesahan/perubahanmutumarhun.blade.php
index bae9058d..88feaacf 100644
--- a/resources/views/pengesahan/perubahanmutumarhun.blade.php
+++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php
@@ -23,7 +23,7 @@
                     <tbody>
                         @foreach($mutumarhun as $marhun)
                         <tr>
-                            <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
+                            <td>{{ $loop->iteration }}</td>
                             <td>{{ $marhun['cawangan_name'] }}</td>
                             <td>{{ $marhun['norujukan'] }}</td>
                             <td>
diff --git a/resources/views/pengesahan/senarailelongubahmutu.blade.php b/resources/views/pengesahan/senarailelongubahmutu.blade.php
index 6caab9bd..7d0efdbc 100644
--- a/resources/views/pengesahan/senarailelongubahmutu.blade.php
+++ b/resources/views/pengesahan/senarailelongubahmutu.blade.php
@@ -15,24 +15,41 @@
                 <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
-                            <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
+                            <th>No</th>
+                            <th>Cawangan</th>
                             <th>Tarikh Lelong</th>
                             <th>Harga Emas Asas</th>
                             <th>JBG</th>
                             <th>Caj Lelong</th>
+                            <th>Status Lelong</th>
                             <th class="text-center">Action</th>
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach ($lelong as $lel)
+                        @foreach($arrayinfo as $lel)
                         <tr>
-                            <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $lel->id }}"></td>
-                            <td>{{ $lel->tarikh_lelong }}</td>
-                            <td>{{ $lel->harga_emas_asas }}</td>
-                            <td>{{ $lel->jbg }}</td>
-                            <td>{{ $lel->cajlelong }}</td>
+                            <td>{{$loop->iteration}}</td>
+                            <td align = 'left'>
+                                @foreach($lel['detailsinfo'] as $details)
+                                <span class="m-2">{{$details['caw_name']}}</span><br>
+                                @endforeach
+                            </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>
                             <td>
-                                    <a  href="{{ route('pengesahan.perubahanmutumarhun', $lel->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
+                                @if($lel['info']['sts_lelong'] == 0)
+                                    <button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
+                                @endif
+                            </td>
+                            <td>
+                                    <a  href="{{ route('pengesahan.perubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                         @endforeach
@@ -56,7 +73,7 @@
             "orderable": false
             }, 
             {
-            "targets": 5,
+            "targets": 7,
             "orderable": false
             }
         ],
@@ -66,26 +83,26 @@
         "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-plus" id="test"></i>',
-                titleAttr: 'Tambah Simulasi',
-                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();
-                }
-            }
-        ]
+        // 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-plus" id="test"></i>',
+        //         titleAttr: 'Tambah Simulasi',
+        //         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();
+        //         }
+        //     }
+        // ]
     });
 
     $('.addsim').tooltip();
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/senaraitempsimulasi.blade.php b/resources/views/simulasi/senaraitempsimulasi.blade.php
index 4284942a..b623439f 100644
--- a/resources/views/simulasi/senaraitempsimulasi.blade.php
+++ b/resources/views/simulasi/senaraitempsimulasi.blade.php
@@ -17,7 +17,7 @@
 
             <div class="container">
                 <div>
-                    <div style="margin-top:2%; margin-bottom:2%;" align = "left">
+                    <div style="margin-top:2%; margin-bottom:2%;">
                             
                         <p> <b>Tarikh Lelong : </b> {{ $t_lelong1 }}</p>
                         <p> <b>Tarikh Gadai Sehingga : </b> @php 
@@ -64,12 +64,12 @@
                         <tr>
                             <td><input type="checkbox" aria-label="Checkbox for following text input" name="caw[]" id="caw" value = "{{ $send['kodcaw'] }}" class="custom_name"></td>
                             <td>{{ $send['kodcaw'] }}</td>
-                            <td align="left">{{ $send['caw_name'] }}</td>
+                            <td >{{ $send['caw_name'] }}</td>
                             <td>{{ $send['bil_lelong'] }} </td>
-                            <td align="right">{{ number_format($send['total_berat'], 2) }} </td>
-                            <td align="right">{{ number_format($send['total_nilaimarhun'], 2) }} </td>
-                            <td align="right">{{ number_format($send['total_pembiayaan'] , 2) }} </td>
-                            <td align="right">{{ number_format($send['total_bakipjm'] , 2) }} </td>
+                            <td>{{ number_format($send['total_berat'], 2) }} </td>
+                            <td>{{ number_format($send['total_nilaimarhun'], 2) }} </td>
+                            <td>{{ number_format($send['total_pembiayaan'] , 2) }} </td>
+                            <td>{{ number_format($send['total_bakipjm'] , 2) }} </td>
                             <td>
                                 <a href=" {{ route('analisa.tempbycawsimulasi', [$send['kodcaw'],$t_gadai1,$fasa]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Gadaian"><i class="far fa-edit"></i></a>
                             </td>
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/resources/views/simulasi/tempbycawsimulasi.blade.php b/resources/views/simulasi/tempbycawsimulasi.blade.php
index 67fe829b..c75cdfc0 100644
--- a/resources/views/simulasi/tempbycawsimulasi.blade.php
+++ b/resources/views/simulasi/tempbycawsimulasi.blade.php
@@ -4,7 +4,8 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-12 mx-auto card">
-            <h3 class="pt-3" style="margin-bottom:2%; margin-top:1%;">Butiran Gadaian Cawangan {{ $details }}</h3>
+            </div>
+            <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button><h3 class="pt-3" style="margin-bottom:2%; margin-top:1%;">Butiran Gadaian Cawangan {{ $details }}</h3>
             
             @if ($message = Session::get('failed'))
                 <div class="alert alert-danger">
@@ -14,12 +15,6 @@
             <form action="{{route('analisa.senaraitempsimulasi')}}" id="formtlelong" method="POST">
                    
                     @csrf
-                <div class="container">
-                    <div class="row mb-2">
-                    <button  type="button" class="btn btn-primary" ><a href="javascript:window.history.go(-1);">Kembali</a></button>
-                    </div>
-                </div>
-
                 <table class="table table-striped  table-xl text-center" id="detailsgadai" style="width:100%; margin-top:1%;">
                     <thead class="bg-primary text-white">
                             <tr>
diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade.php b/resources/views/tangguhlelong/senarailelongtangguh.blade.php
index 419f1958..75f06669 100644
--- a/resources/views/tangguhlelong/senarailelongtangguh.blade.php
+++ b/resources/views/tangguhlelong/senarailelongtangguh.blade.php
@@ -104,26 +104,26 @@
         "lengthChange": false,
         "pageLength": 99999999,
         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-plus" id="test"></i>',
-            //     titleAttr: 'Tambah Simulasi',
-            //     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();
-                }
-            }
-        ]
+        // 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-plus" id="test"></i>',
+        //     //     titleAttr: 'Tambah Simulasi',
+        //     //     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();
+        //         }
+        //     }
+        // ]
     });
 
     $('.addsim').tooltip();
diff --git a/routes/api.php b/routes/api.php
index bc9fa257..b916615c 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -64,6 +64,7 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
     // Lelong => Bidder
     Route::post('/bidder/biditem', [LelongMobileController::class, 'bidderSelectBidItem']);
     Route::get('/bidder/listbiditem', [LelongMobileController::class, 'listBidItem']);
+    Route::get('/bidder/listBidItemWeb', [LelongMobileController::class, 'listBidItemWeb']);
     Route::post('/bidder/updatebiditem', [LelongMobileController::class, 'updatebiditem']);
     
 });
diff --git a/routes/web.php b/routes/web.php
index 053f9055..a7806002 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -104,12 +104,34 @@ Route::group(['prefix'=>'lelong'], function () {
     Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); 
     Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); 
     Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']);
-    Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']);
+    // 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']);
+    Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']);
+
+    Route::get('/lapbrglelongdetailsindex',['as'=>'lelong.lapbrglelongdetailsindex','uses'=>'LelongController@lapbrglelongdetailsindex']);
+        
+
+    Route::get('/lapbidaanpembidaindex', ['as'=>'lelong.lapbidaanpembidaindex','uses'=>'LelongController@lapbidaanpembidaindex']);
+    Route::get('/senarailapbidaan/{lelong_id}',['as' =>'lelong.senarailapbidaan','uses'=>'LelongController@senarailapbidaan']);
+    Route::post('/pdfsenarailapbidaan',['as' =>'lelong.pdfsenarailapbidaan','uses'=>'LelongController@pdfsenarailapbidaan']);
+
+    Route::get('/laplelongindex',['as' =>'lelong.laplelongindex','uses'=>'LelongController@laplelongindex']);
+    Route::get('/laplelong/{lelong_id}',['as' =>'lelong.laplelong','uses'=>'LelongController@laplelong']);
+    Route::post('/pdflaplelong',['as' =>'lelong.pdflaplelong','uses'=>'LelongController@pdflaplelong']);
+
+    Route::get('/lapbrglelpembidaindex',['as'=>'lelong.lapbrglelpembidaindex','uses'=>'LelongController@lapbrglelpembidaindex']);
+    Route::get('/lapbrglelpembida/{lelong_id}',['as'=>'lelong.lapbrglelpembida','uses'=>'LelongController@lapbrglelpembida']);
+    Route::post('/pdflapbrglelpembida',['as'=>'lelong.pdflapbrglelpembida','uses'=>'LelongController@pdflapbrglelpembida']);
+
+   });
     
     Route::group(['middleware' => ['permission:pengesahanpembayaranpc']], function () {
         Route::get('/pengesahanPembayaran', ['as'=>'payment.pengesahanPembayaran','uses'=>'PaymentController@pengesahanPembayaran']);
@@ -117,6 +139,7 @@ Route::group(['prefix'=>'lelong'], function () {
 
     Route::group(['middleware' => ['permission:import']], function () {
         Route::get('/refresh/{id}',['as'=>'lelong.refresh','uses'=>'LelongController@refresh']);
+        Route::get('/refreshhome/{id}',['as'=>'lelong.refreshhome','uses'=>'LelongController@refreshhome']);
     });
 
     Route::group(['middleware' => ['permission:kemaskinihargaasas']], function () {
@@ -126,10 +149,23 @@ Route::group(['prefix'=>'lelong'], function () {
     Route::group(['middleware' => ['permission:lelongan']], function () {
         Route::get('/lelongstart/{id}',['as'=>'lelong.start','uses'=>'LelongController@start']); 
         Route::get('/lelongstop/{id}',['as'=>'lelong.stop','uses'=>'LelongController@stop']); 
-    });
 
+        Route::get('/lelongstartcawangan/{id}/{cawid}',['as'=>'lelong.startcawangan','uses'=>'LelongController@startcawangan']); 
+        Route::get('/lelongstopcawangan/{id}/{cawid}',['as'=>'lelong.stopcawangan','uses'=>'LelongController@stopcawangan']);
+        Route::get('/lelongstartall/{id}',['as'=>'lelong.startall','uses'=>'LelongController@startall']);
+        Route::get('/lelongstopall/{id}',['as'=>'lelong.stopall','uses'=>'LelongController@stopall']);
+    });
+//jurulelong
     Route::group(['middleware' => ['permission:janapemenang']], function () {
-        Route::get('/janapemenang/{id}',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); 
+        Route::get('/janapemenang',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); 
+        Route::get('/listcawangan',['as'=>'lelong.listcawangan','uses'=>'LelongController@listcawangan']); 
+    });
+});
+
+    Route::group(['prefix'=>'pemenang'], function () {
+    Route::group(['middleware' => ['permission:janapemenang']], function () {
+        Route::get('/janapemenang',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); 
+        Route::get('/listcawangan',['as'=>'lelong.listcawangan','uses'=>'LelongController@listcawangan']); 
     });
 });
 
@@ -141,6 +177,9 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim
     Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); 
     Route::get('/marhun/{id}/{lelong_id}',['as'=>'marhun.show','uses'=>'MarhunController@show']); 
     Route::post('/submitdelete',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']); 
+    
+    Route::get('/senlelmarhun',['as'=>'marhun.senlelmarhun','uses'=>'MarhunController@senlelmarhun']); 
+    Route::get('/sentangguhlelongsah/{lelong_id}',['as'=>'marhun.sentangguhlelongsah','uses'=>'MarhunController@sentangguhlelongsah']); 
 
     Route::post('/kemaskini',['as'=>'marhun.kemaskini','uses'=>'MarhunController@kemaskini']); 
     Route::get('/semakan',['as'=>'marhun.semakan','uses'=>'MarhunController@semakan']); 
@@ -165,6 +204,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
     Route::get('/senlelpembayaranbidaan',['as'=>'pembida.senlelpembayaranbidaan','uses'=>'PembidaController@senlelpembayaranbidaan']);
     Route::get('/pembayaranbidaan',['as'=>'pembida.pembayaranbidaan','uses'=>'PembidaController@pembayaranbidaan']);
     Route::get('/detailsbidaan/{user_id}/{payment_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']);
+
 });
 
 Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () {
@@ -273,3 +313,5 @@ Route::get('/lapbrglelpembida/{lelong_id}',['as'=>'report.lapbrglelpembida','use
 });
 
 
+
+