diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index b238817a..4478f92f 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -47,8 +47,10 @@ class PaymentController extends Controller
             array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
             //  dd($detailsinfo);
         }
+        $datacaw = Cawangan::where('caw_code','=', $user->kodcaw)
+        ->get();
 
-        return view('pembayaran.senarailelongbayaran',compact('lelong', 'arrayinfo'));
+        return view('pembayaran.senarailelongbayaran',compact('datacaw','lelong', 'arrayinfo'));
 
     }
 
@@ -111,7 +113,10 @@ class PaymentController extends Controller
 
         }
 
-        return view('pembayaran.kaunterpembayaran',compact('listwinner','lelong_id'));
+        $datacaw = Cawangan::where('caw_code','=', $user->kodcaw)
+        ->get();
+
+        return view('pembayaran.kaunterpembayaran',compact('datacaw','listwinner','lelong_id'));
 
     }
 
diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php
index 4b0856fc..881d44c8 100644
--- a/app/Http/Controllers/PembidaController.php
+++ b/app/Http/Controllers/PembidaController.php
@@ -485,8 +485,10 @@ class PembidaController extends Controller
             array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
         }
         // dd($request->kodcaw);
+        $datacaw = Cawangan::where('caw_code','=',$kodcaw)
+        ->get();
         
-        return view('pembida.listkebenaranbayarantunai',compact('lelong','arrayinfo'));
+        return view('pembida.listkebenaranbayarantunai',compact('datacaw','lelong','arrayinfo'));
     }
 
     // public function senaraipemenangbycaw(Request $request, $lelong_id){
@@ -596,9 +598,11 @@ class PembidaController extends Controller
             $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment'];
 
         }
+        $datacaw = Cawangan::where('caw_code','=',$caw_code)
+        ->get();
 
         // return view('pembayaran.kaunterpembayaran',compact('listwinner','lelong_id'));
-        return view('pembida.senaraipemenangbycaw',compact('listwinner','lelong_id','caw_code'));
+        return view('pembida.senaraipemenangbycaw',compact('datacaw','listwinner','lelong_id','caw_code'));
 
 
     }
diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php
index 4b50df8d..d5e4573b 100644
--- a/resources/views/pembayaran/SAGBidItem.blade.php
+++ b/resources/views/pembayaran/SAGBidItem.blade.php
@@ -10,7 +10,7 @@
                 <i class="fas fa-arrow-left"></i>
             </a>
             <div class="header-style-title">
-            Cawangan : @foreach($datacaw as $data1)
+            Senarai SAG : @foreach($datacaw as $data1)
                 {{$data1['caw_name']}}
                 @endforeach 
             </div>
@@ -74,7 +74,7 @@
                 <input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
                 <input type="hidden" name="eachbid[]" id="eachbid" value="" />
                 
-                  <table class="table table-border table-hover table-xl" style="width:100%">
+                  <table class="table table-bordered text-center"  style="width:100%">
                         <thead class="bg-primary text-white">
                                 <tr>
                                     <th class="text-center">No</th>
@@ -130,20 +130,25 @@
                         </tbody>
                     </table>
             </form>
-            @if($statuspayment->opencash == '1')
+            {{-- {{dd($statuspayment->status_payment)}} --}}
+            @if($statuspayment->opencash == '1' && $statuspayment->status_payment == NULL) 
                 <div class="text-right">
                     {{-- <a href="{{ route('pembayaran.kaunterpembayaran', $lelong_id ) }}" class="btn btn-primary" style="width:15%; margin-right:53%;">Kembali</a> --}}
                     {{-- <button type="button" class="btn btn-info" style="width:15%" id="btnbanktransfer" onclick="funccdm()">CDM</button> --}}
                     <button type="button" class="btn btn-success" style="width:15%" id="btnterima" onclick="functerima()">Tunai</button>
                 </div>
-                @elseif($statuspayment->opencash == '0')
+            @elseif($statuspayment->opencash == '0' && $statuspayment->status_payment == NULL)
                 <div class="text-right">
                     <h4>Sila Hubungi Operasi Untuk Kebenaran</h4>
                 </div>
+            @elseif($statuspayment->opencash == '1' && $statuspayment->status_payment == '1')
+                <div class="text-right">
+                    <button type="button" class="btn btn-primary" style="width:15%" >Telah Selesai Bayaran</button>
+                </div>
             @endif
-            <div>
+            {{-- <div>
                 <a href="{{ route('pembayaran.kaunterpembayaran', $lelong_id ) }}" class="btn btn-primary" style="width:15%; margin-right:53%;">Kembali</a>
-            </div>
+            </div> --}}
         </div>
     </div>
 </div>
diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php
index 52c62eec..a36f4e38 100644
--- a/resources/views/pembayaran/kaunterpembayaran.blade.php
+++ b/resources/views/pembayaran/kaunterpembayaran.blade.php
@@ -4,6 +4,7 @@
 
 <div class="container-fluid">
     <div class="row ">
+        <div class="col mx-auto p-4">
         <div class="col-md-11 mx-auto card p-4">
         @if ($message = Session::get('success'))
                 <div class="alert alert-success">
@@ -14,8 +15,18 @@
                     <p>{{ $message }}</p>
                 </div>
         @endif
-        <h4> Senarai Bayaran Pemenang </h4>
-        <table class="table table-striped  table-xl text-center" id="tablekaunter" style="width:100%">
+        {{-- <h4> Senarai Bayaran Pemenang </h4> --}}
+        <div class="card-header header-style">
+            <a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="header-style-icon">
+                <i class="fas fa-arrow-left"></i>
+            </a>
+            <div class="header-style-title">
+                Senarai Bayaran Pemenang : @foreach($datacaw as $data1)
+                {{$data1['caw_name']}}
+                @endforeach 
+            </div>
+        </div>
+        <table class="table text-center table-bordered" id="tablekaunter" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
@@ -28,7 +39,7 @@
                         <th>Status Bayaran</th>
                         <th>Penyata Bayaran</th>
                         <th>Slip Serahan</th>
-                        <th>Resit Pembayaran</th>
+                        {{-- <th>Resit Pembayaran</th> --}}
                         <th class="text-center">Tindakan</th>
                     </tr>
             </thead>
@@ -36,7 +47,7 @@
                 @foreach($listwinner as $winner)
                         <tr>
                             <td> {{ $loop->iteration }} </td>
-                            <td align = 'left'>{{ $winner['details']['name']}}</td>
+                            <td style='white-space:nowrap;' align = 'left'>{{ $winner['details']['name']}}</td>
                             <td>{{ $winner['details']['nokp']}}</td>
                             <td>{{ $winner['details']['notelbimbit']}}</td>
                             <td>{{ $winner['total_surat']}}</td>
@@ -49,31 +60,31 @@
                                     <button class="btn btn-success btn-sm" disabled>SELESAI</button>
                                 @endif
                             </td>
-                            <td>
+                            <td align="center">
                                 <a href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran" ><i class="fas fa-download"></i></a>
                             </td>
 
-                            <td>
+                            <td align="center">
                                 <a href="{{ route('serahan.slipserahan',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Slip Serahan" ><i class="fas fa-download"></i></a>
                             </td>
 
-                            <td>
+                            {{-- <td>
                             <a href=" {{ route('serahan.resit', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Resit Pembayaran"><i class="far fa-edit"></i></a>
-                            </td>
+                            </td> --}}
 
                            
                             <td>
                                 {{-- @if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) )     --}}
-                                    <a href=" {{ route('pembayaran.SAGBidItem', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
+                                    <a class="btn m-1 btn-primary" href=" {{ route('pembayaran.SAGBidItem', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
                                 {{-- @endif --}}
                             </td>
                         </tr>
                 @endforeach
             </tbody>
         </table>
-        <div class="modal-footer" style="margin-top:2%;">
+        {{-- <div class="modal-footer" style="margin-top:2%;">
             <a  href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="btn btn-primary">Kembali</a>
-        </div>
+        </div> --}}
     </div>
     </div>
 </div>
diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php
index 587386c1..de2398d9 100644
--- a/resources/views/pembayaran/senarailelongbayaran.blade.php
+++ b/resources/views/pembayaran/senarailelongbayaran.blade.php
@@ -10,13 +10,24 @@
                     <p>{{ $message }}</p>
                 </div>
         @endif
-        <h4> Senarai Lelong </h4>
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                <a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    Senarai Lelong : @foreach($datacaw as $data1)
+                    {{$data1['caw_name']}}
+                    @endforeach 
+                </div>
+            </div>
         <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>ID Lelong</th>
-                        <th>Cawangan</th>
+                        {{-- <th>Cawangan</th> --}}
                         <th>Fasa</th>
                         <th>Tarikh Lelong</th>
                         <th>Status Lelong</th>
@@ -28,11 +39,11 @@
                 <tr>
                     <td>{{$loop->iteration}}</td>
                     <td>{{ $data['info']['lelong_id'] }}</td>
