KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update sorting selesai lelong dan space RM

Browse Source
This commit is contained in:
Nur Izzati Zulkifli
2023-03-05 11:27:02 +08:00
parent e00d3188d6
commit 0ce50db634
11 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PembidaController.php
+2 -2
View File
@@ -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) {
resources/views/account/listbayaranonlinesah.blade.php
+1 -1
View File
@@ -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>
resources/views/excel/laporanakaundetailall_excel.blade.php
+3 -3
View File
@@ -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>
resources/views/home/listbayaranonline.blade.php
+2 -2
View File
@@ -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>
resources/views/lelong/lapbrglelpembida.blade.php
+3 -3
View File
@@ -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>
resources/views/pdf/laporanbrglelpembidacaw.blade.php
+2 -2
View File
@@ -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>
resources/views/pdf/laporannamapembidacaw.blade.php
+2 -2
View File
@@ -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>
resources/views/pdf/pdflapbrglelpembida.blade.php
+3 -3
View File
@@ -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>
resources/views/pembayaran/kaunterpembayaran.blade.php
+1 -1
View File
@@ -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>
resources/views/pembida/statuspembayaran2.blade.php
+6 -4
View File
@@ -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)
resources/views/pembida/statusserahanbidaan.blade.php
+4 -4
View File
@@ -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