From e9ecef432842d53b2de02a0483a365bc1c8f02d6 Mon Sep 17 00:00:00 2001 From: Amir Date: Mon, 5 Dec 2022 01:00:21 +0800 Subject: [PATCH] Fix bid record, read lelong current date --- .../Mobile/LelongMobileController.php | 60 ++++++++++--------- config/database.php | 14 ++--- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 351f24b9..0b23095b 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -184,41 +184,45 @@ class LelongMobileController extends Controller return response()->json($lelongbidder); } - public function bidRecordByCawangan($userId, Request $request) + public function bidRecordByCawangan($userId) { - $groupCawangan = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - ->join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') - ->where('user_id', '=', $userId) - ->where('lelong_id', $request->lelongId) - ->select('caw_id', 'caw_name') - ->groupBy('caw_id') - ->get()->toArray(); + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateString(); + $lelong = Lelong::where('tarikh_lelong', '=', $currentdate)->select('id')->first(); - foreach ($groupCawangan as $index => $cawangan) { - - $lelongBidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - ->where('user_id', $userId) - ->where('caw_id', $cawangan) - ->where('lelong_id', $request->lelongId) + if ($lelong) { + $groupCawangan = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') + ->where('user_id', '=', $userId) + ->where('lelong_id', $lelong->id) + ->select('caw_id', 'caw_name') + ->groupBy('caw_id') ->get()->toArray(); - $total_hargabida = 0; - $total_berat = 0; - foreach ($lelongBidder as $index1 => $data) { - $fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->get(); - $lelongBidder[$index1]['filemarhun'] = $fileMarhun; + foreach ($groupCawangan as $index => $cawangan) { - $total_hargabida += $data['hargabida']; - $total_berat += $data['berat']; - $marhun = LelongBidMarhun::where('lelongbid_id', '=', $data['id'])->get()->toArray(); - $lelongBidder[$index1]['lelongbidmarhun'] = $marhun; + $lelongBidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('user_id', $userId) + ->where('caw_id', $cawangan) + ->where('lelong_id', $lelong->id) + ->get()->toArray(); + + $total_hargabida = 0; + $total_berat = 0; + foreach ($lelongBidder as $index1 => $data) { + $fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->get(); + $lelongBidder[$index1]['filemarhun'] = $fileMarhun; + + $total_hargabida += $data['hargabida']; + $total_berat += $data['berat']; + $marhun = LelongBidMarhun::where('lelongbid_id', '=', $data['id'])->get()->toArray(); + $lelongBidder[$index1]['lelongbidmarhun'] = $marhun; + } + $groupCawangan[$index]['total_berat'] = number_format((float)$total_berat, 2, '.', ''); + $groupCawangan[$index]['total_bidaan'] = number_format((float)$total_hargabida, 2, '.', ''); + $groupCawangan[$index]['lelongbid'] = $lelongBidder; } - $groupCawangan[$index]['total_berat'] = number_format((float)$total_berat, 2, '.', ''); - $groupCawangan[$index]['total_bidaan'] = number_format((float)$total_hargabida, 2, '.', ''); - $groupCawangan[$index]['lelongbid'] = $lelongBidder; - } - if ($groupCawangan) { return response()->json([ 'success' => true, 'lelongbidder' => $groupCawangan diff --git a/config/database.php b/config/database.php index 4d0f0e9d..606cacd1 100644 --- a/config/database.php +++ b/config/database.php @@ -62,13 +62,13 @@ return [ PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), ]) : [], 'modes' => [ - //'ONLY_FULL_GROUP_BY', // Disable this to allow grouping by one column - 'STRICT_TRANS_TABLES', - 'NO_ZERO_IN_DATE', - 'NO_ZERO_DATE', - 'ERROR_FOR_DIVISION_BY_ZERO', - 'NO_AUTO_CREATE_USER', - 'NO_ENGINE_SUBSTITUTION' + // //'ONLY_FULL_GROUP_BY', // Disable this to allow grouping by one column + // 'STRICT_TRANS_TABLES', + // 'NO_ZERO_IN_DATE', + // 'NO_ZERO_DATE', + // 'ERROR_FOR_DIVISION_BY_ZERO', + // 'NO_AUTO_CREATE_USER', + // 'NO_ENGINE_SUBSTITUTION' ], ],