diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 35a404fe..bdb0cd69 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -672,10 +672,12 @@ class MarhunController extends Controller
         return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo'));
     }
 
-    public function senaraitangguhlelong($id)
+    public function senaraitangguhlelong($id, $caw_name)
     {
-        $tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
+        $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id')
         ->where('tangguhlelong.lelong_id', $id)
+        // ->join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
+        // ->where('tangguhlelong.lelong_id', $id)
         ->select('tangguhlelong.id as tangguhlelong_id',
                  'tangguhlelong.lelongbid_id',
                  'tangguhlelong.norujukan',
@@ -691,6 +693,7 @@ class MarhunController extends Controller
                  'lelong.sts_lelong'
         )
         ->get();
+        // dd($tangguhlelong);
 
         foreach($tangguhlelong as $index1=>$tanguhlel)
         {
@@ -702,7 +705,7 @@ class MarhunController extends Controller
             $tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
         }
 
-        return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
+        return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_name'));
     }
 
     public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
@@ -710,6 +713,7 @@ class MarhunController extends Controller
         $tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
         ->where('gadaimarhun.norujukan', $norujukan)
         ->where('tangguhlelong.id', $tangguhlelong_id)
+        ->where('tangguhlelong.lelong_id', $id)
         ->select('tangguhlelong.id as tangguhlelong_id',
                 'tangguhlelong.lelong_id',
                 'tangguhlelong.lelongbid_id',
@@ -718,7 +722,6 @@ class MarhunController extends Controller
                 'tangguhlelong.tarikhtangguh',
                 'tangguhlelong.nota as tangguh_nota',
                 'tangguhlelong.pinjaman',
-                'gadaimarhun.id as gadaimarhun_id',
                 'gadaimarhun.bil',
                 'gadaimarhun.marhun',
                 'gadaimarhun.nota as gadai_nota',
@@ -728,8 +731,14 @@ class MarhunController extends Controller
                 'gadaimarhun.n_marhun'
         )
         ->get();
-                    
-        return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan'));
+
+        $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'));
 
     }
     
diff --git a/resources/views/pengesahan/lelbidmarhun.blade.php b/resources/views/pengesahan/lelbidmarhun.blade.php
index 47b5d0d3..320f4030 100644
--- a/resources/views/pengesahan/lelbidmarhun.blade.php
+++ b/resources/views/pengesahan/lelbidmarhun.blade.php
@@ -50,7 +50,7 @@
                 </table>
             </form>
             <div class="modal-footer" style="margin-top:2%;">
-            <a  href="{{ route('pengesahan.senaraitangguhlelong', $id) }}" class="btn btn-primary">Kembali</a>
+                <a  href="{{ route('pengesahan.senaraitangguhlelong', [$id, 'caw_name'=>$caw_names->caw_name]) }}" class="btn btn-primary">Kembali</a>
             </div>
         </div>
         
diff --git a/resources/views/pengesahan/senarailelong.blade.php b/resources/views/pengesahan/senarailelong.blade.php
index 6a438109..ceae1024 100644
--- a/resources/views/pengesahan/senarailelong.blade.php
+++ b/resources/views/pengesahan/senarailelong.blade.php
@@ -38,7 +38,7 @@
                             <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>
+                                <a  href="{{ route('pengesahan.senaraitangguhlelong', [$lel['detail']['id'], 'caw_name'=>$details['caw_name']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php
index 78c5f1e4..9e8d3f0c 100644
--- a/resources/views/pengesahan/senaraitangguhlelong.blade.php
+++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php
@@ -10,16 +10,25 @@
                     <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> <b>Tarikh Lelong : </b> {{ $tangguhlelong[0]['tarikh_lelong'] }}</p>
+                        <p> <b>Nama Cawangan : </b>{{ $caw_name }}</p>
+                        <p> <b>JBG : </b>{{ $tangguhlelong[0]['jbg'] }}</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="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
-                            <th>Nama Cawangan</th>
-                            <th>Tarikh Lelong</th>
                             <th>Tarikh Tangguh</th>
                             <th>No Rujukan</th>
+                            <th>Remark</th>
                             <th class="text-center">Action</th>
                         </tr>
                     </thead>
@@ -27,10 +36,9 @@
                         @foreach ($tangguhlelong as $tangguhlel)
                         <tr>
                             <td>{{ $loop->iteration }}</td>
-                            <td>{{ $tangguhlel['nama_caw']['caw_name'] }}</td>
-                            <td>{{ $tangguhlel->tarikh_lelong }}</td>
                             <td>{{ $tangguhlel->tarikhtangguh }}</td>
                             <td>{{ $tangguhlel->norujukan }}</td>
+                            <td>{{ $tangguhlel->nota }}</td>
                             <td>
                             <a  href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan, 'tangguhlelong_id'=>$tangguhlel['details']['tangguhlelong_id'] ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
                             </td>
@@ -69,26 +77,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/routes/web.php b/routes/web.php
index f98d311d..31f8c5f3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -193,7 +193,7 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
     Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']);
     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('/senaraitangguhlelong/{id}/{caw_name}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
     Route::get('/lelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
     Route::get('/senarailelongtangguh',['as'=>'pengesahan.senarailelongtangguh','uses'=>'TangguhLelongController@senarailelongtangguh']);
     Route::get('/senaraisahtangguh/{lelong_id}/{caw_code}',['as'=>'pengesahan.senaraisahtangguh','uses'=>'TangguhLelongController@senaraisahtangguh']);