diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index f66a28ac..cc1ada11 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -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); + // } + // } diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php index a5e2a47e..df8f2d75 100644 --- a/app/Http/Controllers/SerahanController.php +++ b/app/Http/Controllers/SerahanController.php @@ -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);