diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index b28fd7f8..09949849 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -675,10 +675,10 @@ class AccountController extends Controller
         $arraydetails = [];
         
         $laporan= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->join('pengesahan','lelong.id','=','pengesahan.lelong_id')
+        // ->join('pengesahan','lelong.id','=','pengesahan.lelong_id')
         ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
-        ->orderBy('cawangan_lelong.lelong_id')
+        ->orderBy('lelong.tarikh_lelong','DESC')
         ->get()
         ->toArray();
         // dd($laporan);
@@ -689,7 +689,7 @@ class AccountController extends Controller
             $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id', $brg['lelong_id'])
             ->distinct()
-            ->orderBy('lelong_id')
+            ->orderBy('lelong_id','DESC')
             ->get()
             ->toArray();
             array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]);
@@ -762,7 +762,7 @@ class AccountController extends Controller
         $kodcaw = $request->kodcaw;
         $lelonglel = Lelong::with('cawangan')->find($lelong_id);
 
-        $cawanganDetail = $lelonglel->cawangan->where('caw_code', $kodcaw)->first();
+        $cawanganDetail = $lelonglel->cawangan->first();
         // dd($lelonglel->tarikh_lelong);
 
         $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -854,6 +854,7 @@ class AccountController extends Controller
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.lelong_id', $listing['lelong_id'])
             ->get();
+            $cawanganDetail = Cawangan::where('caw_code', $listing['kodcaw'])->first();
 
             foreach($SAGWin as $index2=>$sag)
             {
@@ -876,6 +877,7 @@ class AccountController extends Controller
             $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index]['totalPay'] = $total_payment;
             $listwinner[$index]['jenisbayaran'] = $detailspayment ;
+            $listwinner[$index]['caw_name'] = $cawanganDetail ;
         }
 
         $getpengesahan = Cawangan::first();
@@ -913,6 +915,7 @@ class AccountController extends Controller
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.lelong_id', $listing['lelong_id'])
             ->get();
+            $cawanganDetail = Cawangan::where('caw_code', $listing['kodcaw'])->first();
             foreach($SAGWin as $index2=>$sag)
             {
                 // dd($detailspayment);
@@ -933,6 +936,7 @@ class AccountController extends Controller
             $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index]['totalPay'] = $total_payment;
             $listwinner[$index]['jenisbayaran'] = $detailspayment ;
+            $listwinner[$index]['caw_name'] = $cawanganDetail ;
         }
 
         $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
diff --git a/resources/views/account/laporanakaun.blade.php b/resources/views/account/laporanakaun.blade.php
index a726b19f..2605ef9c 100644
--- a/resources/views/account/laporanakaun.blade.php
+++ b/resources/views/account/laporanakaun.blade.php
@@ -82,7 +82,7 @@
                 "orderable": false
                 }
             ],
-            order: [[1, 'asc']],
+            // order: [[1, 'desc']],
             "info": false,
             "lengthChange": false,
             "pageLength": 15,
diff --git a/resources/views/account/laporanakaundetailall.blade.php b/resources/views/account/laporanakaundetailall.blade.php
index 62c0ab20..1a991920 100644
--- a/resources/views/account/laporanakaundetailall.blade.php
+++ b/resources/views/account/laporanakaundetailall.blade.php
@@ -69,7 +69,7 @@
                             @endif
                         <tr>
                             <td>{{ $loop->iteration }}</td>
-                            <td>{{ $winner['kodcaw'] }}</td>
+                            <td>{{ $winner['caw_name']['caw_name'] }}</td>
                             <td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
                             <td>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
                             <td>@if($winner['jenisbayaran']['status_payment_opt'] == 2)
@@ -91,7 +91,7 @@
                                      @elseif($winner['jenisbayaran']['status_payment_opt'] == 2)
                                      FPX
                                      @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
-                                     KAUNTER BANK/CDM
+                                     CDM
                                      
                                      @endif
                                  @else
@@ -158,7 +158,7 @@
         // "ordering": false,
         "info": false,
         "lengthChange": false,
-        "pageLength": 15,
+        "pageLength": 999,
         dom: 'Bfrtip',
         buttons: [
                        
diff --git a/resources/views/excel/laporanakaundetailall_excel.blade.php b/resources/views/excel/laporanakaundetailall_excel.blade.php
index 7480a83c..729fe39b 100644
--- a/resources/views/excel/laporanakaundetailall_excel.blade.php
+++ b/resources/views/excel/laporanakaundetailall_excel.blade.php
@@ -89,7 +89,7 @@
                         @endif
                         <tr>
                             <td>{{ $loop->iteration }}</td>
-                            <td>{{ $winner['kodcaw'] }}</td>
+                            <td>{{ $winner['caw_name']['caw_name'] }}</td>
                             <td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
                             <td>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
                             <td>@if($winner['jenisbayaran']['status_payment_opt'] == 2)
@@ -111,7 +111,7 @@
                                      @elseif($winner['jenisbayaran']['status_payment_opt'] == 2)
                                      FPX
                                      @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
-                                     KAUNTER BANK/CDM
+                                     CDM
                                      
                                      @endif
                                  @else
diff --git a/resources/views/pdf/laporanakaundetailallpdf.blade.php b/resources/views/pdf/laporanakaundetailallpdf.blade.php
index 3eb26dd4..ef910ea3 100644
--- a/resources/views/pdf/laporanakaundetailallpdf.blade.php
+++ b/resources/views/pdf/laporanakaundetailallpdf.blade.php
@@ -196,8 +196,8 @@
                                               @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>{{ $winner['caw_name']['caw_name'] }}</td>
+                                                  <td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
                                                   <td align = 'right'>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
                                                   <td align="right">@if($winner['jenisbayaran']['status_payment_opt'] == 2)
                                                     {{ number_format(1, 2, '.', ',') }}
@@ -218,7 +218,7 @@
                                                            @elseif($winner['jenisbayaran']['status_payment_opt'] == 2)
                                                            FPX
                                                            @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
-                                                           KAUNTER BANK/CDM
+                                                           CDM
                                                            
                                                            @endif
                                                        @else