-                    <td align = 'left'>
+                    {{-- <td align = 'left'>
                         @foreach($data['detailsinfo'] as $details)
                             <span class="m-2">{{$details['caw_name']}}</span><br>
                         @endforeach
-                    </td>
+                    </td> --}}
                     <td>{{ $data['info']['fasa'] }}</td>
                     <td>@php
                                 $myDateTime = DateTime::createFromFormat('Y-m-d', $data['info']['tarikh_lelong'] );
diff --git a/resources/views/pembida/listkebenaranbayarantunai.blade.php b/resources/views/pembida/listkebenaranbayarantunai.blade.php
index 8bae945e..21086f50 100644
--- a/resources/views/pembida/listkebenaranbayarantunai.blade.php
+++ b/resources/views/pembida/listkebenaranbayarantunai.blade.php
@@ -1,17 +1,26 @@
 @extends('layouts.app')
 
 @section('content')
-
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
+        <div class="col mx-auto p-4">
+            <div class="card">
+        {{-- <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
-        <h4>KEBENARAN BAYARAN TUNAI</h4>
-        <table class="table table-striped  table-xl text-center" id="senarailelongonline" style="width:100%">
+        <div class="card-body">
+            <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">
+                Kebenaran Bayaran Tunai
+                </div>
+            </div>
+        <table class="table table-bordered text-center" id="senarailelongonline" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
@@ -37,7 +46,7 @@
                     @endphp</td>
                     <td class="text-left">
                         @foreach($lel['detailsinfo'] as $details)
-                        <a href=" {{ route('pembida.senaraipemenangbycaw', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$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('pembida.senaraipemenangbycaw', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                         <span class="m-2">{{ $details['caw_name']}}
                         </span><br>
                         @endforeach
diff --git a/resources/views/pembida/senaraipemenangbycaw.blade.php b/resources/views/pembida/senaraipemenangbycaw.blade.php
index 1653e9d6..5c11ea8f 100644
--- a/resources/views/pembida/senaraipemenangbycaw.blade.php
+++ b/resources/views/pembida/senaraipemenangbycaw.blade.php
@@ -4,21 +4,33 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
+        <div class="col mx-auto p-4">
+            <div class="card">
+        {{-- <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
-        <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>
-        <h4> Senarai Bayaran Pemenang </h4>
-        <table class="table table-striped  table-xl text-center" id="tablekaunter" style="width:100%">
+        <div class="card-body">
+            <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 Pemenang : @foreach($datacaw as $data1)
+                    {{$data1['caw_name']}}
+                    @endforeach 
+                </div>
+            </div>
+            <div class="card-body">
+                {{-- <div class="col-md-11 mx-auto card p-4"> --}}
+                {{-- <div class="col-6"> --}}
+        <table class="table text-center table-bordered" id="tablekaunter" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
-                        <th>Nama</th>
+                        <th align = 'text-center'>Nama</th>
                         <th>No Kad Pengenalan</th>
                         <th>No Telefon</th>
                         <th>Bilangan Surat</th>
@@ -35,13 +47,13 @@
                 @foreach($listwinner as $winner)
                         <tr>
                             <td> {{ $loop->iteration }} </td>
-                            <td align = 'left'>{{ $winner['details']['name']}}</td>
+                            <td  style="white-space: nowrap;" align = 'left'>{{ $winner['details']['name']}}</td>
                             <td>{{ $winner['details']['nokp']}}</td>
                             <td>{{ $winner['details']['notelbimbit']}}</td>
                             <td>{{ $winner['total_surat']}}</td>
                             <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
                             <td>{{ number_format($winner['totalPay'], 2, '.', ',')}}</td>
-                            <td>
+                            <td align="center">
                                 @if($winner['totalPay'] < $winner['totalBid'])
                                     <button class="btn btn-danger btn-sm" disabled>BELUM SELESAI</button>
                                 @elseif($winner['totalPay'] == $winner['totalBid'])
@@ -59,16 +71,16 @@
                             <td>
                             <a href=" {{ route('serahan.resit', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Resit Pembayaran"><i class="far fa-edit"></i></a>
                             </td> --}}
-                            <td>
-                                    <a href=" {{ route('pembida.SAGBidItembycaw', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'kodcaw'=>$caw_code]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
+                            <td align="center">
+                                    <a class="btn m-1 btn-info" href=" {{ route('pembida.SAGBidItembycaw', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'kodcaw'=>$caw_code]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                 @endforeach
             </tbody>
         </table>
-        <div class="modal-footer" style="margin-top:2%;">
+        {{-- <div class="modal-footer" style="margin-top:2%;">
             <a  href="{{ route('pembida.kebenaranbayarantunai') }}" class="btn btn-primary">Kembali</a>
-        </div>
+        </div> --}}
     </div>
     </div>
 </div>