From 0ce50db6340345a54f0f0aa5882211e861b7f155 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Sun, 5 Mar 2023 11:27:02 +0800
Subject: [PATCH] update sorting selesai lelong dan space RM

---
 app/Http/Controllers/PembidaController.php             |  4 ++--
 resources/views/account/listbayaranonlinesah.blade.php |  2 +-
 .../views/excel/laporanakaundetailall_excel.blade.php  |  6 +++---
 resources/views/home/listbayaranonline.blade.php       |  4 ++--
 resources/views/lelong/lapbrglelpembida.blade.php      |  6 +++---
 resources/views/pdf/laporanbrglelpembidacaw.blade.php  |  4 ++--
 resources/views/pdf/laporannamapembidacaw.blade.php    |  4 ++--
 resources/views/pdf/pdflapbrglelpembida.blade.php      |  6 +++---
 resources/views/pembayaran/kaunterpembayaran.blade.php |  2 +-
 resources/views/pembida/statuspembayaran2.blade.php    | 10 ++++++----
 resources/views/pembida/statusserahanbidaan.blade.php  |  8 ++++----
 11 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php
index 8a555625..d52abedd 100644
--- a/app/Http/Controllers/PembidaController.php
+++ b/app/Http/Controllers/PembidaController.php
@@ -960,8 +960,8 @@ class PembidaController extends Controller
             'lelongBidJual:lelong_id,id,norujukan,caw_id,kodcaw',
             'lelongBidJual.lelongBidderMenang:lelongbid_id,user_id,nama_bidder,hargabida,status_payment',
             'lelongBidJual.lelongBidderMenang.payment:lelongbid_id,user_id,status_payment_opt',
