diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 1e88947a..eda9ba9d 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -6,8 +6,8 @@ use Illuminate\Http\Request;
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\Models\Permission;
 use Illuminate\Support\Facades\Auth;
-use App\Models\User;
 use PDF;
+use App\Models\User;
 use App\Models\Cawangan;
 use App\Models\JenisEmas;
 use App\Models\JenisKarat;
@@ -532,10 +532,23 @@ class LelongController extends Controller
 
     }
 
-    public function lelongtaklaku(Request $request){
+    public function senarailelongtaklaku(Request $request){
+        
+        $user = Auth::user();
+
+        $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
+        ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+        ->where('cawangan.caw_code', $user->kodcaw)
+        ->get();
+
+        return view('lelong.senarailelongtaklaku',compact('senarai'));
+    }
+
+    public function lelongtaklaku($lelong_id){
 
         $lelongtaklaku = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
         ->where('status_jual', 0)
+        ->where('lelongbid.lelong_id', $lelong_id)
         ->whereNull('t_jual')
         ->select(
             'lelongbid.t_lelong',
@@ -555,6 +568,7 @@ class LelongController extends Controller
         foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){
 
             $suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id')
+            ->where('lelongbid.lelong_id', $lelong_id)
             ->whereNull('t_jual')
             ->get();
 
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index ba2aacf8..c7f3d5fe 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -102,8 +102,8 @@
           <li class="{{ (request()->is('lelong/senarailelong/*') || request()->is('lelong/senarailelong') ) ? 'active' : '' }}">
             <a href="{{url('lelong/senarailelong')}}">Senarai Lelong</a>
           </li>
-          <li class="{{ (request()->is('lelong/lelongtaklaku/*') || request()->is('lelong/lelongtaklaku') ) ? 'active' : '' }}">
-            <a href="{{url('lelong/lelongtaklaku')}}">Senarai Lelong Tak Laku</a>
+          <li class="{{ (request()->is('lelong/senarailelongtaklaku/*') || request()->is('lelong/senarailelongtaklaku') ) ? 'active' : '' }}">
+            <a href="{{url('lelong/senarailelongtaklaku')}}">Senarai Lelong Tak Laku</a>
           </li>
         </ul>
       </li>
diff --git a/resources/views/lelong/senarailelongtaklaku.blade.php b/resources/views/lelong/senarailelongtaklaku.blade.php
new file mode 100644
index 00000000..2e68ffba
--- /dev/null
+++ b/resources/views/lelong/senarailelongtaklaku.blade.php
@@ -0,0 +1,94 @@
+@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="senarailelongtaklaku" 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>Tarikh Lelong</th>
+                            <th>Masa Tamat Lelong</th>
+                            <th>Harga Emas Asas</th>
+                            <th>JBG</th>
+                            <th>Caj Lelong</th>
+                            <th class="text-center">Action</th>
+                    </tr>
+            </thead>
+            <tbody>
+                @foreach($senarai as $data)
+                    <tr>
+                        <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $data->lelong_id }}"></td>
+                        <td>{{ $data->tarikh_lelong }}</td>
+                        <td>{{ $data->masatamat_lelong }}</td>
+                        <td>{{ $data->harga_emas_asas }}</td>
+                        <td>{{ $data->jbg }}</td>
+                        <td>{{ $data->cajlelong }}</td>
+                        <td><a href=" {{ route('lelong.lelongtaklaku', ['lelong_id'=>$data['lelong_id']]) }} "><i class="far fa-edit"></i></a></td>
+                    </tr>
+                @endforeach
+            </tbody>
+        </table>
+        </div>
+    </div>
+</div>
+
+<script>
+    var tablesenarailelongtaklaku = $('#ssenarailelongtaklaku').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/routes/web.php b/routes/web.php
index 73d3a65c..1d0c7647 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -77,7 +77,8 @@ Route::group(['prefix'=>'lelong'], function () {
     Route::group(['middleware' => ['permission:pendaftaranbatch']], function () {
         Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']); 
         Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']);
-        Route::get('/lelongtaklaku',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']);
+        Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']);
+        Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']);
         Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); 
         Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); 
         Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']);