Merge branch 'amirah' of https://gitlab.com/azfararsyad/lelong into amirah
This commit is contained in:
@@ -23,6 +23,7 @@ use App\Models\CawanganSimulasi;
|
||||
use App\Models\Lelong;
|
||||
use App\Models\CawanganLelong;
|
||||
use App\Models\LelongBid;
|
||||
use App\Models\LelongBidder;
|
||||
use App\Models\LelongBidMarhun;
|
||||
use App\Models\LelKarat;
|
||||
use App\Models\LelKarat_temp;
|
||||
@@ -194,7 +195,6 @@ class LelongController extends Controller
|
||||
$total_bakilelong = $total_bakilelong + $bakilelong;
|
||||
}
|
||||
|
||||
|
||||
|
||||
return view('lelong.showlelong',compact(
|
||||
'arraycaw',
|
||||
@@ -430,6 +430,26 @@ class LelongController extends Controller
|
||||
return redirect()->route('lelong.show',$request->idlelong)
|
||||
->with('success','Kemaskini Berjaya');
|
||||
}
|
||||
|
||||
public function janapemenang(Request $request){
|
||||
|
||||
$lelongbidder = LelongBidder::join('users', 'lelongbidder.user_id', '=', 'users.id')
|
||||
->select(
|
||||
'users.name',
|
||||
'users.nokp',
|
||||
'users.notelbimbit',
|
||||
'lelongbidder.hargabida'
|
||||
)
|
||||
->where('lelongbid_id', '=', $request->id)
|
||||
->orderBy('masa_bidaan','desc')
|
||||
->orderBy('hargabida','desc')
|
||||
->first();
|
||||
|
||||
// dd($lelongbidder);
|
||||
|
||||
return view('lelong.janapemenang',compact('lelongbidder'));
|
||||
|
||||
}
|
||||
|
||||
public function stop($id)
|
||||
{
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="row ">
|
||||
<div class="col-md-11 mx-auto card p-4">
|
||||
<table class="table table-striped table-xl" style="width:100%">
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
<th>No</th>
|
||||
<th>Nama</th>
|
||||
<th>No Kad Pengenalan</th>
|
||||
<th>No Telefon</th>
|
||||
<th>Bilangan Surat</th>
|
||||
<th>Jumlah Bidaan(RM)</th>
|
||||
<th>Remark</th>
|
||||
<th>Penyata Bayaran</th>
|
||||
<th>Status Bayaran</th>
|
||||
<th>Resit Bayaran</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<tr>
|
||||
<td>1</td>
|
||||
<td>{{ $lelongbidder->name}}</td>
|
||||
<td>{{ $lelongbidder->nokp}}</td>
|
||||
<td>{{ $lelongbidder->notelbimbit}}</td>
|
||||
<td></td>
|
||||
<!-- <td>{{ $lelongbidder->hargabida}}</td> -->
|
||||
<td>{{ $lelongbidder->hargabida}}</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@endsection
|
||||
@@ -42,7 +42,7 @@
|
||||
<a class="startlelong" href="{{ route('lelong.start',$lel->id) }}"><i class="fa fa-play"></i></a>
|
||||
<a class="confirmdel" href="{{ route('lelong.delete',$lel->id) }}"><i class="far fa-trash-alt"></i></a>
|
||||
@elseif ($lel->sts_lelong == 2)
|
||||
<a href="{{ route('lelong.show',$lel->id) }}"><i class="fas fa-trophy"></i></a>
|
||||
<a href="{{ route('lelong.janapemenang',$lel->id) }}"><i class="fas fa-trophy"></i></a>
|
||||
@else
|
||||
<a class="stoplelong" href="{{ route('lelong.stop',$lel->id) }}"><i class="fa fa-stop"></i></a>
|
||||
@endif
|
||||
|
||||
@@ -81,6 +81,7 @@ Route::group(['prefix'=>'lelong'], function () {
|
||||
Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']);
|
||||
|
||||
Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']);
|
||||
Route::get('/janapemenang', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']);
|
||||
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user