diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 8e174bad..53ad1b72 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -446,12 +446,12 @@ class LelongController extends Controller
         $lelongbid = LelongBid::where('lelong_id','=',$id)->get();
         foreach($lelongbid as $bid)
         {
-            $highestprice = LelongBidder::where('lelongbid_id','=',139)->orderBy('lelongbidder.hargabida','DESC' )->first();
+            $highestprice = LelongBidder::where('lelongbid_id','=',$bid->id)->orderBy('lelongbidder.hargabida','DESC' )->first();
             // dd($highestprice->hargabida);
             if($highestprice)
             {
                 // foreach($highestprice as $price){
-                    $bidders = LelongBidder::where('lelongbid_id','=',139)->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )->get();
+                    $bidders = LelongBidder::where('lelongbid_id','=',$bid->id)->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )->get();
                     // dd($bidders);
                     $count = 0;
                     foreach($bidders as $bidder)
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index c1148ad5..c8f5f298 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -126,7 +126,14 @@ class MarhunController extends Controller
 
     }
 
-   
+    public function senarailelongmarhun(Request $request){
+
+        $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
+        ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+        ->get();
+
+        return view('marhun.senarailelongmarhun',compact('senarai'));
+    }
     
 }
        
\ No newline at end of file
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index ce029f8f..2e02e300 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -42,8 +42,8 @@
     
       @endhasrole
       @hasrole('khazanah')
-      <li class="{{ (request()->is('marhun/senaraimarhun') || request()->is('marhun/senaraimarhun/*')) ? 'active' : '' }}">
-        <a href="{{url('marhun/senaraimarhun')}}">Marhun</a>
+      <li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
+        <a href="{{url('marhun/senarailelongmarhun')}}">Marhun</a>
       </li>
       @endhasrole
       @hasrole('teller')
diff --git a/resources/views/lelong/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php
index 59092f71..e838464a 100644
--- a/resources/views/lelong/senaraipemenang.blade.php
+++ b/resources/views/lelong/senaraipemenang.blade.php
@@ -38,6 +38,9 @@
                 @endforeach
             </tbody>
         </table>
+        <div class="modal-footer" style="margin-top:2%;">
+            <a  href="{{ route('lelong.senarailelong') }}" class="btn btn-primary">Kembali</a>
+        </div>
         </div>
     </div>
 </div>
diff --git a/resources/views/marhun/senarailelongmarhun.blade.php b/resources/views/marhun/senarailelongmarhun.blade.php
new file mode 100644
index 00000000..ac151710
--- /dev/null
+++ b/resources/views/marhun/senarailelongmarhun.blade.php
@@ -0,0 +1,88 @@
+@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>Tarikh Lelong</th>
+                        <th>Status Lelong</th>
+                        <th class="text-center">Action</th>
+                    </tr>
+            </thead>
+            <tbody>
+                @foreach($senarai as $data)
+                <tr>
+                    <td>{{$loop->iteration}}</td>
+                    <td>{{ $data->tarikh_lelong }}</td>
+                    <td>{{ $data->sts_lelong }}</td>
+                    <td><a href=" {{ route('marhun.senaraimarhun', ['lelong_id'=>$data['lelong_id']]) }} "><i class="far fa-edit"></i></a></td>
+                </tr>
+                @endforeach
+            </tbody>
+        </table>
+        </div>
+    </div>
+</div>
+
+<script>
+    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/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php
index cce798af..d0880847 100644
--- a/resources/views/marhun/senaraimarhun.blade.php
+++ b/resources/views/marhun/senaraimarhun.blade.php
@@ -38,6 +38,9 @@
                     
                 </table>
             </form>
+            <div class="modal-footer" style="margin-top:2%;">
+            <a  href="{{ route('marhun.senarailelongmarhun') }}" class="btn btn-primary">Kembali</a>
+            </div>
         </div>
         
     </div>
diff --git a/routes/web.php b/routes/web.php
index f2696643..1e5c568a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -89,7 +89,6 @@ Route::group(['prefix'=>'lelong'], function () {
         Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']);
         Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']);
         
-        
     });
     
     Route::group(['middleware' => ['permission:pengesahanpembayaranpc']], function () {
@@ -116,9 +115,10 @@ Route::group(['prefix'=>'lelong'], function () {
 
 
 
-
+//Khazanah
 Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinimarhun'],'prefix'=>'marhun'], function () {
-    Route::get('/senaraimarhun',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); 
+    Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']); 
+    Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); 
     Route::get('/marhun/{id}',['as'=>'marhun.show','uses'=>'MarhunController@show']); 
     Route::get('/deletemarhun/{id}',['as'=>'marhun.delete','uses'=>'MarhunController@delete']); 
 
@@ -128,6 +128,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim
 
 
 });
+//Khazanah
 
 Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembida'], function () {
     Route::get('/senaraipembida',['as'=>'pembida.senaraipembida','uses'=>'PembidaController@index']);