diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 6287cceb..4f8dcc25 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -686,7 +686,7 @@ class AccountController extends Controller
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbid.kodcaw', $kodcaw)
-        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at')
+        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan')
         ->groupBy('lelongbidder.user_id')
         ->get();
 
@@ -696,6 +696,7 @@ class AccountController extends Controller
             $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->where('lelongbid.nopembeli', $listing['user_id'])
             ->where('lelongbid.kodcaw', $listing['kodcaw'])
+            ->where('lelongbid.norujukan', $listing['norujukan'])
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.lelong_id', $listing['lelong_id'])
             ->get();
@@ -743,7 +744,7 @@ class AccountController extends Controller
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbid.kodcaw', $kodcaw)
-        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at')
+        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan')
         ->groupBy('lelongbidder.user_id')
         ->get();
 
@@ -753,6 +754,7 @@ class AccountController extends Controller
             $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->where('lelongbid.nopembeli', $listing['user_id'])
             ->where('lelongbid.kodcaw', $listing['kodcaw'])
+            ->where('lelongbid.norujukan', $listing['norujukan'])
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.lelong_id', $listing['lelong_id'])
             ->get();
@@ -794,4 +796,132 @@ class AccountController extends Controller
 
      }
 
+
+     public function laporanakaundetailall ($lelong_id){
+
+        $lelonglel = Lelong::with('cawangan')->find($lelong_id);
+
+        $cawanganDetail = $lelonglel->cawangan->first();
+        // dd($lelonglel->tarikh_lelong);
+
+        $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+        ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
+        ->join('resit', 'resit.id', '=', 'payment.resit_id')
+        ->whereIn('payment.status_payment_opt', [2,3])
+        ->where('lelongbidder.status_bidder', 1)
+        ->where('lelongbid.lelong_id', $lelong_id)
+        // ->where('lelongbid.kodcaw', $kodcaw)
+        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan')
+        ->groupBy('resit.billplz_id')
+        ->orderBy('lelongbid.kodcaw')
+        ->get();
+        // dd($listwinner);
+
+        foreach($listwinner as $index=>$listing){
+            $total_payment = 0;
+            $userdetails = User::where('id', $listing['user_id'])->first();
+            $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            ->where('lelongbid.nopembeli', $listing['user_id'])
+            ->where('lelongbid.norujukan', $listing['norujukan'])
+            ->where('lelongbidder.status_bidder', 1)
+            ->where('lelongbid.lelong_id', $listing['lelong_id'])
+            ->get();
+
+            foreach($SAGWin as $index2=>$sag)
+            {
+                // dd($detailspayment);
+                $detailspayment  = null;
+                if($sag['payment_id'] != null)
+                {
+                    $detailspayment = Payment::where('id', $sag['payment_id'])->first();
+                    // dd($detailspayment);
+                    $total_payment = $total_payment + $detailspayment->total_payment;
+                    // dd($total_payment);
+                }else
+                {
+                    $total_payment = '0.00';
+                }
+
+            }
+            $listwinner[$index]['details'] = $userdetails; 
+            $listwinner[$index]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
+            $listwinner[$index]['totalPay'] = $total_payment;
+            $listwinner[$index]['jenisbayaran'] = $detailspayment ;
+        }
+
+        $getpengesahan = Cawangan::first();
+
+
+       return view('account.laporanakaundetailall', compact('lelonglel','listwinner','lelong_id','getpengesahan','cawanganDetail'));
+    }
+    public function laporanakaundetailallexport(Request $request){
+
+        $lelong_id = $request->lelong_id;
+        $kodcaw = $request->kodcaw;
+        $lelonglel = Lelong::with('cawangan')->find($lelong_id);
+
+        $cawanganDetail = $lelonglel->cawangan->first();
+        // dd($lelonglel->tarikh_lelong);
+
+        $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+        ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
+        ->join('resit', 'resit.id', '=', 'payment.resit_id')
+        ->whereIn('payment.status_payment_opt', [2,3])
+        ->where('lelongbidder.status_bidder', 1)
+        ->where('lelongbid.lelong_id', $lelong_id)
+        // ->where('lelongbid.kodcaw', $kodcaw)
+        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan')
+        ->groupBy('resit.billplz_id')
+        ->orderBy('lelongbid.kodcaw')
+        ->get();
+
+        foreach($listwinner as $index=>$listing){
+            $total_payment = 0;
+            $userdetails = User::where('id', $listing['user_id'])->first();
+            $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            ->where('lelongbid.nopembeli', $listing['user_id'])
+            ->where('lelongbid.norujukan', $listing['norujukan'])
+            ->where('lelongbidder.status_bidder', 1)
+            ->where('lelongbid.lelong_id', $listing['lelong_id'])
+            ->get();
+            foreach($SAGWin as $index2=>$sag)
+            {
+                // dd($detailspayment);
+                $detailspayment  = null;
+                if($sag['payment_id'] != null)
+                {
+                    $detailspayment = Payment::where('id', $sag['payment_id'])->first();
+                    $total_payment = $total_payment + $detailspayment->total_payment;
+                    // dd($total_payment);
+                }else
+                {
+                    $total_payment = '0.00';
+                }
+
+            }
+            $listwinner[$index]['details'] = $userdetails; 
+            $listwinner[$index]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
+            $listwinner[$index]['totalPay'] = $total_payment;
+            $listwinner[$index]['jenisbayaran'] = $detailspayment ;
+        }
+
+        $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
+
+        if($request->type == 'excel')
+        {
+            return view('excel.laporanakaundetailall_excel', compact('lelonglel','listwinner','lelong_id','getpengesahan','cawanganDetail'));
+        
+        }else
+        {
+            $pdf = PDF::loadView('pdf.laporanakaundetailallpdf',compact('lelonglel','listwinner','lelong_id','getpengesahan','cawanganDetail'))
+            ->setPaper('a4', 'potrait');
+            
+            return $pdf->download('Laporan Bayaran Online Lelongan Keseluruhan.pdf');
+        }
+
+     }
+    
+
 }
