Merge branch 'faiqahzaman' into azfar_dev

This commit is contained in:
Azfar Arsyad
2022-02-24 14:30:58 +08:00
9 changed files with 174 additions and 30 deletions
+38 -15
View File
@@ -471,22 +471,27 @@ class LelongController extends Controller
$updatebid->save();
$previous_siri = Resit::orderBy('id','desc')->first();
if($previous_siri){
$nosiri = $previous_siri->id + 1;
}else{
$nosiri = 1;
$checkdata = Resit::where('user_id', $bidder->user_id)
->where('lelong_id', $id)
->first();
if(!$checkdata){
if($previous_siri){
$nosiri = $previous_siri->id + 1;
}else{
$nosiri = 1;
}
$reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);;
$resit = new Resit;
$resit->user_id = $bidder->user_id;
$resit->lelong_id = $id;
$resit->reference_no = $reference_no;
$resit->billplz_id = '';
$resit->total_payment = '';
$resit->resit_type = 2; // 1 = fee , 2 = bid
$resit->save();
}
$reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);
$resit = new Resit;
$resit->user_id = $bidder->user_id;
$resit->lelongbid_id = $bid->id;
$resit->reference_no = $reference_no;
$resit->billplz_id = '';
$resit->total_payment = $bidder->hargabida;
$resit->resit_type = 2; // 1 = fee , 2 = bid
$resit->save();
}
else
{
@@ -604,6 +609,24 @@ class LelongController extends Controller
return view('lelong.lelongtaklaku',compact('lelongtaklaku'));
}
public function senaraipemenang($lelong_id){
$listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->select('lelongbidder.user_id'
)
->groupBy('lelongbidder.user_id')
->get()->toArray();
$senaraiwinner = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbid.lelong_id', $lelong_id)
->get();
return view('lelong.senaraipemenang',compact('senaraiwinner','lelong_id'));
}
public function senaraimarhun($lelongid, $cawid){
// $marhun = LelongBid::->get();
+14 -8
View File
@@ -121,6 +121,10 @@ class PaymentController extends Controller
$bid_id = explode(",", $request->eachbid);
$resit = Resit::where('lelong_id', $lelong_id)
->first();
$total_hargabida = 0;
foreach($bid_id as $bid){
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -130,20 +134,17 @@ class PaymentController extends Controller
'lelongbid.hargaasas',
'lelongbid.norujukan',
'lelongbidder.lelongbid_id',
'lelongbidder.id as lelongbidder_id'
'lelongbidder.id as lelongbidder_id',
'lelongbid.lelong_id as lelong_id'
)
->first();
$resit = Resit::where('lelongbid_id', $eachbid->lelongbid_id)
->first();
$resit->status = 'PAID';
$resit->paid_at = $currentdate;
$resit->update();
$total_hargabida = $total_hargabida + $eachbid->hargabida;
$payment = Payment::create([
'user_id' => $request->user_id,
'lelongbidder_id' => $eachbid->lelongbidder_id,
'lelongbid_id' => $bid,
'lelong_id' => $eachbid->lelong_id,
'kodcaw' => $user->kodcaw,
'status_payment_opt' => 1,
'status' => 2,
@@ -175,7 +176,12 @@ class PaymentController extends Controller
$eachbid->update();
}
if($request->amaunkiraan == $total_hargabida){
$resit->total_payment = $total_hargabida;
$resit->status = 'PAID';
$resit->paid_at = $currentdate;
$resit->update();
}
return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya');
}