diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 7e323359..a8b454f0 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -66,15 +66,12 @@ class AccountController extends Controller
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbid.kodcaw', $kodcaw)
-        ->where('payment.status_payment_opt', 3)
-        ->orWhere('payment.status_payment_opt', 2)
         ->where('lelongbidder.status_payment', 2)
         ->whereNull('payment.disahkan_pada')
-        ->select('.lelongbidder.user_id'
-        )
+        ->select('lelongbidder.user_id')
         ->groupBy('lelongbidder.user_id')
         ->get();
-        
+        // dd($listwinner);
 
         foreach($listwinner as $index1=>$winner){
 
@@ -83,13 +80,13 @@ class AccountController extends Controller
             $SAGWin = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
             ->join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->where('lelongbidder.user_id', $winner['user_id'])
-            ->where('lelongbidder.kodcaw',$kodcaw)
+            ->where('lelongbid.kodcaw',$kodcaw)
             ->where('lelongbidder.status_bidder', 1)
-            ->where('payment.status_payment_opt', 3)
-            ->orWhere('payment.status_payment_opt', 2)
             ->where('lelongbid.lelong_id', $lelong_id)
+            // ->where('payment.status_payment_opt', 3)
+            // ->orWhere('payment.status_payment_opt', 2)
             ->get();
-            // dd($SAGWin->sum('hargabida'));
+            // dd($SAGWin);
 
             $id_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->where('lelongbidder.user_id', $winner['user_id'])
@@ -130,8 +127,8 @@ class AccountController extends Controller
         ->where('lelongbidder.user_id', $user_id)
         ->where('lelongbid.kodcaw', $caw_code)
         ->where('lelongbidder.status_bidder', 1)
-        ->where('payment.status_payment_opt', 3)
-        ->orWhere('payment.status_payment_opt', 2)
+        // ->where('payment.status_payment_opt', 3)
+        // ->orWhere('payment.status_payment_opt', 2)
         ->where('lelongbidder.status_payment', 2)
         ->get()->toArray();
         // dd($senaraisag);
@@ -198,7 +195,7 @@ class AccountController extends Controller
             'lelongbid.id as lelongbid_id',
             'payment.id as payment_id',
             'lelongbid.lelong_id',
-            'lelongbidder.user_id',
+            'lelongbidder.user_id'
             )
         ->get();    
 
diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php
index 18f927e4..f73dfd9c 100644
--- a/app/Http/Controllers/PembidaController.php
+++ b/app/Http/Controllers/PembidaController.php
@@ -16,6 +16,9 @@ use App\Models\CawanganLelong;
 use App\Models\LelongBidder;
 use App\Models\LelongBid;
 use App\Models\Payment;
+use App\Models\Cawangan;
+
+
 
 class PembidaController extends Controller
 {
@@ -211,45 +214,56 @@ class PembidaController extends Controller
     public function pembayaranbidaan(Request $request)
     {
         // dd($request->all());
+        $getkodcaw = Cawangan::where('caw_code', $request->kodcaw)->select('caw_name')->first();
         $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $request->lelong_id)
         ->where('lelongbid.kodcaw', $request->kodcaw)
-        ->select('lelongbidder.user_id'
-        )
+        ->select('lelongbidder.user_id')
         ->groupBy('lelongbidder.user_id')
         ->get()->toArray();
+        // dd($listwinner);
 
         foreach($listwinner as $index1=>$winner)
         {
             $userdetails = User::where('id', $winner['user_id'])->first();
+
             $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
-            ->where('user_id', $winner['user_id'])
+            ->where('lelongbid.nopembeli', $winner['user_id'])
+            ->where('lelongbid.kodcaw', $request->kodcaw)
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.lelong_id', $request->lelong_id)
             ->get();
-            // dd($userdetails);
+            // dd($SAGWin);
 
-            foreach($SAGWin as $index2=>$sag)
-            {
+            // foreach($SAGWin as $index2=>$sag)
+            // {
 
-                $detailspayment = Payment::where('id', $sag->payment_id)->first();
-                // dd($detailspayment);
-            }
+            //     $detailspayment = Payment::where('id', $sag->payment_id)->first();
+            //     // dd($detailspayment);
+            // }
 
-            $payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
-            ->where('user_id', $winner['user_id'])
+            $payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            ->where('lelongbidder.user_id', $winner['user_id'])
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.lelong_id', $request->lelong_id)
-            ->select('payment_id')->groupBy('payment_id')->get();
+            ->where('lelongbid.kodcaw',$request->kodcaw)
+            ->select('lelongbidder.payment_id')
+            ->groupBy('lelongbidder.payment_id')
+            ->get();
+            // dd($payment_id);
             
             $total_payment = 0;
-            foreach($payment_id as $id)
+            foreach($payment as $id)
             {
                 $payment = Payment::where('id', $id->payment_id)
                 ->first();
+                // dd($payment);
+                
+
 
                 if($payment){
+                    $payment_id = $id->payment_id;
                     $total_payment = $total_payment + $payment->total_payment;
                 }
             }
@@ -258,18 +272,19 @@ class PembidaController extends Controller
             $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
             $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index1]['totalPay'] = $total_payment;
-            $listwinner[$index1]['payment_id'] = $payment_id;
-            $listwinner[$index1]['jenisbayaran']['status_payment'] = $sag->status_payment;
-            $listwinner[$index1]['jenisbayaran']['status'] = $detailspayment['status'];
+            
 
         }
