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

Merge branch 'atie' into 'main'

Browse Source 
update page akaun part paparan nama cawangan

See merge request online-sistem1/lelong!428
This commit is contained in:
Nur Izzati Zulkifli
2023-03-28 02:09:20 +00:00
parent 4447bff7d7 7ba8092d90
commit 044ff5358f
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();