From 31d60c44e7bc9d434f8a2100862bbbc781261700 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Sun, 6 Mar 2022 11:31:36 +0800 Subject: [PATCH 1/4] update sah payment acc --- app/Http/Controllers/AccountController.php | 29 +++--- .../views/account/sahsagonline.blade.php | 99 +++++++++++-------- routes/web.php | 2 +- 3 files changed, 73 insertions(+), 57 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 1b6d9f5c..9c7954fe 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -90,12 +90,12 @@ class AccountController extends Controller } } - return view('account.sahsagonline', compact('senaraisag', 'user_id', 'lelong_id','total_payment')); + return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment')); } - public function sahbayaronline($lelong_id, $user_id) + public function sahbayaronline(Request $request) { - + // dd($request->all()); $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); @@ -103,25 +103,26 @@ class AccountController extends Controller $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') ->join('payment', 'lelongbid.id', '=', 'payment.lelongbid_id') - ->where('lelongbid.lelong_id', $lelong_id) - ->where('lelongbidder.user_id', $user_id) + ->where('lelongbid.lelong_id', $request->lelong_id) + ->where('lelongbidder.user_id', $request->user_id) ->where('lelongbidder.status_bidder', 1) ->where('payment.status_payment_opt', 2) - ->get(); + ->get(); + $total_payment = 0; foreach($senaraisag as $sag) { - $payment = Payment::where('lelong_id', $lelong_id) - ->where('user_id', $user_id) + $payment = Payment::where('lelong_id', $request->lelong_id) + ->where('user_id', $request->user_id) ->where('lelongbid_id',$sag->lelongbid_id) ->first(); + $payment->disahkan_oleh = $user->id; $payment->disahkan_pada = $currentdate; $payment->save(); $total_payment = $total_payment + $payment->total_payment; - $updatelelbidbidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id) ->first(); $updatelelbidbidder->status_payment = 1; @@ -133,14 +134,14 @@ class AccountController extends Controller $eachbid->save(); } - + $senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') - ->where('lelongbid.lelong_id', $lelong_id) - ->where('lelongbidder.user_id', $user_id) + ->where('lelongbid.lelong_id', $request->lelong_id) + ->where('lelongbidder.user_id', $request->user_id) ->where('lelongbidder.status_bidder', 1) ->get(); - // dd($senaraisagallpayment); - $resit = Resit::where('id',$payment->resit_id)->first(); + + $resit = Resit::where('id', $payment->resit_id)->first(); $resit->total_payment = $resit->total_payment + $total_payment; if($resit->total_payment >= $senaraisagallpayment->sum('hargabida')) diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php index 7fa44ec6..f66642bd 100644 --- a/resources/views/account/sahsagonline.blade.php +++ b/resources/views/account/sahsagonline.blade.php @@ -4,33 +4,32 @@
-
- @csrf - - - -
+
@if ($message = Session::get('success')) -
-

{{ $message }}

-
+
+

{{ $message }}

+
@endif - - - - - - - - - - - - - - @foreach($senaraisag as $sag) + + @csrf + + +
NoNo RujukanTarikh LelongHarga Asas (RM)Harga Bida (RM)Masa BidaanStatus
+ - + + + + + + + + + + + @foreach($senaraisag as $sag) + + @@ -39,31 +38,47 @@ - - @endforeach - + + @endforeach + + + + + + + +
{{ $loop->iteration }} NoNo RujukanTarikh LelongHarga Asas (RM)Harga Bida (RM)Masa BidaanStatus
{{ $loop->iteration }} {{ $sag['norujukan'] }} {{ $sag['t_lelong'] }} {{ $sag['hargaasas'] }} PAID
Jumlah BayaranRM
+ - - Jumlah Bayaran - - RM - - - -
-