+       
 
         $kodcaw = $request->kodcaw;
-
-        return view('pembida.pembayaranbidaan',compact('listwinner', 'kodcaw'));
+        $lelong_id = $request->lelong_id;
+        $payment_id = $request->payment_id;
+        // dd($kodcaw);
+        return view('pembida.pembayaranbidaan',compact('listwinner','lelong_id', 'getkodcaw', 'kodcaw'));
     }
 
-    public function detailsbidaan($user_id, $payment_id, $kodcaw)
+    public function detailsbidaan($user_id, $kodcaw)
     {
 
         $userdetail = User::where('id', $user_id)->first();
@@ -277,8 +292,8 @@ class PembidaController extends Controller
         $infos = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
         ->join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
         ->where('lelongbidder.user_id', $user_id)
-        ->where('lelongbidder.payment_id', $payment_id)
-        ->where('cawangan.caw_code', $kodcaw)
+        // ->where('lelongbidder.payment_id', $payment_id)
+        ->where('lelongbid.kodcaw', $kodcaw)
         ->where('lelongbidder.status_payment', 1)
         ->select('lelongbid.id as lelongbid_id',
                  'lelongbidder.id as lelongbidder_id',
@@ -294,6 +309,7 @@ class PembidaController extends Controller
                  'lelongbidder.notelbimbit'
                 )
         ->get();
+        // dd($infos);
 
         foreach ($infos as $index1 => $info) 
         {
diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php
index ab5e18a8..6b12b032 100644
--- a/app/Http/Controllers/SerahanController.php
+++ b/app/Http/Controllers/SerahanController.php
@@ -38,18 +38,45 @@ class SerahanController extends Controller
    
     public function laporanserahan()
     {
-        $user =  Auth::user();
+        // $user =  Auth::user();
             
  
         
-        $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
-        ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-        ->where('cawangan.caw_code','=',$user->kodcaw)
-        ->get();
+        // $lelongid = 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('serahan.laporanserahan',compact('lelongid'));
+        // return view('serahan.laporanserahan',compact('lelongid'));
+        $arrayinfo = [];
+
+        $user = Auth::user();
+
+        $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+        ->select('lelong.fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->where('lelong.sts_lelong', 3)
+        ->where('cawangan.caw_code', $user->kodcaw)
+        ->groupBy('lelong_id')
+        ->get()
+        ->toArray();
+       
+
+        foreach($lelong as $info)
+        {
+            $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$info['lelong_id'])
+            ->where('cawangan.caw_code',$user->kodcaw)
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
+            //  dd($detailsinfo);
+        }
+
+        return view('serahan.laporanserahan',compact('lelong', 'arrayinfo'));
+        
     }
      
     public function pembayaran($lelong_id){
diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index 60ad2c88..c4d4d6b1 100644
--- a/app/Http/Controllers/TangguhLelongController.php
+++ b/app/Http/Controllers/TangguhLelongController.php
@@ -30,7 +30,7 @@ class TangguhLelongController extends Controller
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
         ->where('cawangan.caw_code', $user->kodcaw)
         ->where('sts_lelong', 0)
-        ->select('fasa','lelong_id','cawangan.caw_code','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('lelong.fasa','lelong_id','cawangan.caw_code','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->distinct()
         ->get()
         ->toArray();
diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php
index d9d039bd..171c4939 100644
--- a/resources/views/account/sahsagonline.blade.php
+++ b/resources/views/account/sahsagonline.blade.php
@@ -79,11 +79,7 @@
                 </table>
                 <div class="modal-footer" style="margin-top:2%;">
                     {{-- <a  href="{{ route('account.listbayaranonline', [$lelong_id,$caw_code]) }}" class="btn btn-primary">Kembali</a> --}}
-                    @if($checking)
-                        <button type="button" class="btn btn-success" disabled>Berjaya Disahkan</button>
-                    @else
                         <button type="button" class="btn btn-warning" onclick="confirm()" >Sahkan</button>
-                    @endif   
                 </div>
             </form> 
         </div>
diff --git a/resources/views/pembida/detailsbidaan.blade.php b/resources/views/pembida/detailsbidaan.blade.php
index 9f531df3..82fc6576 100644
--- a/resources/views/pembida/detailsbidaan.blade.php
+++ b/resources/views/pembida/detailsbidaan.blade.php
@@ -3,9 +3,11 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-12 mx-auto card">
-            <h3 class="pt-3" style="margin-left:1%;">Butiran Bidaan Pembida Yang Menang</h3>
+    <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>
             @if ($message = Session::get('failed'))
                 <div class="alert alert-danger">
                     <p>{{ $message }}</p>
@@ -13,7 +15,7 @@
             @endif
 
                 <div class="container">
-                    <div class="row mb-2">
+                    <!-- <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> {{ $infos[0]['t_lelong'] }}</p>
                             <p> <b>Cawangan : </b>{{ $infos[0]['caw_name'] }}</p>
@@ -21,7 +23,7 @@
                             <p> <b>No Kad Pengenalan : </b>{{ $userdetail['nokp'] }}</p>
                             <p> <b>No Tel Bimbit : </b>{{ $infos[0]['notelbimbit'] }}</p>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
                 <table class="table table-striped  table-xl text-center" id="butirangadai" style="width:100%; margin-top:1%;">
                     <thead class="bg-primary text-white">
@@ -42,8 +44,8 @@
                                 <td>{{ $loop->iteration }}</td>
                                 <td>{{ $inf['info']['norujukan'] }}</td>
                                 <td>{{ $inf['info']['marhun'] }}</td>
-                                <td>{{ $inf['info']['hargaasas'] }}</td>
-                                <td>{{ $inf['info']['hargabida'] }}</td>
+                                <td>{{ number_format($inf['info']['hargaasas'], 2, '.', ',') }}</td>
+                                <td>{{ number_format($inf['info']['hargabida'], 2, '.', ',') }}</td>
                                 <td>{{ $inf['info']['masa_bidaan'] }}</td>
                                 <td>
                                     @foreach($inf['butiran_bidaan'] as $butiran_bidaan)
@@ -60,9 +62,7 @@
                         @endforeach
                     </tbody>
                 </table>
-                <div class="modal-footer">
-                    <a  href="{{ route('pembida.senlelpembayaranbidaan') }}" class="btn btn-primary" style="width:8%;">Kembali</a>
-                </div>
+               
         </div>
     </div>
 </div>
diff --git a/resources/views/pembida/pembayaranbidaan.blade.php b/resources/views/pembida/pembayaranbidaan.blade.php
index ac6312e5..02d39940 100644
--- a/resources/views/pembida/pembayaranbidaan.blade.php
+++ b/resources/views/pembida/pembayaranbidaan.blade.php
@@ -5,88 +5,65 @@
 <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>
         @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>Bil</th>
-                            <th>Nama Pembida</th>
-                            <th>No Kad Pengenalan</th>
-                            <th>Bilangan Surat</th>
-                            <th> Jumlah Bidaan (RM)</th>
-                            <th> Amaun Telah Dibayar (RM)</th>
-                            <th>Status Pembayaran</th>
-                            <th>Status</th>
-                            <th class="text-center">Tindakan</th>
-                        </tr>
-                </thead>
-                <tbody>
-                    @foreach($listwinner as $index1=>$winner)
+        <h4> Senarai Pembayaran Bidaan </h4>
+            <p><i class="fas fa-caret-right"></i>  {{ $getkodcaw['caw_name'] }}</p>
+        <table class="table table-striped  table-xl text-center" id="sahsagonline" style="width:100%">
+            <thead class="bg-primary text-white">
                     <tr>
-                        <td>{{ $loop->iteration }}</td>
-                        <td align = 'left'>{{ $winner['details']['name'] }}</td>
-                        <td>{{ $winner['details']['nokp'] }}</td>
-                        <td>{{ $winner['total_surat'] }}</td>
-                        <td>{{ number_format($winner['totalBid'], 2, '.', ',') }}</td>
-                        <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
-                        <td>
-                            @if($winner['jenisbayaran']['status'] == 1)
-                                <button class="btn btn-info btn-sm" disabled>YURAN</button>
-                            @elseif($winner['jenisbayaran']['status'] == 2)
-                                <button class="btn btn-info btn-sm" disabled>BIDAAN MENANG</button>
-                            @endif
-                        </td>
-                        <td>
-                            @if($winner['jenisbayaran']['status_payment'] == 1)
-                                <button class="btn btn-success btn-sm" disabled>BERJAYA</button>
-                            @endif
-                        </td>
-                        <td>
-                            {{-- {{ dd($winner) }} --}}
-                            <a  href="{{ route('pembida.detailsbidaan', [ 'user_id'=>$winner['details']['id'], 'payment_id'=>$winner['payment_id'][0]['payment_id'], $kodcaw ]) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-list-alt"></i></a>
-                        </td>
+                        <th>No</th>
+                        <th>Nama</th>
+                        <th>No Kad Pengenalan</th>
+                        <th>No Telefon</th>
+                        <th>Bilangan Surat</th>
+                        <th>Jumlah Pembayaran(RM)</th>
+                        <th>Jumlah Bidaan(RM)</th>
+                        <th class="text-center">Maklumat</th>
                     </tr>
-                    @endforeach
-                </tbody>
-            </table>
-            <div class="modal-footer" style="margin-top:2%;">
-                <a  href="{{ route('pembida.senlelpembayaranbidaan') }}" class="btn btn-primary">Kembali</a>
-            </div>
-            </div>
-        </form>
+            </thead>
+            <tbody>
+                @foreach($listwinner as $winner)
+                        <tr>
+                            <td> {{ $loop->iteration }} </td>
+                            <td 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['totalPay'], 2, '.', ',')}}</td>
+                            <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
+                            <td>
+                                <a href=" {{ route('pembida.detailsbidaan', ['user_id'=>$winner['details']['id'], 'kodcaw'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                            </td>
+                        </tr>
+                @endforeach
+            </tbody>
+        </table>
+       
     </div>
 </div>
 
 <script>
-     //Enable tooltips everywhere
-     $(function () {
+    //Enable tooltips everywhere
+    $(function () {
         $('[data-toggle="tooltip"]').tooltip()
     })
-    var tablesenarailelongonline = $('#senarailelongonline').DataTable({
+    
+    var tablesahsagonline = $('#sahsagonline').DataTable({
             "columnDefs": [ 
                 {
                 "targets": 0,
                 "orderable": false
                 }, 
                 {
-                "targets": 6,
-                "orderable": false
-                }, 
-                {
                 "targets": 7,
                 "orderable": false
-                }, 
-                {
-                "targets": 8,
-                "orderable": false
-                }, 
-                {
-                "targets": 9,
-                "orderable": false
                 }
             ],
             order: [[0, 'asc']],
@@ -125,7 +102,7 @@
         // // $( '.dt-buttons').addClass('btn-group');
         // $( '.addcaw').removeClass('dt-button');
         // $( '.export').removeClass('dt-button');
-
 </script>
 
-@endsection
\ No newline at end of file
+@endsection
+
diff --git a/resources/views/pembida/senlelpembayaranbidaan.blade.php b/resources/views/pembida/senlelpembayaranbidaan.blade.php
index ae6bf044..4e6a577e 100644
--- a/resources/views/pembida/senlelpembayaranbidaan.blade.php
+++ b/resources/views/pembida/senlelpembayaranbidaan.blade.php
@@ -21,7 +21,7 @@
                         <th>Tempoh</th>
                         <th>Caj Lelong</th>
                         <th>Status Lelong</th>
-                        <th class="text-center">Tindakan</th>
+                        <!-- <th class="text-center">Tindakan</th> -->
                     </tr>
             </thead>
             <tbody>
diff --git a/resources/views/serahan/laporanserahan.blade.php b/resources/views/serahan/laporanserahan.blade.php
index 751d8328..fdb803f9 100644
--- a/resources/views/serahan/laporanserahan.blade.php
+++ b/resources/views/serahan/laporanserahan.blade.php
@@ -1,53 +1,64 @@
 @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'))
+        @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
                 </div>
-            @endif
-            <form id="exportform" action="" method="POST">
-                <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl" id="tablelaporanserahan" 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>ID Lelong</th>
-                            <th>Tarikh Lelong</th>
-                            <th class="text-center">Tindakan</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        
-                        @foreach ($lelongid as $bid)
-                        <tr>
-                            <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $bid->id }}"></td>
-                            <td>{{ $bid->lelong_id}}</td>
-                            <td>{{ $bid->tarikh_lelong }}</td>
-                            <td class="text-center">
-                            <a  href="{{ route('serahan.pembayaran',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Pembayaran" ><i class="far fa-edit"></i></a>
-                            </td>
-                        </tr>
+        @endif
+        <h4> Senarai Lelong </h4>
+        <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>Fasa</th>
+                        <th>Tarikh Lelong</th>
+                        <th>Status Lelong</th>
+                        <th class="text-center">Tindakan</th>
+                    </tr>
+            </thead>
+            <tbody>
+                @foreach($arrayinfo as $data)
+                <tr>
+                    <td>{{$loop->iteration}}</td>
+                    <td>{{ $data['info']['lelong_id'] }}</td>
+                    <td align = 'left'>
+                        @foreach($data['detailsinfo'] as $details)
+                            <span class="m-2">{{$details['caw_name']}}</span><br>
                         @endforeach
-                    </tbody>
-                    
-                </table>
-            </form>
+                    </td>
+                    <td>{{ $data['info']['fasa'] }}</td>
+                    <td>@php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $data['info']['tarikh_lelong'] );
+                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                echo($t_lelong);
+                            @endphp</td>
+                    <td>
+                        @if($data['info']['sts_lelong'] == 3)
+                            <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                        @endif
+                    </td>
+                    <td><a href=" {{ route('serahan.pembayaran', ['lelong_id'=>$data['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a></td>
+                </tr>
+                @endforeach
+            </tbody>
+        </table>
         </div>
-        
     </div>
 </div>
 
 <script>
-
      //Enable tooltips everywhere
      $(function () {
         $('[data-toggle="tooltip"]').tooltip()
     })
-    var tablelaporanserahan = $('#tablelaporanserahan').DataTable({
+    var tablesenarailelongonline = $('#senarailelongonline').DataTable({
             "columnDefs": [ 
                 {
                 "targets": 0,
@@ -94,7 +105,7 @@
         // // $( '.dt-buttons').addClass('btn-group');
         // $( '.addcaw').removeClass('dt-button');
         // $( '.export').removeClass('dt-button');
-    
+
 </script>
 
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/serahan/pembayaran.blade.php b/resources/views/serahan/pembayaran.blade.php
index 997420f7..5ac7c310 100644
--- a/resources/views/serahan/pembayaran.blade.php
+++ b/resources/views/serahan/pembayaran.blade.php
@@ -25,11 +25,11 @@
                 @foreach($payment as $pay)
                         <tr>
                             <td> {{ $loop->iteration }} </td>
-                            <td>{{ $pay['details']['name']}}</td>
+                            <td align = 'left'>{{ $pay['details']['name']}}</td>
                             <td>{{ $pay['details']['nokp']}}</td>
                             <td>{{ $pay['details']['notelbimbit']}}</td>
                             <td>{{ $pay['total_surat']}}</td>
-                            <td>{{ $pay['totalBid']}}</td>
+                            <td>{{ number_format($pay['totalBid'], 2, '.', ',')}}</td>
                             {{-- <td> <a href="{{ route('serahan.penyatabayaran',['user_id'=>$pay['details']['id'],'lelong_id'=>$lelong_id]) }}"><i class="fas fa-download"></i></a></td> --}}
                             <td> <a href="{{ route('serahan.resitpembayaran',['user_id'=>$pay['details']['id'],'lelong_id'=>$lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Resit"><i class="fas fa-download"></i></a></td>
                             <td> <a href="{{ route('serahan.senaraibid',['user_id'=>$pay['details']['id'],'lelong_id'=>$lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Butiran Bidaan" ><i class="fas fa-download"></i></a></td>
@@ -89,7 +89,7 @@
                 "orderable": false
                 }
             ],
-            order: [[1, 'asc']],
+            order: [[1, 'desc']],
             // "ordering": false,
             "info": false,
             "lengthChange": false,
@@ -98,22 +98,22 @@
             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();
-                    }
-                }
+                // {
+                //     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();
+                //     }
+                // }
             ]
         });
 
diff --git a/resources/views/serahan/senarailelongbayaran.blade.php b/resources/views/serahan/senarailelongbayaran.blade.php
new file mode 100644
index 00000000..587386c1
--- /dev/null
+++ b/resources/views/serahan/senarailelongbayaran.blade.php
@@ -0,0 +1,111 @@
+@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
+        <h4> Senarai Lelong </h4>
+        <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>Fasa</th>
+                        <th>Tarikh Lelong</th>
+                        <th>Status Lelong</th>
+                        <th class="text-center">Tindakan</th>
+                    </tr>
+            </thead>
+            <tbody>
+                @foreach($arrayinfo as $data)
+                <tr>
+                    <td>{{$loop->iteration}}</td>
+                    <td>{{ $data['info']['lelong_id'] }}</td>
+                    <td align = 'left'>
+                        @foreach($data['detailsinfo'] as $details)
+                            <span class="m-2">{{$details['caw_name']}}</span><br>
+                        @endforeach
+                    </td>
+                    <td>{{ $data['info']['fasa'] }}</td>
+                    <td>@php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $data['info']['tarikh_lelong'] );
+                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                echo($t_lelong);
+                            @endphp</td>
+                    <td>
+                        @if($data['info']['sts_lelong'] == 3)
+                            <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                        @endif
+                    </td>
+                    <td><a href=" {{ route('pembayaran.kaunterpembayaran', ['lelong_id'=>$data['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a></td>
+                </tr>
+                @endforeach
+            </tbody>
+        </table>
+        </div>
+    </div>
+</div>
+
+<script>
+     //Enable tooltips everywhere
+     $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    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/routes/web.php b/routes/web.php
index 663df8bd..e02b62dc 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -226,7 +226,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
     Route::post('/update',['as'=>'pembida.update','uses'=>'PembidaController@update']);
     Route::get('/senlelpembayaranbidaan',['as'=>'pembida.senlelpembayaranbidaan','uses'=>'PembidaController@senlelpembayaranbidaan']);
     Route::get('/pembayaranbidaan',['as'=>'pembida.pembayaranbidaan','uses'=>'PembidaController@pembayaranbidaan']);
-    Route::get('/detailsbidaan/{user_id}/{payment_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']);
+    Route::get('/detailsbidaan/{user_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']);
 
 });
 
@@ -270,7 +270,7 @@ Route::group(['middleware' => ['permission:tetapan'],'prefix'=>'tetapan'], funct
 Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () { 
     Route::get('/laporanserahan',['as'=>'serahan.laporanserahan','uses'=>'SerahanController@laporanserahan']); 
 
-    Route::get('/pembayaran/{id}',['as'=>'serahan.pembayaran','uses'=>'SerahanController@pembayaran']); 
+    Route::get('/pembayaran/{lelong_id}',['as'=>'serahan.pembayaran','uses'=>'SerahanController@pembayaran']); 
     Route::get('/penyatabayaran/{user_id}/{lelong_id}',['as'=>'serahan.penyatabayaran','uses'=>'SerahanController@penyatabayaran']);
     Route::get('/resitpembayaran/{user_id}/{lelong_id}',['as'=>'serahan.resitpembayaran','uses'=>'SerahanController@resitpembayaran']);
     Route::get('/senaraibid/{user_id}/{lelong_id}',['as'=>'serahan.senaraibid','uses'=>'SerahanController@senaraibid']);