diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 401e13a6..d3aa8cec 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -610,7 +610,7 @@ class LelongController extends Controller } 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) @@ -618,13 +618,33 @@ class LelongController extends Controller ) ->groupBy('lelongbidder.user_id') ->get()->toArray(); + // dd($listwinner); - $senaraiwinner = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') - ->join('users', 'lelongbidder.user_id', '=', 'users.id') - ->where('lelongbid.lelong_id', $lelong_id) - ->get(); + 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', $lelong_id) + ->get(); + + $listwinner[$index1]['details'] = $userdetails; + $listwinner[$index1]['total_surat'] = sizeof($SAGWin); + $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); + } - return view('lelong.senaraipemenang',compact('senaraiwinner','lelong_id')); + return view('lelong.senaraipemenang',compact('listwinner','lelong_id')); + } + + public function senaraisagpemenang($user_id, $lelong_id){ + + $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbidder.user_id', $user_id) + ->get(); + + return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id')); } public function senaraimarhun($lelongid, $cawid){ diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index fbdbc725..dcdb122d 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -46,9 +46,7 @@ class PaymentController extends Controller foreach($listwinner as $index1=>$winner){ $userdetails = User::where('id', $winner['user_id'])->first(); - // dd($userdetails); $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - // ->join('payment', 'lelongbidder.lelongbid_id', '=', 'payment.lelongbid_id') ->where('user_id', $winner['user_id']) ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) @@ -58,7 +56,6 @@ class PaymentController extends Controller foreach($SAGWin as $SAG){ $payment = Payment::where('lelongbid_id', $SAG->lelongbid_id) ->first(); - // dd($payment->total_payment); if($payment){ $total_payment = $total_payment + $payment->total_payment; diff --git a/resources/views/lelong/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php index 920fa94b..59092f71 100644 --- a/resources/views/lelong/senaraipemenang.blade.php +++ b/resources/views/lelong/senaraipemenang.blade.php @@ -19,28 +19,20 @@ No Telefon Bilangan Surat Jumlah Bidaan(RM) - Jumlah Pembayaran(RM) - Penyata Bayaran Action - @foreach($senaraiwinner as $winner) + @foreach($listwinner as $winner) - {{ $loop->iteration }} - {{ $winner['name']}} - {{ $winner['nokp']}} - {{ $winner['notelbimbit']}} + {{ $loop->iteration }} + {{ $winner['details']['name']}} + {{ $winner['details']['nokp']}} + {{ $winner['details']['notelbimbit']}} {{ $winner['total_surat']}} {{ $winner['totalBid']}} - {{ $winner['totalPay']}} - - - - @if( $winner['totalPay'] < $winner['totalBid'] ) - - @endif + @endforeach @@ -58,10 +50,6 @@ "orderable": false }, { - "targets": 7, - "orderable": false - }, - { "targets": 6, "orderable": false } diff --git a/resources/views/lelong/senaraisagpemenang.blade.php b/resources/views/lelong/senaraisagpemenang.blade.php new file mode 100644 index 00000000..6bb3075b --- /dev/null +++ b/resources/views/lelong/senaraisagpemenang.blade.php @@ -0,0 +1,45 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif + + + + + + + + + + + + + + @foreach($senaraisag as $senaraisag) + + + + + + + + + + @endforeach + +
NoNo RujukanTarikh LelongHarga Asas (RM)Harga Bida (RM)Masa BidaanAction
{{ $loop->iteration }} {{ $senaraisag['norujukan']}}{{ $senaraisag['t_lelong']}}{{ $senaraisag['hargaasas']}}{{ $senaraisag['hargabida']}}{{ $senaraisag['masa_bidaan']}} + +
+
+
+
+ +@endsection diff --git a/routes/web.php b/routes/web.php index c5ff7290..702c5584 100644 --- a/routes/web.php +++ b/routes/web.php @@ -78,14 +78,13 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']); Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']); Route::get('/senaraipemenang/{lelong_id}',['as'=>'lelong.senaraipemenang','uses'=>'LelongController@senaraipemenang']); + Route::get('/senaraisagpemenang/{user_id}/{lelong_id}',['as'=>'lelong.senaraisagpemenang','uses'=>'LelongController@senaraisagpemenang']); Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']); Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']); Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); - Route::get('/kaunterpembayaran', ['as'=>'lelong.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']); - Route::get('/SAGBidItem', ['as'=>'lelong.SAGBidItem','uses'=>'PaymentController@SAGBidItem']); Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']);