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

update page akaun part paparan nama cawangan

Browse Source
This commit is contained in:
Nur Izzati Zulkifli
2023-03-28 09:56:42 +08:00
parent 9855954870
commit 7ba8092d90
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+8 -4
View File
@@ -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();
resources/views/account/laporanakaun.blade.php
+1 -1
View File
@@ -82,7 +82,7 @@
"orderable": false
}
],
order: [[1, 'asc']],
// order: [[1, 'desc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
resources/views/account/laporanakaundetailall.blade.php
+3 -3
View File
@@ -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: [
resources/views/excel/laporanakaundetailall_excel.blade.php
+2 -2
View File
@@ -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
resources/views/pdf/laporanakaundetailallpdf.blade.php
+3 -3
View File
@@ -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