diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 9199a90c..78dc1433 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -604,6 +604,16 @@ class LelongController extends Controller return view('lelong.lelongtaklaku',compact('lelongtaklaku')); } + public function senaraipemenang($lelong_id){ + + $senaraiwinner = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') + ->where('lelongbid.lelong_id', $lelong_id) + ->get(); + + return view('lelong.senaraipemenang',compact('senaraiwinner')); + } + public function senaraimarhun($lelongid, $cawid){ // $marhun = LelongBid::->get(); diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 25935586..d8da8a02 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -130,7 +130,8 @@ 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(); @@ -144,6 +145,7 @@ class PaymentController extends Controller '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, diff --git a/database/migrations/2022_01_25_010223_create_payment_table.php b/database/migrations/2022_01_25_010223_create_payment_table.php index 379877c0..8a3dfc6d 100644 --- a/database/migrations/2022_01_25_010223_create_payment_table.php +++ b/database/migrations/2022_01_25_010223_create_payment_table.php @@ -18,6 +18,7 @@ class CreatePaymentTable extends Migration $table->unsignedBigInteger('user_id')->unsigned(); $table->unsignedBigInteger('lelongbidder_id')->unsigned()->nullable(); $table->unsignedBigInteger('lelongbid_id')->unsigned()->nullable(); + $table->unsignedBigInteger('lelong_id')->unsigned(); $table->string('kodcaw')->nullable(); $table->string('back_acc_pembeli')->nullable(); $table->string('bank_acc_no_pembeli')->nullable(); @@ -54,6 +55,10 @@ class CreatePaymentTable extends Migration $table->foreign('lelongbidder_id') ->references('id')->on('lelongbidder') ->onDelete('cascade'); + + $table->foreign('lelong_id') + ->references('id')->on('lelong') + ->onDelete('cascade'); }); Schema::create('resit', function (Blueprint $table) { diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 39208c74..59bad69a 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -45,7 +45,7 @@ @elseif ($lel->sts_lelong == 2) @elseif ($lel->sts_lelong == 3) - + @else @endif diff --git a/resources/views/lelong/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php new file mode 100644 index 00000000..802d6fb0 --- /dev/null +++ b/resources/views/lelong/senaraipemenang.blade.php @@ -0,0 +1,108 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif + + + + + + + + + + + + + + + + @foreach($senaraiwinner as $winner) + + + + + + + + + + + + @endforeach + +
NoNamaNo Kad PengenalanNo TelefonBilangan SuratJumlah Bidaan(RM)Jumlah Pembayaran(RM)Penyata BayaranAction
{{ $loop->iteration }} {{ $winner['details']['name']}}{{ $winner['details']['nokp']}}{{ $winner['details']['notelbimbit']}}{{ $winner['total_surat']}}{{ $winner['totalBid']}}{{ $winner['totalPay']}} + + + @if( $winner['totalPay'] < $winner['totalBid'] ) + + @endif +
+
+
+
+ + + +@endsection + diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index e5a016de..b1e341e0 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -20,7 +20,7 @@ Bilangan Surat Jumlah Bidaan(RM) Jumlah Pembayaran(RM) - Resit Bayaran + Penyata Bayaran Action @@ -35,7 +35,7 @@ {{ $winner['totalBid']}} {{ $winner['totalPay']}} - + @if( $winner['totalPay'] < $winner['totalBid'] ) diff --git a/routes/web.php b/routes/web.php index fcaa5030..c5ff7290 100644 --- a/routes/web.php +++ b/routes/web.php @@ -77,6 +77,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::group(['middleware' => ['permission:pendaftaranbatch']], 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('/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']);