diff --git a/resources/views/account/laporanakaun.blade.php b/resources/views/account/laporanakaun.blade.php
index df8c9f02..a726b19f 100644
--- a/resources/views/account/laporanakaun.blade.php
+++ b/resources/views/account/laporanakaun.blade.php
@@ -28,6 +28,7 @@
                                         <th>Tarikh Lelong</th>
                                         {{-- <th>Fasa</th> --}}
                                         <th>Cawangan</th>
+                                        <th>Keseluruhan</th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -44,10 +45,13 @@
                                         {{-- <td>{{ $laporan['brg']['fasa']}}</td> --}}
                                         <td align="left">
                                             @foreach($laporan['detailsbrg'] as $details)
-                                            <a class="btn m-1 btn-danger" href=" {{ route('account.laporanakaundetail', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="far fa-edit"></i></a>
+                                            <a class="btn m-1 btn-info" href=" {{ route('account.laporanakaundetail', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="far fa-edit"></i></a>
                                                 <span class="badge badge-pill badge-info text-white" style="font-size:100%">{{ $details['caw_name']}}</span><br>
                                             @endforeach
                                         </td>
+                                        <td>
+                                            <a class="btn m-1 btn-primary" href=" {{ route('account.laporanakaundetailall', ['lelong_id'=>$laporan['brg']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="far fa-edit"></i></a>
+                                        </td>
 
                                     </tr>  
                     
diff --git a/resources/views/account/laporanakaundetail.blade.php b/resources/views/account/laporanakaundetail.blade.php
index c00f4904..4066812d 100644
--- a/resources/views/account/laporanakaundetail.blade.php
+++ b/resources/views/account/laporanakaundetail.blade.php
@@ -53,18 +53,35 @@
                             $totalcaj = 0;
                             $totalbayaran = 0;
                         @endphp
