diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 96b7d5f5..b38de9b3 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -28,6 +28,7 @@ use App\Models\LelongBid; use App\Models\LelongBidMarhun; use App\Models\LelKarat; use App\Models\LelKarat_temp; +use App\Models\LelongBidder; use App\Models\Resit; use App\Models\Payment; @@ -409,7 +410,6 @@ class ApiController extends Controller $selectedSag = $request->sag; // dd($selectedSag); foreach ($selectedSag as $index) { - // dd($index['kodcaw']); $payment = new Payment; $payment->user_id = $request->user_id; $payment->lelong_id = $request->lelong_id; @@ -482,6 +482,11 @@ class ApiController extends Controller $index->status = 2; //0-unpaid //1-fee //2-bid $index->remark = "BERJAYA BAYARAN ONLINE"; $index->update(); + + $updateTag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->where('lelongbid.norujukan', $index->norujukan)->first(); + $updateTag->status_payment = 1; + $updateTag->update(); } event(new PaymentNotify('PAID', $resit->user_id, $payment)); @@ -566,6 +571,11 @@ class ApiController extends Controller $index->status = 2; //0-unpaid //1-fee //2-bid $index->remark = "BERJAYA BAYARAN ONLINE"; $index->update(); + + $updateTag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->where('lelongbid.norujukan', $index->norujukan)->first(); + $updateTag->status_payment = 1; + $updateTag->update(); } event(new PaymentNotify('PAID', $resit->user_id, $payment)); diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 483e46eb..bb770d2c 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -353,21 +353,98 @@ class LelongMobileController extends Controller ) ->groupBy('lelongbid.kodcaw') ->get(); + // dd($sag->toArray()); $getTarikhLelong = Lelong::where('id', $lelong_id)->select('tarikh_lelong')->first(); $tarikhLelong = $getTarikhLelong->tarikh_lelong; $data = []; foreach ($sag as $index1 => $kodcaw) { - // dd($kodcaw); + // dd($kodcaw->toArray()); $groupBycaw = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') ->where('lelongbid.lelong_id', $lelong_id) - ->where('lelongbidder.user_id', $user_id) - ->where('lelongbidder.status_bidder', 1) - ->whereNull('lelongbidder.status_payment') - ->where('lelongbid.kodcaw', $kodcaw['kodcaw']) - ->get(); + ->where('lelongbidder.user_id', $user_id) + ->where('lelongbidder.status_bidder', 1) + // ->whereNull('lelongbidder.status_payment') + ->where('lelongbid.kodcaw', $kodcaw->kodcaw) + ->select( + 'lelongbidder.id AS id', + 'lelongbid.norujukan AS norujukan', + 'lelongbid.kodcaw AS kodcaw', + 'lelongbidder.hargabida AS total_payment', + 'lelongbid.marhun AS marhun', + 'lelongbidder.status_payment') + ->get(); + + $getCawangan = Cawangan::where('caw_code', $kodcaw->kodcaw) + ->select('caw_name', 'caw_code') + ->first(); + $namaCawangan = $getCawangan->caw_name; + $kodCawangan = $getCawangan->caw_code; + $sag = $groupBycaw; + + $total_hargabida = 0; + foreach ($groupBycaw as $hargabida) { + $totalbida = Lelongbidder::where('id', $hargabida['id']) + ->select('hargabida') + ->first(); + $total_hargabida = $total_hargabida + $totalbida['hargabida']; + } + + array_push($data, [ + 'kodcaw' => $kodCawangan, + 'cawangan' => $namaCawangan, + 'sag' => $sag, + 'total_hargabida' => $total_hargabida + ]); + } + + $response = [ + 'success' => true, + 'tarikh_lelong' => $tarikhLelong, + 'data' => $data + ]; + + return response()->json($response); + + } + + public function bidPayRemaining($user_id, $lelong_id) + { + $sag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbidder.user_id', $user_id) + ->where('lelongbidder.status_bidder', 1) + ->whereNull('lelongbidder.status_payment') + ->select( + 'lelongbid.kodcaw' + ) + ->groupBy('lelongbid.kodcaw') + ->get(); + // dd($sag->toArray()); + $getTarikhLelong = Lelong::where('id', $lelong_id)->select('tarikh_lelong')->first(); + $tarikhLelong = $getTarikhLelong->tarikh_lelong; + + $data = []; + + foreach ($sag as $index1 => $kodcaw) { + // dd($kodcaw->toArray()); + $groupBycaw = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbidder.user_id', $user_id) + ->where('lelongbidder.status_bidder', 1) + ->whereNull('lelongbidder.status_payment') + ->where('lelongbid.kodcaw', $kodcaw->kodcaw) + ->select( + 'lelongbidder.id AS id', + 'lelongbid.norujukan AS norujukan', + 'lelongbid.kodcaw AS kodcaw', + 'lelongbidder.hargabida AS total_payment', + 'lelongbid.marhun AS marhun', + 'lelongbidder.status_payment') + ->get(); + $getCawangan = Cawangan::where('caw_code', $kodcaw->kodcaw) ->select('caw_name', 'caw_code') ->first(); diff --git a/routes/api.php b/routes/api.php index bd138d71..7418c6ed 100644 --- a/routes/api.php +++ b/routes/api.php @@ -59,6 +59,7 @@ Route::group(['middleware' => ['auth:sanctum']], function () { Route::get('/karat', [LelongMobileController::class, 'getListKarat']); Route::get('/result/{user_id}', [LelongMobileController::class, 'bidresult']); Route::get('/bayar/{user_id}/{lelong_id}', [LelongMobileController::class, 'bidresults']); + Route::get('/bayarBaki/{user_id}/{lelong_id}', [LelongMobileController::class, 'bidPayRemaining']); Route::get('/history/{user_id}', [LelongMobileController::class, 'history']); Route::get('/listcawlelongtoday', [LelongMobileController::class, 'listCawLelongToday']); Route::get('/listcawlelongtodaystarted', [LelongMobileController::class, 'listCawLelongTodayStarted']);