Merge branch 'atie' into 'main'
update 3006 See merge request online-sistem1/lelong!100
This commit is contained in:
Nur Izzati Zulkifli
@@ -915,6 +915,7 @@ class MarhunController extends Controller
|
||||
// dd($id);
|
||||
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id')
|
||||
->where('tangguhlelong.norujukan', 'like', "%$caw_code%")
|
||||
->where('tangguhlelong.lelong_id', $id)
|
||||
->whereNotNull('tangguhlelong.tarikhtangguh')
|
||||
->select('tangguhlelong.id as tangguhlelong_id',
|
||||
'tangguhlelong.lelongbid_id',
|
||||
|
||||
@@ -67,6 +67,7 @@ class PaymentController extends Controller
|
||||
$userdetails = User::where('id', $winner['user_id'])->first();
|
||||
$SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
|
||||
->where('user_id', $winner['user_id'])
|
||||
->where('lelongbid.kodcaw', $user->kodcaw)
|
||||
->where('lelongbidder.status_bidder', 1)
|
||||
->where('lelongbid.lelong_id', $lelong_id)
|
||||
->get();
|
||||
@@ -75,6 +76,7 @@ class PaymentController extends Controller
|
||||
$sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
|
||||
->where('user_id', $winner['user_id'])
|
||||
->where('lelongbidder.status_bidder', 1)
|
||||
->where('lelongbid.kodcaw', $user->kodcaw)
|
||||
->where('lelongbid.lelong_id', $lelong_id)
|
||||
->select('lelongbidder.status_payment')
|
||||
->get();
|
||||
@@ -82,6 +84,7 @@ class PaymentController extends Controller
|
||||
|
||||
$payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
|
||||
->where('user_id', $winner['user_id'])
|
||||
->where('lelongbid.kodcaw', $user->kodcaw)
|
||||
->where('lelongbidder.status_bidder', 1)
|
||||
->where('lelongbid.lelong_id', $lelong_id)
|
||||
->select('payment_id')->groupBy('payment_id')->get();
|
||||
@@ -111,10 +114,13 @@ class PaymentController extends Controller
|
||||
|
||||
public function SAGBidItem($user_id, $lelong_id){
|
||||
|
||||
$user = Auth::user();
|
||||
|
||||
$SAGBidItem = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
|
||||
->join('users', 'lelongbidder.user_id', '=', 'users.id')
|
||||
->where('lelongbidder.status_bidder', 1)
|
||||
->where('users.id', $user_id)
|
||||
->where('lelongbid.kodcaw', $user->kodcaw)
|
||||
->where('lelongbid.lelong_id', $lelong_id)
|
||||
->select(
|
||||
'users.id',
|
||||
@@ -129,6 +135,7 @@ class PaymentController extends Controller
|
||||
->where('lelongbidder.status_bidder', 1)
|
||||
->where('users.id', $user_id)
|
||||
->where('lelongbid.lelong_id', $lelong_id)
|
||||
->where('lelongbid.kodcaw', $user->kodcaw)
|
||||
->select('lelongbidder.hargabida',
|
||||
'lelongbid.hargaasas',
|
||||
'lelongbid.norujukan',
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
<button type="button" class="btn btn-success" disabled>Berjaya Disahkan</button>
|
||||
@else
|
||||
<button type="button" class="btn btn-warning" onclick="confirm()" >Sahkan</button>
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
</div>
|
||||
@endif
|
||||
|
||||
{{ __('You are logged in!') }}
|
||||
{{ __('Selamat Datang!') }}
|
||||
@hasrole('admin')
|
||||
I am a admin!
|
||||
@endhasrole
|
||||
@@ -27,7 +27,7 @@
|
||||
I am a pengurus-cawangan!
|
||||
@endhasrole
|
||||
@hasrole('jurulelong')
|
||||
I am a jurulelong!
|
||||
Saya jurulelong!
|
||||
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
@@ -84,17 +84,19 @@
|
||||
|
||||
<!-- @if($lel['info']['sts_lelong'] == 0) -->
|
||||
<!-- <a href="{{ route('lelong.refreshhome',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> -->
|
||||
<a class="startlelongall" href="{{ route('lelong.startall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Semua" style="margin-right:40px"><i class="fa fa-play"></i></a>
|
||||
<a class="startlelongall" href="{{ route('lelong.startall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Semua" style="margin-right:40px"><button class="btn btn-success float-right " id="btnstart" >Online</button></a>
|
||||
<a href="{{ route('lelong.show',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
|
||||
<!-- <a href="{{ route('lelong.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang" style="margin-right:40px"><i class="fas fa-users-cog"></i></a> -->
|
||||
<a href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang" style="margin-right:40px"><i class="fas fa-trophy"></i></a>
|
||||
<!-- <a class="confirmdel" href="{{ route('lelong.delete',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a> -->
|
||||
<!-- @elseif ($lel['info']['sts_lelong'] == 2) -->
|
||||
<a href="{{ route('lelong.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a>
|
||||
<!-- @elseif ($lel['info']['sts_lelong'] == 3) -->
|
||||
<!-- <a href="{{ route('lelong.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a> -->
|
||||
<a href="{{ route('lelong.janapemenangallcaw',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a>
|
||||
|
||||
<!-- @elseif ($lel['info']['sts_lelong'] == 3) -->
|
||||
<a href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
|
||||
<!-- @else -->
|
||||
<a class="stoplelongall" href="{{ route('lelong.stopall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><i class="fa fa-stop"></i></a>
|
||||
<a class="stoplelongall" href="{{ route('lelong.stopall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><button class="btn btn-danger float-right " id="btnstart" >Offline</button></a></a>
|
||||
<!-- @endif -->
|
||||
@endhasrole
|
||||
<!-- @hasrole('operasi')
|
||||
|
||||
@@ -28,11 +28,11 @@
|
||||
@foreach($listwinner as $index1=>$winner)
|
||||
<tr>
|
||||
<td>{{ $loop->iteration }}</td>
|
||||
<td>{{ $winner['details']['name'] }}</td>
|
||||
<td align = 'left'>{{ $winner['details']['name'] }}</td>
|
||||
<td>{{ $winner['details']['nokp'] }}</td>
|
||||
<td>{{ $winner['total_surat'] }}</td>
|
||||
<td>{{ $winner['totalBid'] }}</td>
|
||||
<td>{{ $winner['totalPay'] }}</td>
|
||||
<td>{{ number_format($winner['totalBid'], 2, '.', ',') }}</td>
|
||||
<td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
|
||||
<td>
|
||||
@if($winner['jenisbayaran']['status'] == 1)
|
||||
<button class="btn btn-info btn-sm" disabled>FEE</button>
|
||||
|
||||
Reference in New Issue
Block a user