diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index d953a7ca..d85daa48 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -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,32 @@ class MarhunController extends Controller
 
     public function senarailelongmarhun(Request $request){
 
-        $user =  Auth::user();
+        $user = Auth::user();
 
-        // $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')
+        $arrayinfo = [];
+
+        $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','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->groupBy('lelong_id')
+        ->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'])
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
+
+        }
+
+        return view('marhun.senarailelongmarhun',compact('lelong', 'arrayinfo'));
+        
     }
 
     public function semak($id, $lelong_id)
@@ -386,12 +450,83 @@ 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','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('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','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){
@@ -474,7 +609,6 @@ class MarhunController extends Controller
             ->get()->toArray();
             
             $lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->where('lelong_id', $id)->first();
-            // dd($lelongbid);
             $karat = Lelkarat::where('lelong_id', $id)->get();
     
             foreach($marhuns as $index1=>$marhun)
@@ -522,80 +656,80 @@ 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();
+                    
+                $marhundelete = LelongBid::where('id', $request->lelongbid_id)->delete();
+            }
 
-        else
-        {
-            //
-        }
+            else
+            {
+                //
+            }
         
         return redirect()->route('pengesahan.senarailelongubahmutu')->with('success','Pengesahan Mutu Marhun Berjaya');
     }
@@ -632,41 +766,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 +793,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 +829,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/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index 6e9cc4f1..c5742460 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'));
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/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 057d5460..d0162a6d 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' : '' }}">
@@ -125,7 +134,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/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php
index 4ec82c05..6cf26509 100644
--- a/resources/views/lelong/senarailelong.blade.php
+++ b/resources/views/lelong/senarailelong.blade.php
@@ -64,6 +64,8 @@
                                 @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 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 bec29d8c..7ef8fbad 100644
--- a/resources/views/lelong/senaraimarhun.blade.php
+++ b/resources/views/lelong/senaraimarhun.blade.php
@@ -152,7 +152,7 @@
             // "ordering": false,
             "info": false,
             "lengthChange": false,
-            "pageLength": 100000000,
+            "pageLength": 999999,
             dom: 'Bfrtip',
             // buttons: [
             //     // 'copy', 'excel', 'pdf'
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/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index 426a2318..51478209 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -82,8 +82,11 @@
                             </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: {
diff --git a/resources/views/marhun/senarailelongmarhun.blade.php b/resources/views/marhun/senarailelongmarhun.blade.php
index 998d56b4..2b128be3 100644
--- a/resources/views/marhun/senarailelongmarhun.blade.php
+++ b/resources/views/marhun/senarailelongmarhun.blade.php
@@ -14,23 +14,29 @@
             <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 $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']['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.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..169b4120 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,6 +21,7 @@
                 <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>Tempoh / JBG : </b> {{ $lelongbid->jbg }}</p>
                         <p> <b>Pembiayaan : </b> {{ $marhuns[0]['pembiayaan'] }}</p>
                         <p> <b>Keuntungan : </b></p>
                         <p> <b>Baki Lelong : </b>{{ $marhuns[0]['baki_lelong'] }}</p>
@@ -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..24c51083 100644
--- a/resources/views/pengesahan/senarailelongubahmutu.blade.php
+++ b/resources/views/pengesahan/senarailelongubahmutu.blade.php
@@ -15,24 +15,36 @@
                 <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>
-                                    <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>
+                                @foreach($lel['detailsinfo'] as $details)
+                                <span class="m-2">{{$details['caw_name']}}</span><br>
+                                @endforeach
+                            </td>
+                            <td>{{ $lel['info']['tarikh_lelong']}}</td>
+                            <td>{{ $lel['info']['harga_emas_asas'] }}</td>
+                            <td>{{ $lel['info']['jbg'] }}</td>
+                            <td>{{ $lel['info']['cajlelong'] }}</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('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 +68,7 @@
             "orderable": false
             }, 
             {
-            "targets": 5,
+            "targets": 7,
             "orderable": false
             }
         ],
@@ -66,26 +78,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/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/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 812bfdf1..696b950a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -163,6 +163,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']);