diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php
index abf50f3f..45749819 100644
--- a/app/Http/Controllers/PembidaController.php
+++ b/app/Http/Controllers/PembidaController.php
@@ -830,10 +830,12 @@ class PembidaController extends Controller
     public function statuspembayaran(Request $request)
     {
         $kodcaw = $request->kodcaw;
-        
+        $tarikh_semasa = date('Y-m-d', strtotime(now()));
         
         $sumtotalpayment = 0;
         $arrayinfo = [];
+        $arraysms = [];
+        $arraysls = [];
 
         $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->select('lelong_id','tarikh_lelong','lelong.fasa','harga_emas_asas','jbg','cajlelong','sts_lelong')
@@ -853,7 +855,13 @@ class PembidaController extends Controller
             ->orderBy('lelong_id')
             ->get();
            
-            array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+            // array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+            if($details['tarikh_lelong'] == $tarikh_semasa)
+            {
+                array_push($arraysms, ['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+            } else {
+                array_push($arraysls, ['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+            }
            
             foreach($detailsinfo as $index1=>$cal){
                 $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -904,7 +912,7 @@ class PembidaController extends Controller
         // $sumtotalpayment += $total_payment;
         // dd($sumtotalpayment);
         // dd($arrayinfo);
-        return view('pembida.statuspembayaran',compact('listwinner','lelong','arrayinfo','detailsinfo'));
+        return view('pembida.statuspembayaran',compact('arraysms','arraysls','listwinner','lelong','arrayinfo','detailsinfo'));
     }
 
     public function statuspembayaranbypembida(Request $request)
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 8a533ee0..86891230 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -341,12 +341,12 @@
                                     @endphp</td>
                                     <td class="text-left">
                                         @foreach($lel['detailsinfo'] as $details)
-                                        <a class="btn btn-info btn-sm" 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 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"><b>{{ $details['caw_name']}}</b>
                                         </span><br> 
                                         {{-- {{dd($listwinner)}} --}}
                                             @forelse($details['listwinner'] as $winner)
-                                            <i class="fas fa-caret-right"></i> {{ $winner['details']['name'] }}
+                                            <span style='text-transform: uppercase'><i class="fas fa-caret-right"></i> {{ $winner['details']['name'] }}</span>
                                             <br>
                                             @empty
                                             - <br>
diff --git a/resources/views/pembida/statuspembayaran.blade.php b/resources/views/pembida/statuspembayaran.blade.php
index d7007847..28eaec6b 100644
--- a/resources/views/pembida/statuspembayaran.blade.php
+++ b/resources/views/pembida/statuspembayaran.blade.php
@@ -17,6 +17,18 @@
                     <p>{{ $message }}</p>
                 </div>
         @endif
+        <ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
+            <li class="nav-item">
+                <a class="nav-link active" id="sedang-lelong-tab" data-toggle="tab" href="#sedang-lelong" role="tab" aria-controls="sedang-lelong" aria-selected="false">
+                    Lelongan Semasa
+                </a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" id="selesai-lelong-tab" data-toggle="tab" href="#selesai-lelong" role="tab" aria-controls="selesai-lelong" aria-selected="false">
+                    Lelongan Selesai
+                </a>
+            </li>
+        </ul>
         <div class="mb-3">
             {{-- <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a> --}}
             @hasrole('operasi')
@@ -27,7 +39,10 @@
             @endhasrole
 
         </div>
-        <table class="table table-bordered text-center" id="tablestatuspembayaran" style="width:100%">
+        <div class="tab-content" style="overflow-x: auto;" id="myTabContent">
+            <div class="tab-pane fade show active" id="sedang-lelong" role="tabpanel" aria-labelledby="sedang-lelong-tab">
+                <div style="overflow-x: auto;">
+        <table class="table table-bordered text-center" id="tablestatussedanglelong" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
@@ -41,7 +56,7 @@
                     </tr>
             </thead>
             <tbody>
-                @foreach($arrayinfo as $lel)
+                @foreach($arraysms as $lel)
                 <tr>
                     <td>{{ $loop->iteration }}</td>
                     <td>{{ $lel['detail']['lelong_id']}}</td>
@@ -53,10 +68,11 @@
                     <td class="text-left">
                         @foreach($lel['detailsinfo'] as $details)
                         @hasrole('operasi')
-                        <a class="btn btn-info btn-sm" href=" {{ route('pembida.pembayaranbidaan', ['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 href=" {{ route('pembida.pembayaranbidaan', ['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>
                        @endhasrole
-                        <span class="m-2"><b>{{ $details['caw_name']}}</b>
-                        </span><br> 
+                      <span class="m-2"><b>{{ $details['caw_name']}}</b>
+                       </span>
+                        <br> 
                         {{-- {{dd($listwinner)}} --}}
                             @forelse($details['listwinner'] as $winner)
                             <span style='text-transform: uppercase'><i class="fas fa-caret-right"></i> {{ $winner['details']['name'] }}</<span>
@@ -154,61 +170,190 @@
         </table>
         </div>
     </div>
+
+    <div class="tab-pane fade" id="selesai-lelong" role="tabpanel" aria-labelledby="selesai-lelong-tab">
+        <div style="overflow-x: auto;">
+    <table class="table table-bordered text-center" id="tablestatusselesailelong" style="width:100%">
+        <thead class="bg-primary text-white">
+                <tr>
+                    <th>No</th>
+                    <th>Batch Lelong</th>
+                    <th>Tarikh Lelong</th>
+                    <th>Cawangan</th>
+                    <th>Jumlah Bayaran(RM)</th>
+                    <th>Jenis Bayaran</th>
+                    <th>Status Bayaran</th>
+                    <th>Status Lelong</th>
+                </tr>
+        </thead>
+        <tbody>
+            @foreach($arraysls as $lel)
+            <tr>
+                <td>{{ $loop->iteration }}</td>
+                <td>{{ $lel['detail']['lelong_id']}}</td>
+                <td>@php
+                    $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['detail']['tarikh_lelong'] );
+                    $t_lelong =  $myDateTime->format('d-m-Y');
+                    echo($t_lelong);
+                @endphp</td>
+                <td class="text-left">
+                    @foreach($lel['detailsinfo'] as $details)
+                    @hasrole('operasi')
+                    <a href=" {{ route('pembida.pembayaranbidaan', ['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>
+                   @endhasrole
+                   <span class="m-2"><b>{{ $details['caw_name']}}</b>
+                   </span>
+                    <br> 
+                    {{-- {{dd($listwinner)}} --}}
+                        @forelse($details['listwinner'] as $winner)
+                        <span style='text-transform: uppercase'><i class="fas fa-caret-right"></i> {{ $winner['details']['name'] }}</<span>
+                        <br>
+                        @empty
+                        - <br>
+                        @endforelse
+                     @endforeach
+                     
+                </td>
+              
+                <td class="text-right">
+                    @php $totalall = 0; @endphp
+                    @foreach($lel['detailsinfo'] as $details)
+                    <a href=""></a>
+                    <span class="m-2">
+                    </span><br>
+                        @forelse($details['listwinner'] as $winner)
+                        {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                        @php
+                            $totalall += $winner['totalPay'];
+                        @endphp
+                        <br>
+                        @empty
+                        - <br>
+                        @endforelse                        
+                    @endforeach
+                    {{-- <b>{{number_format($totalall, 2, '.', ',')}}</b> --}}
+                </td>
+               
+                <td class="text-center">
+                    @foreach($lel['detailsinfo'] as $details)
+                    <a href=""></a>
+                    <span class="m-2">
+                    </span><br>
+                    
+                        @forelse($details['listwinner'] as $winner)
+                        @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
+                        <br>
+                        @empty
+                        - <br>
+                        @endforelse     
+                    @endforeach
+                </td>
+                <td class="text-center">
+                    @foreach($lel['detailsinfo'] as $details)
+                    <a href=""></a>
+                    <span class="m-2">
+                    </span><br>
+                        @forelse($details['listwinner'] as $winner)
+                        @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
+                            <br>
+                        @empty
+                        - <br>
+                        @endforelse 
+                    @endforeach
+                </td>
+                <td>
+                    @if($lel['detail']['sts_lelong'] == 3)
+                        <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                    @endif
+                </td>
+                <tr>
+                    <td colspan="4"></td>
+                    <td class="text-right"><b>{{number_format($totalall, 2, '.', ',')}}</b> </td>
+                    <td colspan="3"></td>
+
+    
+                    </tr>
+            </tr>
+            @endforeach
+            
+        </tbody>
+    </table>
+    </div>
+</div>
 </div>
 
 <script>
-     //Enable tooltips everywhere
-     $(function () {
-        $('[data-toggle="tooltip"]').tooltip()
-    })
-    var tablestatuspembayaran = $('#senarailelongonline').DataTable({
-            "columnDefs": [ 
-                {
-                "targets": 0,
-                "orderable": false
-                }, 
-                {
-                "targets": 7,
-                "orderable": false
-                }
-            ],
-            order: [[1, 'asc']],
-            // "ordering": false,
-            "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();
-            //         }
-            //     }
-            // ]
-    });
+    //Enable tooltips everywhere
+    $(function () {
+       $('[data-toggle="tooltip"]').tooltip()
+   })
+   var tablestatussedanglelong = $('#tablestatussedanglelong').DataTable({
+           "columnDefs": [ 
+               {
+               "targets": 0,
+               "orderable": false
+               }, 
+               {
+               "targets": 7,
+               "orderable": false
+               }
+           ],
+           order: [[1, 'asc']],
+           // "ordering": false,
+           "info": false,
+           "lengthChange": false,
+           "pageLength": 15,
+           dom: 'Bfrtip',
+           
+   });
 
-        // $('.addcaw').tooltip();
-        // $('.export').tooltip();
-        // // $( '.dt-buttons').addClass('btn-group');
-        // $( '.addcaw').removeClass('dt-button');
-        // $( '.export').removeClass('dt-button');
+   var tablestatusselesailelong = $('#tablestatusselesailelong').DataTable({
+           "columnDefs": [ 
+               {
+               "targets": 0,
+               "orderable": false
+               }, 
+               {
+               "targets": 7,
+               "orderable": false
+               }
+           ],
+           order: [[1, 'asc']],
+           // "ordering": false,
+           "info": false,
+           "lengthChange": false,
+           "pageLength": 15,
+           dom: 'Bfrtip',
+           
+   });
+
+       // $('.addcaw').tooltip();
+       // $('.export').tooltip();
+       // // $( '.dt-buttons').addClass('btn-group');
+       // $( '.addcaw').removeClass('dt-button');
+       // $( '.export').removeClass('dt-button');
 
 </script>