diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index e468383f..184fd764 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -349,6 +349,7 @@ class LelongController extends Controller
     public function delete($id)
     {
         $lelong = Lelong::where('id','=',$id)->first();
+        
         // dd($role);
         $lelong->delete();
         return redirect()->route('lelong.senarailelong')
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 76f9a778..19b908b6 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -159,13 +159,15 @@ class MarhunController extends Controller
         return view('marhun.senarailelongmarhun',compact('senarai'));
     }
 
-    public function semak($id)
+    public function semak($id, $lelong_id)
     {
-        $lelongbid = LelongBid::where('id','=',$id)->first();
+        $lelongbid = LelongBid::where('id','=',$id)
+        ->where('lelong_id', $lelong_id)
+        ->first();
         $lelongbid->status_semak = 1;
         $lelongbid->save();
 
-        return redirect()->route('marhun.show',$lelongbid->id)
+        return redirect()->route('marhun.show',[ $lelongbid->id, $lelong_id ])
                         ->with('success','Semakan Marhun Berjaya');
     }
 
@@ -333,6 +335,7 @@ class MarhunController extends Controller
 
     public function terimaperubahan(Request $request)
     {
+        // dd($request->all());
         //update mutu marhun - gadaimarhun
         $user =  Auth::user();
 
@@ -344,6 +347,7 @@ class MarhunController extends Controller
         $pengesahan->disahkan_oleh = $user->id;
         $pengesahan->disahkan_pada = $currentdate;
         $pengesahan->update();
+        // dd($pengesahan);
 
         $gadaimarhun = GadaiMarhun::where('norujukan', $pengesahan->norujukan)->delete();
         $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
@@ -359,19 +363,50 @@ class MarhunController extends Controller
             $newmarhun->save();
         }
 
-        //update status lelongbidmarhun = tangguh
+        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', $request->pengesahan_id)
+            ->get();
 
-        $tangguhlelong = new TangguhLelong;
-        $tangguhlelong->lelong_id = $pengesahan->lelong_id;
-        $tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id;
-        $tangguhlelong->norujukan = $pengesahan->norujukan;
-        $tangguhlelong->tarikhtangguh = $currentdate;
-        $tangguhlelong->ditangguh_oleh = $user->id;
-        $tangguhlelong->ditangguh_pada = $currentdate;
-        $tangguhlelong->nota = 'Ditangguh Kerana Perubahan Mutu/Karat Marhun';
-        $tangguhlelong->save(); 
+            foreach($lelongbidmarhuns as $bidmarhuns)
+            {
+                if($bidmarhuns->status_ubah == 3)
+                {
+                    $bidmarhuns->delete();
+                }
+                else
+                {
+                    $bidmarhuns->bil = $bidmarhun->bil;
+                    $bidmarhuns->marhun = $bidmarhun->marhun;
+                    $bidmarhuns->nota = $bidmarhun->nota;
+                    $bidmarhuns->karat = $bidmarhun->karat;
+                    $bidmarhuns->berat = $bidmarhun->berat;
+                    $bidmarhuns->update();
+                }
+            }
+        }
 
-        return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya');
+        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->tarikhtangguh = $currentdate;
+             $tangguhlelong->ditangguh_oleh = $user->id;
+             $tangguhlelong->ditangguh_pada = $currentdate;
+             $tangguhlelong->nota = 'Ditangguh Kerana Perubahan Mutu/Karat Marhun';
+             $tangguhlelong->save(); 
+             
+             $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete();
+        }
+
+        $this->pcdelete($request->pengesahan_id);
+
+        return redirect()->route('pengesahan.senarailelongubahmutu')->with('success','Pengesahan Mutu Marhun Berjaya');
     }
 
     public function submitdeletes($id, $lelong_id){
@@ -412,11 +447,6 @@ class MarhunController extends Controller
         ->select('pengesahan.id as pengesahan_id')
         ->first();
 
-        if($pengesahan != null)
-        {
-            $lelongbidmarhun->delete();
-        }
-
         $lelongbid = LelongBid::where('id', $lelongbidmarhun->lelongbid_id)->first();
         // dd($lelongbid);
         $txtmarhun = ",1 " . $lelongbidmarhun->marhun ;
@@ -426,8 +456,8 @@ class MarhunController extends Controller
         $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
         $lelongbid->save();
 
-        return redirect()->route('pengesahan.perubahanmutumarhun')
-        ->with('success','Pengesahan Padam Marhun Telah Berjaya');
+        // return redirect()->route('pengesahan.perubahanmutumarhun')
+        // ->with('success','Pengesahan Padam Marhun Telah Berjaya');
     }
 
     public function senarailelong()
@@ -445,16 +475,18 @@ class MarhunController extends Controller
         ->get();
 
         return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
-
     }
 
-    public function lelbidmarhun($id)
+    public function lelbidmarhun($id, $norujukan)
     {
         $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id')
         ->where('tangguhlelong.lelong_id', $id)
+        ->where('tangguhlelong.norujukan', $norujukan)
         ->get();
 
-        return view('pengesahan.lelbidmarhun',compact('marhuns'));
+        $status = Pengesahan::where('lelong_id', $id)->where('norujukan', $norujukan)->first();
+
+        return view('pengesahan.lelbidmarhun',compact('marhuns', 'id', 'norujukan', 'status'));
 
     }
     
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index 007898a9..8710bb14 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -54,7 +54,7 @@
             </form>
             <div class="modal-footer" style="margin-top:2%;">
             <a  href="{{ route('marhun.senaraimarhun', $lelong_id) }}" style="width:7%;" class="btn btn-primary">Kembali</a>
