diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 7273d963..6ce627fa 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -1242,6 +1242,10 @@ class LelongController extends Controller
     public function senaraipemenang(Request $request, $lelong_id){
 
         $caw_code = $request->caw_code;
+
+        $lelonglel = Lelong::with('cawangan')->find($lelong_id);
+
+        $cawanganDetail = $lelonglel->cawangan->where('caw_code', $caw_code)->first();
              
         $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->where('lelongbidder.status_bidder', 1)
@@ -1269,13 +1273,17 @@ class LelongController extends Controller
             // $listwinner[$index1]['kodcaw'] = $kodcaw;
         }
         
-        return view('lelong.senaraipemenang',compact('listwinner','lelong_id','caw_code'));
+        return view('lelong.senaraipemenang',compact('listwinner','lelong_id','caw_code','cawanganDetail'));
     }
 
     public function senaraisagpemenang($user_id, $lelong_id, $kodcaw){
         
         $userdetails = User::where('id', $user_id)->first(); 
         
+        $lelonglel = Lelong::with('cawangan')->find($lelong_id);
+
+        $cawanganDetail = $lelonglel->cawangan->where('caw_code', $kodcaw)->first();
+
         $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbid.kodcaw', $kodcaw)
@@ -1284,7 +1292,7 @@ class LelongController extends Controller
         ->get();
 
 
-        return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id','userdetails'));
+        return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id','userdetails','cawanganDetail'));
     }
 
     public function senaraimarhun($lelongid, $cawid){
@@ -2042,16 +2050,24 @@ class LelongController extends Controller
         $month = $current->month;
         $year = $current->format('y');
 
+        $today =  $current->format('Y-m-d');
+        // dd($today);
+
         $lelong = Lelong::where('id', '=', $lelong_id)->first();
         $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)->get();
         foreach ($lelongbid as $bid) {
-            $highestprice = LelongBidder::where('lelongbid_id', '=', $bid->id)->orderBy('lelongbidder.hargabida', 'DESC')->first();
+            $highestprice = LelongBidder::where('lelongbid_id', '=', $bid->id)
+            ->where('masa_bidaan', 'LIKE', '%'.$today.'%')
+            ->orderBy('lelongbidder.hargabida', 'DESC')
+            ->first();
+            // dd($highestprice);
 
             // dd($highestprice->hargabida);
             if ($highestprice) {
                 // foreach($highestprice as $price){
                 // $bidders = LelongBidder::where('lelongbid_id','=',$bid->id)->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )->get();
                 $bidders = LelongBidder::join('lelongbid', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+                    ->where('masa_bidaan', 'LIKE', '%'.$today.'%')
                     ->where('lelongbid.lelong_id', '=', $lelong_id)
                     ->where('lelongbid_id', '=', $bid->id)
                     ->where('hargabida', '=', $highestprice->hargabida)->orderBy('masa_bidaan', 'ASC')
@@ -2082,7 +2098,7 @@ class LelongController extends Controller
                         // dd($totalbaki);
                         $updatebid->hargajual = $bidder->hargabida;
                         $updatebid->t_jual = $currentdate;
-                        $updatebid->cajlelong = bcdiv($sumcajlelong, 1, 1);
+                        $updatebid->cajlelong = round($sumcajlelong, 1, 1);
                         $updatebid->baki = $totalbaki;
                         $updatebid->nopembeli = $bidder->user_id;
                         $updatebid->status_jual = 1;
@@ -5193,7 +5209,7 @@ class LelongController extends Controller
                 'id_cawangan'=> $cawlel['caw_id'],
                 'cawangan' => $cawlel->cawangan->caw_name,
                 't_lelong'=>$lelong['tarikh_lelong'],
-                'bil_marhun'=>sizeof($cawlel->lelongBid),
+                'bil_marhun'=>sizeof($databid),
                 'berat'=>$berat,
                 'n_marhun'=>$nilai_marhun,
                 'pinjaman'=>$pinjaman,
@@ -5206,7 +5222,7 @@ class LelongController extends Controller
                 'bakilelong'=>$bakilelong,
             ]);
 
-            $total_marhun += sizeof($cawlel->lelongBid);
+            $total_marhun += sizeof($databid);
 
             // $total_marhun = $total_marhun + sizeof($databid);
             // $total_berat = $total_berat + $berat;
diff --git a/resources/views/jurulelong/listpemenang.blade.php b/resources/views/jurulelong/listpemenang.blade.php
index 6815ef3c..b2a6f90b 100644
--- a/resources/views/jurulelong/listpemenang.blade.php
+++ b/resources/views/jurulelong/listpemenang.blade.php
@@ -2,9 +2,17 @@
 
 @section('content')
 <div class="container-fluid">
-    <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            
+    <div class="container-fluid">
+        <div class="row ">
+            <div class="col mx-auto p-4">
+                <div class="card">
+                <div class="card-header header-style">
+                   
+                    <div class="header-style-title">
+                        Senarai Pemenang
+                    </div>
+                </div>
+                <div class="card-body">
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -12,7 +20,7 @@
             @endif
             <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%">
+                <table class="table table-bordered  table-xl text-center" id="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
@@ -40,7 +48,7 @@
                                 @foreach($lel['detailsinfo'] as $details)
                                 @if($details['status_jual'] == 1)
                            
-                                <a href=" {{ route('pemenang.senaraipemenang', [ 'lelong_id'=>$lel['detail']['lelong_id'], 'caw_code'=>$details['caw_code']  ]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                <a class="btn m-1 btn-info"  href=" {{ route('pemenang.senaraipemenang', [ 'lelong_id'=>$lel['detail']['lelong_id'], 'caw_code'=>$details['caw_code']  ]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                                 @endif
                                 <span class="m-2">{{$details['caw_name']}}</span><br>
                                 @endforeach
diff --git a/resources/views/jurulelong/senaraipemenangbycaw.blade.php b/resources/views/jurulelong/senaraipemenangbycaw.blade.php
index 7b7340c4..f0632a23 100644
--- a/resources/views/jurulelong/senaraipemenangbycaw.blade.php
+++ b/resources/views/jurulelong/senaraipemenangbycaw.blade.php
@@ -16,7 +16,7 @@
         <div class="row mb-2">
                     <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
                         <p> <b>Nama Cawangan : </b>{{ $getnamacaw->caw_name }}</p>
-        <table class="table table-striped  table-xl text-center" id="tablekaunter" style="width:100%">
+        <table class="table table-bordered  table-xl text-center" id="tablekaunter" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
diff --git a/resources/views/lelong/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php
index 4b05377d..4da90102 100644
--- a/resources/views/lelong/senaraipemenang.blade.php
+++ b/resources/views/lelong/senaraipemenang.blade.php
@@ -4,16 +4,23 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
-              </div><br>
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="{{ route('lelong.listpemenang') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                        senarai lelong : {{ $cawanganDetail->caw_name }}
+                    </div>
+                </div>
+                <div class="card-body">
         @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="tablekaunter" style="width:100%">
+        <table class="table table-bordered  table-xl text-center" id="tablekaunter" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
@@ -37,7 +44,7 @@
                             <td>{{ $winner['total_surat']}}</td>
                             <td>{{ number_format($winner['totalBid'], 2, '.', ',') }}</td>
                             <td>
-                            <a href=" {{ route('lelong.senaraisagpemenang', ['user_id'=>$winner['user_id'],'lelong_id'=>$lelong_id ,'kodcaw'=>$caw_code]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan" ><i class="far fa-edit"></i></a>
+                            <a class="btn m-1 btn-info"  href=" {{ route('lelong.senaraisagpemenang', ['user_id'=>$winner['user_id'],'lelong_id'=>$lelong_id ,'kodcaw'=>$caw_code]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan" ><i class="far fa-edit"></i></a>
                             {{-- <a href=" {{ route('lelong.senaraisagpemenang', ['user_id'=>$winner['user_id'],'lelong_id'=>$lelong_id,'ic'=>$winner['nokp']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan" ><i class="far fa-edit"></i></a> --}}
     
                         </td>
diff --git a/resources/views/lelong/senaraisagpemenang.blade.php b/resources/views/lelong/senaraisagpemenang.blade.php
index c048ab1b..37b9fe95 100644
--- a/resources/views/lelong/senaraisagpemenang.blade.php
+++ b/resources/views/lelong/senaraisagpemenang.blade.php
@@ -4,10 +4,17 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    senarai Sag : {{ $cawanganDetail->caw_name }}
+                </div>
             </div>
+            <div class="card-body">
             @if ($message = Session::get('success'))
                     <div class="alert alert-success">
                         <p>{{ $message }}</p>
@@ -22,7 +29,7 @@
                 </div>
             </div>
         </div>
-        <table class="table table-striped  table-xl text-center" id="tablesagmenang" style="width:100%">
+        <table class="table table-bordered  table-xl text-center" id="tablesagmenang" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
diff --git a/resources/views/lelong/showlelongdone.blade.php b/resources/views/lelong/showlelongdone.blade.php
index afe868c0..3a89f0bd 100644
--- a/resources/views/lelong/showlelongdone.blade.php
+++ b/resources/views/lelong/showlelongdone.blade.php
@@ -188,7 +188,7 @@
                                 @foreach ($arraycaw as $index=>$caw)
                                 <tr>
                                     <td>{{$index+1}}</td>
-                                    <td><a href=" {{ route('jananotis.senaraimarhundone',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
+                                    <td><a href=" {{ route('lelong.senaraimarhundone',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
                                     <td>{{ $caw['bil_marhun'] }}</td>
                                     <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
diff --git a/routes/web.php b/routes/web.php
index 7f9eb9c8..b35554a2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -176,6 +176,7 @@ Route::group(['prefix'=>'lelong'], function () {
    Route::post('/exportkali',['as'=>'lelong.exportkali','uses'=>'LelongController@exportkali']);
 
    Route::get('/exporthargaemas/{lelong_id}',['as'=>'lelong.exporthargaemas','uses'=>'LelongController@exporthargaemas']);
+   Route::get('/senaraimarhundone/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhundone','uses'=>'LelongController@senaraimarhundone']);
 
 });
     Route::get('/showsimulasi/{id}',['as'=>'lelong.showsimulasi','uses'=>'LelongController@showsimulasi']);