diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 966404d7..aeab4529 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -521,72 +521,83 @@ class MarhunController extends Controller
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
 
-        $pengesahan = Pengesahan::where('norujukan', $request->norujukan)
-        ->first();
-
-        $pengesahan->id = $pengesahan['id'] ;
-        $pengesahan->disahkan_oleh = $user['id'];
-        $pengesahan->disahkan_pada = $currentdate;
-        $pengesahan->save();
-        // dd($pengesahan);
-        $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->get();
-        $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
-
+        $pengesahan = Pengesahan::where('norujukan', $request->norujukan)->where('lelong_id', $request->lelong_id)->get();
+        
         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();
-            dd($lelongbidmarhuns['marhun']);
-
-            foreach($lelongbidmarhuns as $bidmarhuns)
+            foreach($pengesahan as $index1=>$sah)
             {
-                if($bidmarhuns->status_ubah == 3)
+                $savepengesahan = Pengesahan::where('id', $sah['id'])
+                ->first();
+                $savepengesahan->disahkan_oleh = $user['id'];
+                $savepengesahan->disahkan_pada = $currentdate;
+                $savepengesahan->status = 1;
+                $savepengesahan->save();
+    
+                $lelongbid = LelongBid::where('id', $sah->lelongbid_id)->get();
+                $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $sah->lelongbid_id)->get();
+    
+                $lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id')
+                ->where('pengesahan.lelongbid_id', $sah->lelongbid_id)
+                ->where('pengesahan.id', $sah->id)
+                ->get();
+    
+                $total_berat = 0;
+                $total_hargaasas = 0;
+                foreach($lelongbidmarhuns as $index2=>$bidmarhuns)
                 {
-                    $bidmarhuns->delete();
-                }
-                else
-                {
-                    //
+                    if($bidmarhuns->status_ubah == 3)
+                    {
+                        $bidmarhuns->delete();
+                    }
+                    else
+                    {
+                        //
+                    }
+    
+                    $lelongbids = LelongBid::where('id', $sah->lelongbid_id)->first();
+                    $txtmarhun = ",1 " . $bidmarhuns->marhun ;
+                    $lelongbids->marhun = str_replace( $txtmarhun,"", $lelongbid[0]['marhun']);
+                    $lelongbids->berat = $total_berat += $bidmarhuns->berat ;
+                    $lelongbids->hargaasas = $total_hargaasas += $bidmarhuns->hargaasas;
+                    $lelongbids->save();
+    
                 }
+
             }
 
-            $pengesahan = 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();
-            
-            $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first();
-            $txtmarhun = ",1 " . $lelongbidmarhuns->marhun ;
-            $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
-            $lelongbid->berat = $lelongbid->berat - $lelongbidmarhuns->berat;
-            $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhuns->hargaasas;
-            $lelongbid->save();
-
             // $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
         }
         
         else if($request->jenis_button == "tangguhlelong")
         {
-            //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);
+            foreach($pengesahan as $index1=>$sah)
+            {
+                $savepengesahan = Pengesahan::where('id', $sah['id'])
+                ->first();
+                $savepengesahan->disahkan_oleh = $user['id'];
+                $savepengesahan->disahkan_pada = $currentdate;
+                $savepengesahan->status = 1;
+                $savepengesahan->save();
+
+                $lelongbidasal = LelongBid::where('id', $sah['lelongbid_id'])->first();
+
+                //add into table tangguhlelong
+                $tangguhlelong = new TangguhLelong;
+                $tangguhlelong->lelong_id = $sah->lelong_id;
+                $tangguhlelong->lelongbid_id = $sah->lelongbid_id;
+                $tangguhlelong->norujukan = $sah->norujukan;
+                $tangguhlelong->pinjaman = $lelongbidasal['pinjaman'];
+                $tangguhlelong->tarikhtangguh = $currentdate;
+                $tangguhlelong->ditangguh_oleh = $user->id;
+                $tangguhlelong->ditangguh_pada = $currentdate;
+                $tangguhlelong->nota = $request->nota;
+                $tangguhlelong->save();
+
+                $marhundelete = LelongBid::where('id', $sah->lelongbid_id)->delete();
+            }
+
             
-            $marhundelete = LelongBid::where('id', $pengesahan->lelongbid_id)->delete();
             
         }
 
