diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index bcd8630a..9e6238ab 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -381,17 +381,16 @@ class PembidaController extends Controller //$userdetail = User::where('id', $user_id)->first(); - $infos = LelongBid::join('cawangan_lelong','lelongbid.lelong_id','=','cawangan_lelong.lelong_id') - ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + $infos = LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') ->join('lelong','lelong.id','=','lelongbid.lelong_id') ->select ('lelongbid.kodcaw','lelongbid.caw_id','lelongbidder.user_id','lelongbidder.nama_bidder','lelongbidder.hargabida','lelongbid.norujukan','lelongbid.hargaasas','lelongbidder.masa_bidaan','lelongbid.t_lelong','lelongbid.id','lelongbid.fasa','lelongbid.lelong_id') ->where('lelongbid.lelong_id', $request->lelong_id) ->where('lelongbid.kodcaw', $request->kodcaw) ->where('lelongbid.status_jual', 1) + ->where('lelongbidder.status_bidder', 1) ->where(function($query){ $query->whereNull('lelongbidder.status_payment') - ->orWhere('lelongbidder.status_payment',2) - ->where('lelongbidder.status_bidder', 1); + ->orWhere('lelongbidder.status_payment',2); }) ->get(); // dd($infos);