diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 0241fa70..77c9cfbc 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -791,9 +791,11 @@ class LelongController extends Controller public function senaraisagpemenang($user_id, $lelong_id){ + // dd($user_id); $senaraisag = 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) ->get(); return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id')); diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index acb14560..d812c534 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -24,11 +24,9 @@ class PaymentController extends Controller $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) - ->where('sts_lelong', 3) + ->where('lelong.sts_lelong', 3) ->get(); - // dd($senarai); - return view('pembayaran.senarailelongbayaran',compact('senarai')); } @@ -120,6 +118,7 @@ class PaymentController extends Controller } public function paymentdenokaunter(Request $request){ + // dd($request->all()); $currentdate = Carbon::now(); @@ -127,8 +126,9 @@ class PaymentController extends Controller $user = Auth::user(); - $bid_id = explode(",", $request->eachbid); - dd($bid_id); + // $bid_id = implode(",", $request->eachbid); + $bid_id = $request->eachbid; + // dd($bid_id); $resit = Resit::where('lelong_id', $request->lelong_id) ->where('user_id',$request->user_id) @@ -159,24 +159,24 @@ class PaymentController extends Controller 'disahkan_oleh' => $user->id, 'disahkan_pada' => $currentdate ]); - foreach($bid_id as $bid){ + foreach($bid_id as $bid) + { $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('users', 'lelongbidder.user_id', '=', 'users.id') ->where('lelongbidder.lelongbid_id', $bid) ->select('lelongbidder.hargabida', - 'lelongbid.hargaasas', - 'lelongbid.norujukan', - 'lelongbidder.lelongbid_id', - 'lelongbidder.id as lelongbidder_id', - 'lelongbid.lelong_id as lelong_id' - ) + 'lelongbid.hargaasas', + 'lelongbid.norujukan', + 'lelongbidder.lelongbid_id', + 'lelongbidder.id as lelongbidder_id', + 'lelongbid.lelong_id as lelong_id' + ) ->first(); $total_hargabida = $total_hargabida + $eachbid->hargabida; // dd($total_hargabida); - $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id) ->where('user_id',$request->user_id) ->first(); @@ -192,14 +192,15 @@ class PaymentController extends Controller $eachbidupdate->save(); } + $senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') ->where('lelongbid.lelong_id', $request->lelong_id) ->where('lelongbidder.user_id', $request->user_id) ->where('lelongbidder.status_bidder', 1) ->get(); - // dd(floatval($request->amaunkiraan)); - if(floatval($request->amaunkiraan) == $total_hargabida){ - // dd('hye'); + + if(floatval($request->amaunkiraan) == $total_hargabida) + { $resit->total_payment = $resit->total_payment + $total_hargabida; if($resit->total_payment >= $senaraisagallpayment->sum('hargabida')) { @@ -208,11 +209,14 @@ class PaymentController extends Controller } $resit->save(); } + return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya'); } public function pengesahanPembayaran(Request $request){ + // dd($request->all()); + $pengesahanPembayaran = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('users', 'lelongbidder.user_id', '=', 'users.id') ->where('lelongbidder.status_bidder', 1) @@ -223,21 +227,21 @@ class PaymentController extends Controller public function banktransfer(Request $request) { - dd($request->all()); + // dd($request->all()); $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); $user = Auth::user(); - // dd($user); - // dd($request->checkboxdata); - $totalcheck = implode(",", $request->checkboxdata); + + // $totalcheck = implode(",", $request->checkboxdata); + $bid_id = explode(",", $request->eachbid); //bid_id = lelongbid_id $resit = Resit::where('lelong_id', $request->lelong_id) ->where('user_id',$request->user_id) ->where('resit_type', 2) ->first(); - + $payment = new Payment; $payment->user_id = $request->user_id; $payment->lelong_id = $request->lelong_id; @@ -246,21 +250,44 @@ class PaymentController extends Controller $payment->status = 2; $payment->remark = 'BAYARAN CDM'; $payment->resit_id = $resit->id; - $payment->total_payment = sum($totalcheck->valueOf()); + $payment->total_payment = $request->total; $payment->diminta_pada = $currentdate; $payment->diminta_oleh = $user->id; $payment->save(); - $sts_payment = LelongBidder::where('user_id', $request->user_id) - ->where('lelongbid_id', $request->eachbid) + foreach($bid_id as $bid){ + + $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') + ->where('lelongbidder.lelongbid_id', $bid) + ->select('lelongbidder.hargabida', + 'lelongbid.hargaasas', + 'lelongbid.norujukan', + 'lelongbidder.lelongbid_id', + 'lelongbidder.id as lelongbidder_id', + 'lelongbid.lelong_id as lelong_id' + ) ->first(); - - $sts_payment->payment_id = $payment->id; - $sts_payment->status_payment = 2; //Menunggu pengesahan account - $sts_payment->update(); + + $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id) + ->where('user_id',$request->user_id) + ->first(); + $updatelelbidbidder->status_payment = 1; + $updatelelbidbidder->payment_id = $payment->id; + $updatelelbidbidder->save(); + + $eachbidupdate = LelongBid::where('id',$bid)->first(); + $eachbidupdate->status_jual = 1; + $eachbidupdate->status_payment = 2; + $eachbidupdate->t_jual = $currentdate; + $eachbidupdate->hargajual = $eachbid->hargabida; + $eachbidupdate->save(); + + } + return redirect()->route('pembayaran.SenaraiLelongBayar') - ->with('success','Menunggu Pengesahan Account'); + ->with('success','Menunggu Pengesahan Account'); } } diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index ccbb0934..230d6872 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -194,29 +194,22 @@ class PembidaController extends Controller ->groupBy('lelongbidder.user_id') ->get()->toArray(); - foreach($listwinner as $index1=>$winner){ - + foreach($listwinner as $index1=>$winner) + { $userdetails = User::where('id', $winner['user_id'])->first(); $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('user_id', $winner['user_id']) ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $request->lelong_id) ->get(); + // dd($SAGWin); - $sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - ->where('user_id', $winner['user_id']) - ->where('lelongbidder.status_bidder', 1) - ->where('lelongbid.lelong_id', $request->lelong_id) - ->select('lelongbidder.status_payment') - ->get(); + foreach($SAGWin as $index2=>$sag) + { - $detailspayment = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id') - ->where('payment.kodcaw', $request->kodcaw) - ->where('payment.lelong_id', $request->lelong_id) - ->whereNotNull('payment.disahkan_pada') - ->where('lelongbidder.status_bidder', 1) - ->where('lelongbidder.status_payment', 1) - ->get(); + $detailspayment = Payment::where('id', $sag->payment_id)->first(); + // dd($detailspayment); + } $payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('user_id', $winner['user_id']) @@ -225,7 +218,8 @@ class PembidaController extends Controller ->select('payment_id')->groupBy('payment_id')->get(); $total_payment = 0; - foreach($payment_id as $id){ + foreach($payment_id as $id) + { $payment = Payment::where('id', $id->payment_id) ->first(); @@ -238,9 +232,9 @@ class PembidaController extends Controller $listwinner[$index1]['total_surat'] = sizeof($SAGWin); $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); $listwinner[$index1]['totalPay'] = $total_payment; - $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment']; - $listwinner[$index1]['status'] = $detailspayment[0]['status']; - $listwinner[$index1]['remark'] = $detailspayment[0]['remark']; + $listwinner[$index1][$index2]['remarks'] = $detailspayment['remark']; + $listwinner[$index1][$index2]['status_payment'] = $sag->status_payment; + $listwinner[$index1][$index2]['status'] = $detailspayment['status']; } diff --git a/database/migrations/2021_12_14_041545_create_simulasis_table.php b/database/migrations/2021_12_14_041545_create_simulasis_table.php index 6274d135..14224dc3 100644 --- a/database/migrations/2021_12_14_041545_create_simulasis_table.php +++ b/database/migrations/2021_12_14_041545_create_simulasis_table.php @@ -22,6 +22,7 @@ class CreateSimulasisTable extends Migration $table->string('harga_emas_asas')->nullable(); $table->string('jbg')->nullable(); $table->integer('cajlelong')->nullable(); + $table->integer('fasa')->default(0); $table->timestamps(); }); diff --git a/database/migrations/2022_01_23_042652_create_lelongbidder_table.php b/database/migrations/2022_01_23_042652_create_lelongbidder_table.php index d67351f4..e82f8f53 100644 --- a/database/migrations/2022_01_23_042652_create_lelongbidder_table.php +++ b/database/migrations/2022_01_23_042652_create_lelongbidder_table.php @@ -24,7 +24,7 @@ class CreateLelongbidderTable extends Migration $table->decimal('cajlelong'); $table->integer('status_bidder')->nullable(); //1 = win $table->integer('payment_id')->nullable(); - $table->integer('status_payment')->nullable(); // 1=paid + $table->integer('status_payment')->nullable(); // 1=paid, 2=memerlukan pengesahan operasi (CDM) $table->datetime('masa_bidaan'); $table->timestamps(); diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 6831b28f..0731fa08 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -51,7 +51,7 @@ @endforeach Jumlah Bayaran - RM + RM @@ -72,7 +72,7 @@ @csrf - + - - - - -