@@ -630,48 +641,48 @@ 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()
     {
-        $lelong = Lelong::where('sts_lelong', 0)
-        ->get();
+        $arrayinfo = [];
 
-        return view('pengesahan.senarailelong',compact('lelong'));
+        $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]);
+        }
+
+        return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo'));
     }
 
     public function senaraitangguhlelong($id)
     {
-        $tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
+        $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', 'lelong.id')
         ->where('tangguhlelong.lelong_id', $id)
         ->get();
 
+        foreach($tangguhlelong as $index1=>$tanguhlel)
+        {
+            $getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
+            ->where('lelong_id', $id)
+            ->first();
+
+            $tangguhlelong[$index1]['nama_caw'] = $getkodcaw->caw_name;
+        }
+
         return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
     }
 
     public function lelbidmarhun($id, $norujukan)
     {
-        $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id')
-        ->where('tangguhlelong.lelong_id', $id)
+        $marhuns = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
+        ->join('gadai', 'tangguhlelong.norujukan', '=', 'gadai.norujukan')
         ->where('tangguhlelong.norujukan', $norujukan)
         ->get();
 
diff --git a/resources/views/pengesahan/lelbidmarhun.blade.php b/resources/views/pengesahan/lelbidmarhun.blade.php
index f519364a..8c77ba14 100644
--- a/resources/views/pengesahan/lelbidmarhun.blade.php
+++ b/resources/views/pengesahan/lelbidmarhun.blade.php
@@ -22,13 +22,11 @@
                             <th>Berat</th>
                             <th>Harga (RM)</th>
                             <th>Nilai Marhun</th>
-                            <th>Harga Asas</th>
                             <th>Nota</th>
                             <th>Status</th>
                         </tr>
                     </thead>
-                    <tbody>
-                        
+                    <tbody>                        
                         @foreach ($marhuns as $marhun)
                         <tr>
                             <td>{{ $loop->iteration }}</td>
@@ -38,7 +36,6 @@
                             <td>{{ $marhun->berat }}</td>
                             <td>{{ $marhun->harga }}</td>
                             <td>{{ $marhun->n_marhun }}</td>
-                            <td>{{ $marhun->hargaasas }}</td>
                             <td>{{ $marhun->nota }}</td>
                             <td>
                                 @if($status->status_ubah ==  1)
@@ -74,7 +71,7 @@
             "orderable": false
             }, 
             {
-            "targets": 9,
+            "targets": 8,
             "orderable": false
             }
         ],
diff --git a/resources/views/pengesahan/senarailelong.blade.php b/resources/views/pengesahan/senarailelong.blade.php
index d89ffb2e..6a438109 100644
--- a/resources/views/pengesahan/senarailelong.blade.php
+++ b/resources/views/pengesahan/senarailelong.blade.php
@@ -15,8 +15,9 @@
                 <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>Tarikh Lelong</th>
+                            <th>Nama Cawangan</th>
                             <th>Harga Emas Asas</th>
                             <th>JBG</th>
                             <th>Caj Lelong</th>
@@ -24,15 +25,20 @@
                         </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>{{ $lel['detail']['tarikh_lelong']}}</td>
                             <td>
-                                    <a  href="{{ route('pengesahan.senaraitangguhlelong',$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['detail']['harga_emas_asas']}}</td>
+                            <td>{{$lel['detail']['jbg']}}</td>
+                            <td>{{$lel['detail']['cajlelong']}}</td>                     
+                            <td>
+                                    <a  href="{{ route('pengesahan.senaraitangguhlelong',$lel['detail']['id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php
index 2e838123..660370bb 100644
--- a/resources/views/pengesahan/senaraitangguhlelong.blade.php
+++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php
@@ -16,9 +16,10 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
-                            <th>Kod Cawangan</th>
-                            <th>No Rujukan</th>
+                            <th>Nama Cawangan</th>
+                            <th>Tarikh Lelong Asal</th>
                             <th>Tarikh Tangguh</th>
+                            <th>No Rujukan</th>
                             <th class="text-center">Action</th>
                         </tr>
                     </thead>
@@ -27,9 +28,10 @@
                         @foreach ($tangguhlelong as $tangguhlel)
                         <tr>
                             <td>{{ $loop->iteration }}</td>
-                            <td>{{ $tangguhlel->kodcaw }}</td>
-                            <td>{{ $tangguhlel->norujukan }}</td>
+                            <td>{{ $tangguhlel['nama_caw'] }}</td>
+                            <td>{{ $tangguhlel->tarikh_lelong }}</td>
                             <td>{{ $tangguhlel->tarikhtangguh }}</td>
+                            <td>{{ $tangguhlel->norujukan }}</td>
                             <td>
                             <a  href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
                             </td>