-            <a  href="{{ route('marhun.semak', $lelongbid) }}" style="width:7%;" class="btn btn-success">Semak</a>
+            <a  href="{{ route('marhun.semak', [ $lelongbid, $lelong_id ]) }}" style="width:7%;" class="btn btn-success">Semak</a>
             </div>
         </div>
         
diff --git a/resources/views/pengesahan/lelbidmarhun.blade.php b/resources/views/pengesahan/lelbidmarhun.blade.php
index 810fd0bc..f519364a 100644
--- a/resources/views/pengesahan/lelbidmarhun.blade.php
+++ b/resources/views/pengesahan/lelbidmarhun.blade.php
@@ -25,7 +25,6 @@
                             <th>Harga Asas</th>
                             <th>Nota</th>
                             <th>Status</th>
-                            <th class="text-center">Action</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -41,14 +40,23 @@
                             <td>{{ $marhun->n_marhun }}</td>
                             <td>{{ $marhun->hargaasas }}</td>
                             <td>{{ $marhun->nota }}</td>
-                            <td></td>
                             <td>
+                                @if($status->status_ubah ==  1)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
+                                @elseif($status->status_ubah == 2)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
+                                @elseif($status->status_ubah == 3)
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGHAPUSAN MARHUN</button>
+                                @endif
                             </td>
                         </tr>
                         @endforeach
                     </tbody>
                 </table>
             </form>
+            <div class="modal-footer" style="margin-top:2%;">
+            <a  href="{{ route('pengesahan.senaraitangguhlelong', $id) }}" class="btn btn-primary">Kembali</a>
+            </div>
         </div>
         
     </div>
@@ -68,10 +76,6 @@
             {
             "targets": 9,
             "orderable": false
-            },
-            {
-            "targets": 10,
-            "orderable": false
             }
         ],
         order: [[1, 'asc']],
diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php
index ec17dcf8..33b9ff82 100644
--- a/resources/views/pengesahan/mutumarhun.blade.php
+++ b/resources/views/pengesahan/mutumarhun.blade.php
@@ -8,7 +8,8 @@
                                 @csrf
                     <input type="hidden" name="pengesahan_id" value="{{ $pengesahan_id }}" />
                     <input type="hidden" name="norujukan" value="{{ $norujukan }}" />
-                    <input type="hidden" name="id" value="{{ $id }}" />
+                    <input type="hidden" name="lelong_id" value="{{ $id }}" />
+                    <input type="hidden" name="jenis_button" value="terima" id="jenis_button" />
             
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
@@ -85,7 +86,8 @@
                 </table>
             <div class="modal-footer" style="margin-top:2%;">
                 <a  href="{{ route('pengesahan.perubahanmutumarhun', $id) }}" class="btn btn-primary">Kembali</a>
-                <button type="button" class="btn btn-success" onclick="functerima()" >Sahkan</button>
+                <button type="button" class="btn btn-danger" onclick="functerima(this)" id="tangguhlelong" >Tangguh Lelong</button>
+                <button type="button" class="btn btn-success" onclick="functerima(this)" id="terima" >Terima</button>
             </div>
         </form>
         </div>
@@ -96,15 +98,29 @@
     $(function () {
         $('[data-toggle="tooltip"]').tooltip()
     })
-    function functerima(){
-        $("#formmutumarhun").submit();
+    function functerima(e){
+        let jenis=event.target.id;
+        if(jenis == "terima")
+        {
+            $('#jenis_button').val(jenis);
+            $("#formmutumarhun").submit();
+        }
+        else if(jenis == "tangguhlelong")
+        {
+            $('#jenis_button').val(jenis);
+            $("#formmutumarhun").submit();
+        }
     }
 
-    var tablelelong = $('#tablelelong').DataTable( {
+    var tablemutumarhun = $('#tablemutumarhun').DataTable( {
         "columnDefs": [ 
             {
             "targets": 0,
             "orderable": false
+            },
+            {
+            "targets": 8,
+            "orderable": false
             }
         ],
         order: [[1, 'asc']],
@@ -143,7 +159,7 @@
     // $( '.export').removeClass('dt-button');
 
     // function selectall(cb) {
-    //     tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+    //     tablemutumarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
     //         $(this).prop('checked', cb.checked);
     //     })
     // }
diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php
index 4070526e..2e838123 100644
--- a/resources/views/pengesahan/senaraitangguhlelong.blade.php
+++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php
@@ -31,7 +31,7 @@
                             <td>{{ $tangguhlel->norujukan }}</td>
                             <td>{{ $tangguhlel->tarikhtangguh }}</td>
                             <td>
-                            <a  href="{{ route('pengesahan.lelbidmarhun',$id) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
+                            <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>
                         </tr>
                         @endforeach
diff --git a/routes/web.php b/routes/web.php
index d19db204..216235f3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -127,7 +127,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim
 
     Route::post('/kemaskini',['as'=>'marhun.kemaskini','uses'=>'MarhunController@kemaskini']); 
     Route::get('/semakan',['as'=>'marhun.semakan','uses'=>'MarhunController@semakan']); 
-    Route::get('/semak/{id}',['as'=>'marhun.semak','uses'=>'MarhunController@semak']);
+    Route::get('/semak/{id}/{lelong_id}',['as'=>'marhun.semak','uses'=>'MarhunController@semak']);
     Route::post('/tambahmarhun',['as'=>'marhun.tambahmarhun','uses'=>'MarhunController@tambahmarhun']);
     Route::get('/exportmarhundetails/{lelong_id}',['as'=>'marhun.exportmarhundetails','uses'=>'MarhunController@exportmarhundetails']);
 
@@ -155,7 +155,7 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
     Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']);
     Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']);
     Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
-    Route::get('/lelbidmarhun/{id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
+    Route::get('/lelbidmarhun/{id}/{norujukan}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
 });
 //Operasi