-            'lelongBidJual.lelongBidderMenang.payment.user:id,name',
-        )->select('id', 'tarikh_lelong')->where('sts_lelong', 3)->get();
+            'lelongBidJual.lelongBidderMenang.payment.user:id,name'
+        )->select('id', 'tarikh_lelong')->where('sts_lelong', 3)->orderBy('id', 'DESC')->get();
 
         $lelong_array = [];
         foreach ($lelong_all as $lelong) {
diff --git a/resources/views/account/listbayaranonlinesah.blade.php b/resources/views/account/listbayaranonlinesah.blade.php
index ec99f2e1..be544169 100644
--- a/resources/views/account/listbayaranonlinesah.blade.php
+++ b/resources/views/account/listbayaranonlinesah.blade.php
@@ -29,7 +29,7 @@
                         <th>No Kad Pengenalan</th>
                         <th>No Telefon</th>
                         <th>Bilangan Surat</th>
-                        <th>Jumlah Pembayaran(RM)</th>
+                        <th>Jumlah Pembayaran (RM)</th>
                         {{-- <th>Jumlah Bidaan(RM)</th> --}}
                         <th class="text-center">Disahkan Oleh</th>
                     </tr>
diff --git a/resources/views/excel/laporanakaundetailall_excel.blade.php b/resources/views/excel/laporanakaundetailall_excel.blade.php
index 38f654ee..7480a83c 100644
--- a/resources/views/excel/laporanakaundetailall_excel.blade.php
+++ b/resources/views/excel/laporanakaundetailall_excel.blade.php
@@ -59,9 +59,9 @@
                     <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>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>
diff --git a/resources/views/home/listbayaranonline.blade.php b/resources/views/home/listbayaranonline.blade.php
index 23761e48..944844f3 100644
--- a/resources/views/home/listbayaranonline.blade.php
+++ b/resources/views/home/listbayaranonline.blade.php
@@ -23,8 +23,8 @@
                         <th>No Kad Pengenalan</th>
                         <th>No Telefon</th>
                         <th>Bilangan Surat</th>
-                        <th>Jumlah Pembayaran(RM)</th>
-                        <th>Jumlah Bidaan(RM)</th>
+                        <th>Jumlah Pembayaran (RM)</th>
+                        <th>Jumlah Bidaan (RM)</th>
                         <th class="text-center">Tindakan</th>
                     </tr>
             </thead>
diff --git a/resources/views/lelong/lapbrglelpembida.blade.php b/resources/views/lelong/lapbrglelpembida.blade.php
index a0a8269a..fac684cb 100644
--- a/resources/views/lelong/lapbrglelpembida.blade.php
+++ b/resources/views/lelong/lapbrglelpembida.blade.php
@@ -27,9 +27,9 @@
                         <th>Bil</th>
                         <th>No Rujukan</th>
                         <th>Marhun</th>
-                        <th>Berat(gm)</th>
-                        <th>Harga Asas(RM)</th>
-                        <th>Harga Lelong(RM)</th>
+                        <th>Berat (gm)</th>
+                        <th>Harga Asas (RM)</th>
+                        <th>Harga Lelong (RM)</th>
                         <th>Nama Pembeli</th>
                    
                     </tr>
diff --git a/resources/views/pdf/laporanbrglelpembidacaw.blade.php b/resources/views/pdf/laporanbrglelpembidacaw.blade.php
index 8747be39..619aa361 100644
--- a/resources/views/pdf/laporanbrglelpembidacaw.blade.php
+++ b/resources/views/pdf/laporanbrglelpembidacaw.blade.php
@@ -162,8 +162,8 @@ tr:nth-child(even) {
                             <th>No Rujukan</th>
                             <th>Marhun</th>
                             <th>Berat(gm)</th>
-                            <th>Harga Asas(RM)</th>
-                            <th>Harga Lelong(RM)</th>
+                            <th>Harga Asas (RM)</th>
+                            <th>Harga Lelong (RM)</th>
                             <th>Nama Pembeli</th>
                         </tr>
                         </thead>
diff --git a/resources/views/pdf/laporannamapembidacaw.blade.php b/resources/views/pdf/laporannamapembidacaw.blade.php
index 6700e15c..98ab6464 100644
--- a/resources/views/pdf/laporannamapembidacaw.blade.php
+++ b/resources/views/pdf/laporannamapembidacaw.blade.php
@@ -161,9 +161,9 @@ tr:nth-child(even) {
                         <tr> 
                             <th width="5%" align="left">No</th> 
                             <th width="12%" align="left">No Rujukan</th> 
-                            <th width="12%" align="right">Harga Asas(RM)</th>
+                            <th width="12%" align="right">Harga Asas (RM)</th>
                             <th width="12%" align="left">Nama Pembida</th> 
-                            <th width="15%" align="right">Harga Bidaan(RM)</th> 
+                            <th width="15%" align="right">Harga Bidaan (RM)</th> 
                             <th width="12%" align="left">Masa Bidaan</th>
                         </tr>
                         </thead>
diff --git a/resources/views/pdf/pdflapbrglelpembida.blade.php b/resources/views/pdf/pdflapbrglelpembida.blade.php
index b011574a..54899d04 100644
--- a/resources/views/pdf/pdflapbrglelpembida.blade.php
+++ b/resources/views/pdf/pdflapbrglelpembida.blade.php
@@ -154,9 +154,9 @@ tr:nth-child(even) {
                             <th>No</th>
                             <th>No Rujukan</th>
                             <th>Marhun</th>
-                            <th>Berat(gm)</th>
-                            <th>Harga Asas(RM)</th>
-                            <th>Harga Lelong(RM)</th>
+                            <th>Berat (gm)</th>
+                            <th>Harga Asas (RM)</th>
+                            <th>Harga Lelong (RM)</th>
                             <th>Nama Pembeli</th>
                         </tr>
                         </thead>
diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php
index d679781a..fb4faa13 100644
--- a/resources/views/pembayaran/kaunterpembayaran.blade.php
+++ b/resources/views/pembayaran/kaunterpembayaran.blade.php
@@ -138,7 +138,7 @@
                                     <th>No</th>
                                     <th>Kaedah Bayaran</th>
                                     <th>Bilangan SAG</th>
-                                    <th>Jumlah Bidaan</th>
+                                    <th>Jumlah Bayaran (RM)</th>
                                 </tr>
                             </thead>
                             <tbody>
diff --git a/resources/views/pembida/statuspembayaran2.blade.php b/resources/views/pembida/statuspembayaran2.blade.php
index 9a230e30..03e48f72 100644
--- a/resources/views/pembida/statuspembayaran2.blade.php
+++ b/resources/views/pembida/statuspembayaran2.blade.php
@@ -31,7 +31,7 @@
                     </ul>
                     <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">
-                            @if($lelong_array_semasa != null)
+                            {{-- @if($lelong_array_semasa != null) --}}
                             <table class="table table-bordered" style="width:100%">
                                 <thead class="bg-primary text-white">
                                     <tr>
@@ -42,7 +42,7 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    @foreach($lelong_array_semasa as $lelong)
+                                    @forelse($lelong_array_semasa as $lelong)
                                     <tr>
                                         <td class="text-center">{{ $loop->iteration }}</td>
                                         <td class="text-center">{{ $lelong['lelong_id'] }}</td>
@@ -102,10 +102,12 @@
                                             @endforeach
                                         </td>
                                     </tr>
-                                    @endforeach
+                                    @empty
+                                    <td colspan="4" align="center">No data available in table</td>
+                                    @endforelse 
                                 </tbody>
                             </table>
-                            @endif
+                            {{-- @endif --}}
                         </div>
                         <div class="tab-pane fade" id="selesai-lelong" role="tabpanel" aria-labelledby="selesai-lelong-tab">
                             @if($lelong_array_selesai != null)
diff --git a/resources/views/pembida/statusserahanbidaan.blade.php b/resources/views/pembida/statusserahanbidaan.blade.php
index 7c95e1cb..c19e8dce 100644
--- a/resources/views/pembida/statusserahanbidaan.blade.php
+++ b/resources/views/pembida/statusserahanbidaan.blade.php
@@ -72,7 +72,7 @@
                     <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> 
@@ -119,7 +119,7 @@
                                 @elseif($winner['jenisbayaran']['status_payment_opt'] == 2)
                                 FPX
                                 @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
-                                KAUNTER BANK/CDM
+                                CDM
                                 
                                 @endif
                             @else
@@ -224,7 +224,7 @@
                     <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> 
@@ -271,7 +271,7 @@
                                 @elseif($winner['jenisbayaran']['status_payment_opt'] == 2)
                                 FPX
                                 @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
-                                KAUNTER BANK/CDM
+                                CDM
                                 
                                 @endif
                             @else