-                        @forelse($listwinner as $winner)
-                        @php
-                            $totalbidaan += $winner['totalPay'];
-                            $totalcaj += 1;
-                            $totalbayaran = $totalbidaan + $totalcaj;
-                        @endphp
+                       @forelse($listwinner as $winner)
+                       @if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                       @php
+                       $totalbidaan += $winner['totalPay'];
+                       $totalcaj += 1;
+                       $totalbayaran = $totalbidaan + $totalcaj;
+                       @endphp
+                       @else
+                       @php
+                       $totalbidaan += $winner['totalPay'];
+                       $totalbayaran = $totalbidaan;
+                       @endphp
+                       @endif
                         <tr>
                             <td>{{ $loop->iteration }}</td>
                             <td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
                             <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
-                            <td>{{ number_format(1, 2, '.', ',') }}</td>
-                            <td>{{ number_format($winner['totalPay']+1, 2, '.', ',') }}</td>
+                            <td>@if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                {{ number_format(1, 2, '.', ',') }}
+                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                {{ number_format(0, 2, '.', ',') }}
+                                @endif
+                            </td>
+                            <td> @if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                 {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                 @endif
+                            </td>
                             <td> @if($winner['jenisbayaran'] != NULL)
                                 {{-- {{ dump($winner['jenisbayaran'])}} --}}
                                      @if($winner['jenisbayaran']['status_payment_opt'] == 1)
diff --git a/resources/views/account/laporanakaundetailall.blade.php b/resources/views/account/laporanakaundetailall.blade.php
new file mode 100644
index 00000000..f529a864
--- /dev/null
+++ b/resources/views/account/laporanakaundetailall.blade.php
@@ -0,0 +1,201 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col mx-auto p-4">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="{{ route('account.laporanakaun') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                        Laporan bayaran online lelongan
+                    </div>
+                </div>
+                <div class="card-body">
+            @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
+            <div>
+                Batch Lelong: {{$lelong_id}} <br>
+                Tarikh Lelong:  
+                @php 
+                $myDateTime = DateTime::createFromFormat('Y-m-d', $lelonglel->tarikh_lelong);
+                  $datez = $myDateTime->format('d-m-Y');
+                  echo($datez);
+                @endphp
+             </div>
+             <form id="exportpdf" action="{{route('account.laporanakaundetailallexport')}}" method="POST">
+                @csrf
+                <input type="hidden" name="type" id="typedonwload" value="">
+                <input type="hidden" name="lelong_id" value="{{ $lelong_id}}">
+                <input type="hidden" name="kodcaw" value="{{ $cawanganDetail->caw_code}}">
+                <table class='table text-center table-bordered table-hover' id="tablelelong" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>No</th>
+                            <th>Cawangan</th>
+                            <th>Nama Pemenang</th>
+                            <th>Jumlah Bidaan(RM)</th>
+                            <th>Caj(RM)</th>
+                            <th>Jumlah Bayaran(RM)</th>
+                            <th>Jenis Bayaran</th>
+                            <th>Billplz ID</th>
+                            <th>Tarikh/Masa</th>
+                            <th>Status Bayaran</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @php
+                            $totalbidaan = 0;
+                            $totalcaj = 0;
+                            $totalbayaran = 0;
+                        @endphp
+                        @forelse($listwinner as $winner)
+                            @if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                            @php
+                            $totalbidaan += $winner['totalPay'];
+                            $totalcaj += 1;
+                            $totalbayaran = $totalbidaan + $totalcaj;
+                            @endphp
+                            @else
+                            @php
+                            $totalbidaan += $winner['totalPay'];
+                            $totalbayaran = $totalbidaan;
+                            @endphp
+                            @endif
+                        <tr>
+                            <td>{{ $loop->iteration }}</td>
+                            <td>{{ $winner['kodcaw'] }}</td>
+                            <td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
+                            <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
+                            <td>@if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                {{ number_format(1, 2, '.', ',') }}
+                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                {{ number_format(0, 2, '.', ',') }}
+                                @endif
+                            </td>
+                            <td> @if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                 {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                 @endif
+                            </td>
+                            <td> @if($winner['jenisbayaran'] != NULL)
+                                {{-- {{ dump($winner['jenisbayaran'])}} --}}
+                                     @if($winner['jenisbayaran']['status_payment_opt'] == 1)
+                                     TUNAI
+                                     @elseif($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                     FPX
+                                     @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                     KAUNTER BANK/CDM
+                                     
+                                     @endif
+                                 @else
+                                     -
+                                 @endif
+                            </td>
+                            <td>{{ $winner['billplz_id']}}</td>
+                            <td>{{ $winner['paid_at']}}</td>
+                            <td> @if($winner['jenisbayaran'] != NULL)
+                                @if($winner['jenisbayaran']['disahkan_oleh'] != NULL)
+                                    SELESAI
+                                @elseif($winner['jenisbayaran']['disahkan_oleh'] == NULL)
+                                    TUNGGU PENGESAHAN
+                                @else 
+                                    BELUM SELESAI
+                                @endif
+                                @else 
+                                BELUM SELESAI
+                                @endif
+                            </td>
+                        </tr>
+                        @empty
+                        <tr>
+                            <td colspan="9">No Data</td>
+                        </tr>
+                @endforelse
+                    </tbody>
+                    <tfoot>
+                        <tr>
+                            <td colspan="3" align="center"><b>JUMLAH KESELURUHAN</b></td>
+                            <td><b>{{ number_format($totalbidaan, 2, '.', ',') }}</b></td>
+                            <td><b>{{ number_format($totalcaj, 2, '.', ',') }}</b></td>
+                            <td><b>{{ number_format($totalbayaran, 2, '.', ',') }}</b></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                        </tr>
+                    </tfoot>
+                </table>
+            <div class="modal-footer" style="margin-top:2%;">
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    //Enable tooltips everywhere
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    
+    var tablelelong = $('#tablelelong').DataTable( {
+        "columnDefs": [ 
+            {
+            "targets": 0,
+            "orderable": false
+            }, 
+            {
+            "targets": 4,
+            "orderable": false
+            }
+        ],
+        order: [[0, 'asc']],
+        // "ordering": false,
+        "info": false,
+        "lengthChange": false,
+        "pageLength": 15,
+        dom: 'Bfrtip',
+        buttons: [
+                       
+                       {
+                           className: 'btn btn-outline-success pl-4 pr-4 btn-sm  export',
+                           target: "_blank",
+                           titleAttr: 'Export to Excel',
+                           text: '<h8><b>EXCEL</b></h8>',
+                           action: function ( e, dt, node, config ) {
+                               $('#typedonwload').val('excel');
+                               $("#exportpdf").submit();
+                               // window.open("_blank");
+                           }
+                       },
+                       {
+                           className: 'btn btn-outline-danger pl-4 pr-4 btn-sm  export',
+                           titleAttr: 'Export to PDF',
+                           text: '<h8><b>PDF</b></h8>',
+                           action: function ( e, dt, node, config ) {
+                               $('#typedonwload').val('pdf');
+                               $("#exportpdf").submit();
+                           }
+                       }
+                   ]
+    });
+
+    // $('.addsim').tooltip();
+    // $('.export').tooltip();
+    // // $( '.dt-buttons').addClass('btn-group');
+    // $( '.addsim').removeClass('dt-button');
+    // $( '.export').removeClass('dt-button');
+
+    // function selectall(cb) {
+    //     tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+    //         $(this).prop('checked', cb.checked);
+    //     })
+    // }
+</script>
+     
+@endsection
diff --git a/resources/views/excel/laporanakaundetail_excel.blade.php b/resources/views/excel/laporanakaundetail_excel.blade.php
index bbd357fc..a6d5d23a 100644
--- a/resources/views/excel/laporanakaundetail_excel.blade.php
+++ b/resources/views/excel/laporanakaundetail_excel.blade.php
@@ -74,17 +74,34 @@
                             $totalbayaran = 0;
                         @endphp
                         @forelse($listwinner as $winner)
+                        @if($winner['jenisbayaran']['status_payment_opt'] == 2)
                         @php
-                            $totalbidaan += $winner['totalPay'];
-                            $totalcaj += 1;
-                            $totalbayaran = $totalbidaan + $totalcaj;
+                        $totalbidaan += $winner['totalPay'];
+                        $totalcaj += 1;
+                        $totalbayaran = $totalbidaan + $totalcaj;
                         @endphp
+                        @else
+                        @php
+                        $totalbidaan += $winner['totalPay'];
+                        $totalbayaran = $totalbidaan;
+                        @endphp
+                        @endif
                         <tr>
                             <td>{{ $loop->iteration }}</td>
                             <td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
                             <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
-                            <td>{{ number_format(1, 2, '.', ',') }}</td>
-                            <td>{{ number_format($winner['totalPay']+1, 2, '.', ',') }}</td>
+                            <td>@if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                {{ number_format(1, 2, '.', ',') }}
+                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                {{ number_format(0, 2, '.', ',') }}
+                                @endif
+                            </td>
+                            <td> @if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                 {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                 @endif
+                            </td>
                             <td> @if($winner['jenisbayaran'] != NULL)
                                 {{-- {{ dump($winner['jenisbayaran'])}} --}}
                                      @if($winner['jenisbayaran']['status_payment_opt'] == 1)
diff --git a/resources/views/excel/laporanakaundetailall_excel.blade.php b/resources/views/excel/laporanakaundetailall_excel.blade.php
new file mode 100644
index 00000000..e7957dc8
--- /dev/null
+++ b/resources/views/excel/laporanakaundetailall_excel.blade.php
@@ -0,0 +1,172 @@
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<script src="{{ asset('js/table2excel.js') }}"></script>
+<style>
+
+.letter{
+    font-family:'Times New Roman', Times, serif;
+    
+}
+ 
+.row::after {
+  content: "";
+  clear: both;
+  display: table;
+   
+}
+
+.first-prgph{
+  
+    float: left;
+    width: 10%;
+    padding: 2px;
+}
+.first-prgph1{
+  
+  float: left;
+  width: 30%;
+  padding-left: 50px;
+}
+.page-break {
+    page-break-before: always;
+}
+.name{
+    padding-top: 40px;
+}
+
+</style>
+
+
+<body>
+
+        <div class = "letter"> 
+            <div class="first-prgph1">
+                Batch Lelong: {{$lelong_id}} <br>
+                Tarikh Lelong:  @php 
+                $myDateTime = DateTime::createFromFormat('Y-m-d', $lelonglel->tarikh_lelong);
+                  $datez = $myDateTime->format('d-m-Y');
+                  echo($datez);
+                @endphp
+                {{-- Cawangan: {{ $cawanganDetail->caw_name }} --}}
+            </div>
+            <br>
+        </div>
+
+             
+        <table width="100%" height="168" id="customers">
+            <thead>
+                <tr>
+                    <th>No</th>
+                            <th>Cawangan</th>
+                            <th>Nama Pemenang</th>
+                            <th>Jumlah Bidaan(RM)</th>
+                            <th>Caj(RM)</th>
+                            <th>Jumlah Bayaran(RM)</th>
+                            <th>Jenis Bayaran</th>
+                            <th>Billplz ID</th>
+                            <th>Tarikh/Masa</th>
+                            <th>Status Bayaran</th>
+                </tr>
+            </thead>
+            <tbody>
+            @php
+                            $totalbidaan = 0;
+                            $totalcaj = 0;
+                            $totalbayaran = 0;
+                        @endphp
+                        @forelse($listwinner as $winner)
+                        @if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                        @php
+                        $totalbidaan += $winner['totalPay'];
+                        $totalcaj += 1;
+                        $totalbayaran = $totalbidaan + $totalcaj;
+                        @endphp
+                        @else
+                        @php
+                        $totalbidaan += $winner['totalPay'];
+                        $totalbayaran = $totalbidaan;
+                        @endphp
+                        @endif
+                        <tr>
+                            <td>{{ $loop->iteration }}</td>
+                            <td>{{ $winner['kodcaw'] }}</td>
+                            <td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
+                            <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
+                            <td>@if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                {{ number_format(1, 2, '.', ',') }}
+                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                {{ number_format(0, 2, '.', ',') }}
+                                @endif
+                            </td>
+                            <td> @if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                 {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                 @endif
+                            </td>
+                            <td> @if($winner['jenisbayaran'] != NULL)
+                                {{-- {{ dump($winner['jenisbayaran'])}} --}}
+                                     @if($winner['jenisbayaran']['status_payment_opt'] == 1)
+                                     TUNAI
+                                     @elseif($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                     FPX
+                                     @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                     KAUNTER BANK/CDM
+                                     
+                                     @endif
+                                 @else
+                                     -
+                                 @endif
+                            </td>
+                            <td>{{ $winner['billplz_id']}}</td>
+                            <td>{{ $winner['paid_at']}}</td>
+                            <td> @if($winner['jenisbayaran'] != NULL)
+                                @if($winner['jenisbayaran']['disahkan_oleh'] != NULL)
+                                    SELESAI
+                                @elseif($winner['jenisbayaran']['disahkan_oleh'] == NULL)
+                                    TUNGGU PENGESAHAN
+                                @else 
+                                    BELUM SELESAI
+                                @endif
+                                @else 
+                                BELUM SELESAI
+                                @endif
+                            </td>
+                        </tr>
+                        @empty
+                        <tr>
+                            <td colspan="9">No Data</td>
+                        </tr>
+                @endforelse
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td colspan="3" align="center"><b>JUMLAH KESELURUHAN</b></td>
+                    <td><b>{{ number_format($totalbidaan, 2, '.', ',') }}</b></td>
+                    <td><b>{{ number_format($totalcaj, 2, '.', ',') }}</b></td>
+                    <td><b>{{ number_format($totalbayaran, 2, '.', ',') }}</b></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                </tr>
+            </tfoot>
+        </table>
+            </div>
+
+
+</body>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script>
+
+    $(document).ready(function () {
+        
+        var table2excel = new Table2Excel();
+        table2excel.export(document.querySelectorAll("#customers"),'senarai_notis');
+        setTimeout(function(){ window.close() }, 10);
+        
+        
+      });
+      
+    </script>
+    
\ No newline at end of file
diff --git a/resources/views/pdf/laporanakaundetailallpdf.blade.php b/resources/views/pdf/laporanakaundetailallpdf.blade.php
new file mode 100644
index 00000000..8c6e282e
--- /dev/null
+++ b/resources/views/pdf/laporanakaundetailallpdf.blade.php
@@ -0,0 +1,276 @@
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<style>
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
+  
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr {
+    border-bottom: 1px black;
+  }
+  #sim th {
+    border: 1px black;
+    text-align: center;
+  }
+  
+  #sim2 th {
+      text-align: center;
+      border: 0px solid ;
+      table-layout:auto;
+      color: black;
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 0px solid #ddd;
+  }
+  
+  td {
+    /* text-align: right; */
+    padding: 16px;
+    border: 1px solid;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+  }
+  
+  tr:nth-child(even) {
+    
+  }
+
+  .font{
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:12px;
+  }
+
+</style>
+
+<style>
+  /** Define now the real margins of every page in the PDF **/
+  body {
+      margin-top: 1cm;
+      /* margin-left: 2cm; */
+      /* margin-right: 2cm; */
+      margin-bottom: 2cm;
+  }
+  
+  /** Define the header rules **/
+  header {
+      position: fixed;
+      top: -1cm;
+      left: 0cm;
+      right: 0cm;
+      height: 0cm;
+      /** Extra personal styles **/
+      /* background-color: #eaeaea; */
+      color: black;
+      text-align: center;
+      line-height: 1.5cm;
+  }
+  
+  /** Define the footer rules **/
+  footer {
+      position: fixed;
+      bottom: 0cm;
+      left: 0cm;
+      right: 0cm;
+      height: 2cm;
+  
+      /** Extra personal styles **/
+      /* background-color: #eaeaea; */
+      color: black;
+      text-align: center;
+      line-height: 1.5cm;
+  }
+  footer .pagenum:before {
+      content: counter(page);
+  }
+
+  .font{
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:12px;
+  }
+
+  </style>
+  
+{{--   
+  <div>
+
+                               <div class="first-prgph1">
+                                 <h5> {{$caw['caw_name']}}<br>
+                                     {{$caw['alamat1']}}<br>
+                                     {{$caw['alamat2']}}<br>
+                                     No Tel: {{$caw['notel']}}<br>
+                                     No Faks: {{$caw['nofaks']}}
+                                 </h5>
+                             </div> 
+                             </div>--}}
+                             <body>
+                             <header>
+                              <div class="font"><u><b><h5>LAPORAN BAYARAN ONLINE LELONGAN KESELURUHAN</h5></b></u></div>
+                              </header>
+
+                              <div class="font"> 
+                                {{-- Cawangan: {{ $cawanganDetail->caw_name }} <br>     --}}
+                                Batch Lelong: {{$lelong_id}} <br>
+                                Tarikh Lelong:  @php 
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $lelonglel->tarikh_lelong);
+                                  $datez = $myDateTime->format('d-m-Y');
+                                  echo($datez);
+                              @endphp</div><br>
+                             
+                           
+                
+                            <table  cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">                        
+                                <thead>
+                                <tr> 
+                                  <th>No</th>
+                                  <th>Cawangan</th>
+                                  <th>Nama Pemenang</th>
+                                  <th>Jumlah Bidaan(RM)</th>
+                                  <th>Caj(RM)</th>
+                                  <th>Jumlah Bayaran(RM)</th>
+                                  <th>Jenis Bayaran</th>
+                                  <th>Billplz ID</th>
+                                  <th>Tarikh/Masa</th>
+                                  <th>Status Bayaran</th>                                     
+        
+                                </tr>
+                                </thead>
+                                <tbody>
+                                  @php
+                                                  $totalbidaan = 0;
+                                                  $totalcaj = 0;
+                                                  $totalbayaran = 0;
+                                              @endphp
+                                              @forelse($listwinner as $winner)
+                                              @if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                              @php
+                                              $totalbidaan += $winner['totalPay'];
+                                              $totalcaj += 1;
+                                              $totalbayaran = $totalbidaan + $totalcaj;
+                                              @endphp
+                                              @else
+                                              @php
+                                              $totalbidaan += $winner['totalPay'];
+                                              $totalbayaran = $totalbidaan;
+                                              @endphp
+                                              @endif
+                                              <tr>
+                                                  <td>{{ $loop->iteration }}</td>
+                                                  <td>{{ $winner['kodcaw'] }}</td>
+                                                  <td align = 'left' style='white-space:nowrap;text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
+                                                  <td align = 'right'>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
+                                                  <td align="right">@if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                                    {{ number_format(1, 2, '.', ',') }}
+                                                    @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                                    {{ number_format(0, 2, '.', ',') }}
+                                                    @endif
+                                                  </td>
+                                                  <td align="right"> @if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                                      {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+                                                      @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                                      {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                                      @endif
+                                                  </td>
+                                                  <td align = 'center'> @if($winner['jenisbayaran'] != NULL)
+                                                      {{-- {{ dump($winner['jenisbayaran'])}} --}}
+                                                           @if($winner['jenisbayaran']['status_payment_opt'] == 1)
+                                                           TUNAI
+                                                           @elseif($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                                           FPX
+                                                           @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                                           KAUNTER BANK/CDM
+                                                           
+                                                           @endif
+                                                       @else
+                                                           -
+                                                       @endif
+                                                  </td>
+                                                  <td align = 'center'>{{ $winner['billplz_id']}}</td>
+                                                  <td>{{ $winner['paid_at']}}</td>
+                                                  <td align = 'center'> @if($winner['jenisbayaran'] != NULL)
+                                                      @if($winner['jenisbayaran']['disahkan_oleh'] != NULL)
+                                                          SELESAI
+                                                      @elseif($winner['jenisbayaran']['disahkan_oleh'] == NULL)
+                                                          TUNGGU PENGESAHAN
+                                                      @else 
+                                                          BELUM SELESAI
+                                                      @endif
+                                                      @else 
+                                                      BELUM SELESAI
+                                                      @endif
+                                                  </td>
+                                              </tr>
+                                              @empty
+                                              <tr>
+                                                  <td colspan="8">No Data</td>
+                                              </tr>
+                                      @endforelse
+                                  </tbody>
+                                  <tfoot>
+                                      <tr>
+                                          <td colspan="3" align="center"><b>JUMLAH KESELURUHAN</b></td>
+                                          <td align = 'right'><b>{{ number_format($totalbidaan, 2, '.', ',') }}</b></td>
+                                          <td align = 'right'><b>{{ number_format($totalcaj, 2, '.', ',') }}</b></td>
+                                          <td align = 'right'><b>{{ number_format($totalbayaran, 2, '.', ',') }}</b></td>
+                                          <td></td>
+                                          <td></td>
+                                          <td></td>
+                                          <td></td>
+                                      </tr>
+                                  </tfoot>
+                        </table>
+  
+                        </div>
+  
+                              
+                              
+                       
+                             
+                            </tbody>
+                          </table>
+                             </body>
+                         
+    
+                      
+    
+                      
\ No newline at end of file
diff --git a/resources/views/pdf/laporanakaundetailpdf.blade.php b/resources/views/pdf/laporanakaundetailpdf.blade.php
index 1e098a0b..c9e9af89 100644
--- a/resources/views/pdf/laporanakaundetailpdf.blade.php
+++ b/resources/views/pdf/laporanakaundetailpdf.blade.php
@@ -181,17 +181,34 @@
                                                   $totalbayaran = 0;
                                               @endphp
                                               @forelse($listwinner as $winner)
+                                              @if($winner['jenisbayaran']['status_payment_opt'] == 2)
                                               @php
-                                                  $totalbidaan += $winner['totalPay'];
-                                                  $totalcaj += 1;
-                                                  $totalbayaran = $totalbidaan + $totalcaj;
+                                              $totalbidaan += $winner['totalPay'];
+                                              $totalcaj += 1;
+                                              $totalbayaran = $totalbidaan + $totalcaj;
                                               @endphp
+                                              @else
+                                              @php
+                                              $totalbidaan += $winner['totalPay'];
+                                              $totalbayaran = $totalbidaan;
+                                              @endphp
+                                              @endif
                                               <tr>
                                                   <td>{{ $loop->iteration }}</td>
                                                   <td align = 'left' style='white-space:nowrap;text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
                                                   <td align = 'right'>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
-                                                  <td align = 'right'>{{ number_format(1, 2, '.', ',') }}</td>
-                                                  <td align = 'right'>{{ number_format($winner['totalPay']+1, 2, '.', ',') }}</td>
+                                                  <td align="right">@if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                                    {{ number_format(1, 2, '.', ',') }}
+                                                    @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                                    {{ number_format(0, 2, '.', ',') }}
+                                                    @endif
+                                                  </td>
+                                                  <td align="right"> @if($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                                      {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+                                                      @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                                      {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                                      @endif
+                                                  </td>
                                                   <td align = 'center'> @if($winner['jenisbayaran'] != NULL)
                                                       {{-- {{ dump($winner['jenisbayaran'])}} --}}
                                                            @if($winner['jenisbayaran']['status_payment_opt'] == 1)
diff --git a/routes/web.php b/routes/web.php
index ff50fc44..714a82b8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -455,7 +455,8 @@ Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'accoun
     Route::get('/laporanakaun',['as'=>'account.laporanakaun','uses'=>'AccountController@laporanakaun']);
     Route::get('/laporanakaundetail/{lelong_id}/{kodcaw}',['as'=>'account.laporanakaundetail','uses'=>'AccountController@laporanakaundetail']);
     Route::post('/laporanakaundetailexport',['as'=>'account.laporanakaundetailexport','uses'=>'AccountController@laporanakaundetailexport']);
-
+    Route::get('/laporanakaundetailall/{lelong_id}',['as'=>'account.laporanakaundetailall','uses'=>'AccountController@laporanakaundetailall']);
+    Route::post('/laporanakaundetailallexport',['as'=>'account.laporanakaundetailallexport','uses'=>'AccountController@laporanakaundetailallexport']);
 });
 
 // Pengurus Cawangan