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

Merge branch 'nisha' into 'main'

Browse Source 
update function scan barcode serahan pembida

See merge request online-sistem1/lelong!375
This commit is contained in:
Nur Izzati Zulkifli
2023-01-31 07:09:18 +00:00
parent 182cba7039 a76d60b0bd
commit 9bafc12d68
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+18 -12
View File
@@ -2052,12 +2052,14 @@ class MarhunController extends Controller
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$tarikhlelong_semasa = $currentdate;
//$tarikhlelong_semasa = $currentdate;
$tarikhlelong_semasa = date('Y-m-d', strtotime(now()));
$lelongAll = Lelong::with('cawangan')->get();
if($lelong){
foreach ($lelong as $info)
{
$lelong_id = $info['lelong_id'];
@@ -2083,21 +2085,25 @@ class MarhunController extends Controller
->where('cawangan.caw_code', $user->kodcaw)
->get()
->toArray();
array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
}
}
foreach ($arrayinfo as $lelong) {
//array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
if ($info['tarikh_lelong'] == $tarikhlelong_semasa) {
array_push($arraydetails0, $lelong);
}
else
{
array_push($arraydetails1, $lelong);
array_push($arraydetails0, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
} else {
array_push($arraydetails1, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
}
}
}
// foreach ($arrayinfo as $lelong) {
// if ($info['tarikh_lelong'] == $tarikhlelong_semasa) {
// array_push($arraydetails0, $lelong);
// }
// else
// {
// array_push($arraydetails1, $lelong);
// }
// }
app/Http/Controllers/SerahanController.php
+1
View File
@@ -338,6 +338,7 @@ class SerahanController extends Controller
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.kodcaw',$user->kodcaw)
->select('lelongbid.id','lelongbid.norujukan','lelongbid.hargajual')
->orderBy('lelongbid.id')
// ->where('payment.resit_id',$resit_id)
->get();
// dd($SAGWin);