KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 2106

Browse Source
This commit is contained in:
Nur Izzati Zulkifli
2022-06-21 16:23:21 +08:00
parent 04ee64eac9
commit 545e2ba3ab
11 changed files with 63 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+14 -7
View File
@@ -33,12 +33,12 @@ class AccountController extends Controller
public function listbayaranonline($lelong_id, $caw_code)
{
$getkodcaw = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('lelong.id', $lelong_id)
->where('caw_code')
->select('cawangan.caw_name')
->get();
// $getkodcaw = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
// ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
// ->where('lelong.id', $lelong_id)
// ->where('caw_code')
// ->select('cawangan.caw_name')
// ->get();
$getkodcaw = Cawangan::where('caw_code', $caw_code)->select('caw_name')->first();
@@ -46,6 +46,7 @@ class AccountController extends Controller
->join('payment', 'lelongbidder.payment_id', 'payment.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.kodcaw', $caw_code)
->where('payment.status_payment_opt', 3)
->orWhere('payment.status_payment_opt', 2)
->where('lelongbidder.status_payment', 2)
@@ -54,14 +55,18 @@ class AccountController extends Controller
)
->groupBy('lelongbidder.user_id')
->get();
foreach($listwinner as $index1=>$winner){
$userdetails = User::where('id', $winner['user_id'])->first();
$SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
$SAGWin = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
->join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbidder.user_id', $winner['user_id'])
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', 3)
->orWhere('payment.status_payment_opt', 2)
->where('lelongbid.lelong_id', $lelong_id)
->get();
// dd($SAGWin->sum('hargabida'));
@@ -108,6 +113,7 @@ class AccountController extends Controller
->orWhere('payment.status_payment_opt', 2)
->where('lelongbidder.status_payment', 2)
->get()->toArray();
// dd($senaraisag);
foreach($senaraisag as $index1=>$sag)
{
@@ -117,6 +123,7 @@ class AccountController extends Controller
->whereNotNull('payment.disahkan_pada')
->whereNotNull('payment.disahkan_pada')
->first();
// dd($checking);
}
$saggroupbyid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
app/Http/Controllers/PaymentController.php
+10 -5
View File
@@ -27,21 +27,23 @@ class PaymentController extends Controller
$lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->select('fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->where('lelong.sts_lelong', 3)
->where('cawangan.caw_code', $user->kodcaw)
->groupBy('lelong_id')
->get()
->toArray();
foreach($lelong as $info)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->where('cawangan.caw_code',$user->kodcaw)
->get()
->toArray();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
// dd($detailsinfo);
}
return view('pembayaran.senarailelongbayaran',compact('lelong', 'arrayinfo'));
@@ -50,11 +52,13 @@ class PaymentController extends Controller
public function SenaraiPemenang($lelong_id){
$user = Auth::user();
$listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.kodcaw',$user->kodcaw)
->where('lelongbid.lelong_id', $lelong_id)
->select('lelongbidder.user_id'
)
->select('lelongbidder.user_id')
->groupBy('lelongbidder.user_id')
->get()->toArray();
@@ -66,6 +70,7 @@ class PaymentController extends Controller
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
// dd($userdetails);
$sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id', $winner['user_id'])
@@ -272,7 +277,7 @@ class PaymentController extends Controller
// dd($request->all());
//eachbid = lelongbid_id
$bid_id = implode(",", $request->eachbid);
dd($bid_id);
// dd($bid_id);
$paymentexist = Payment::join('fileresit', 'payment.id', '=', 'fileresit.payment_id')
->where('payment.lelong_id', $request->lelong_id)
app/Http/Controllers/SerahanController.php
+3 -2
View File
@@ -108,11 +108,12 @@ class SerahanController extends Controller
->get();
$senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.kodcaw',$caw['caw_code'])
// ->where('lelongbid.kodcaw',$caw['caw_code']) buang jap nti check balik
->where('user_id',$user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
// dd($senaraisag);
$caw['total_berat'] = $senaraisag->sum('berat');
$caw['total_bidaan'] = $senaraisag->sum('hargabida');
@@ -150,7 +151,7 @@ class SerahanController extends Controller
->get();
$senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.kodcaw',$caw['caw_code'])
// ->where('lelongbid.kodcaw',$caw['caw_code']) buang jap nti check balik
->where('user_id',$user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
app/Http/Controllers/TangguhLelongController.php
+1 -1
View File
@@ -30,7 +30,7 @@ class TangguhLelongController extends Controller
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('cawangan.caw_code', $user->kodcaw)
->where('sts_lelong', 0)
->select('lelong_id','cawangan.caw_code','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->select('fasa','lelong_id','cawangan.caw_code','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->distinct()
->get()
->toArray();
resources/views/account/listbayaranonline.blade.php
+5 -5
View File
@@ -20,8 +20,8 @@
<th>No Kad Pengenalan</th>
<th>No Telefon</th>
<th>Bilangan Surat</th>
<th>Jumlah Bidaan(RM)</th>
<th>Jumlah Pembayaran(RM)</th>
<th>Jumlah Bidaan(RM)</th>
<th class="text-center">Action</th>
</tr>
</thead>
@@ -29,12 +29,12 @@
@foreach($listwinner as $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['details']['notelbimbit']}}</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>
<a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$caw_code]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
</td>
@@ -66,7 +66,7 @@
"orderable": false
}
],
order: [[1, 'asc']],
order: [[0, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
resources/views/account/sahsagonline.blade.php
+7 -3
View File
@@ -41,9 +41,13 @@
<tr>
<td> {{ $loop->iteration }} </td>
<td>{{ $sag['norujukan'] }}</td>
<td>{{ $sag['t_lelong'] }}</td>
<td>{{ $sag['hargaasas'] }}</td>
<td>{{ $sag['hargabida'] }}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $sag['t_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ number_format($sag['hargaasas'], 2, '.', ',') }}</td>
<td>{{ number_format($sag['hargabida'], 2, '.', ',') }}</td>
<td>{{ $sag['masa_bidaan'] }}</td>
<td>
<button class="btn btn-outline-success btn-sm" disabled><b>{{ $sag['remark'] }}</b></button>
resources/views/pdf/resitpembayaran.blade.php
+4 -2
View File
@@ -53,12 +53,14 @@
<td width="46%">{{$caw['caw_name']}}</td>
<td width="54%" align="right">Slip Serahan</td>
</tr>
@foreach ($invois as $invois)
<tr>
<td>{{$caw['alamat1']}}</td>
@foreach ($invois as $invois)
<td align="right">No.Slip: {{$invois['reference_no']}}</td>
@endforeach
</tr>
@endforeach
<tr>
<td>{{$caw['alamat2']}}</td>
resources/views/pembayaran/SAGBidItem.blade.php
+2 -2
View File
@@ -37,8 +37,8 @@
<td class="text-center">
{{ $biditem->norujukan}}
</td>
<td class="text-center">{{ $biditem->hargaasas}}</td>
<td class="text-center">{{ $biditem->hargabida}}</td>
<td class="text-center">{{ number_format($biditem->hargaasas, 2, '.', ',')}}</td>
<td class="text-center">{{ number_format($biditem->hargabida, 2, '.', ',')}}</td>
<td class="text-center">
@if($biditem->status_payment == 0)
<input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" data-bid_id="{{ $biditem->lelongbid_id}}" onclick="sum(this.value,this)" value="{{ $biditem->hargabida }}">
resources/views/pembayaran/kaunterpembayaran.blade.php
+4 -4
View File
@@ -31,12 +31,12 @@
@foreach($listwinner as $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['details']['notelbimbit']}}</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['totalPay'] < $winner['totalBid'])
<button class="btn btn-warning btn-sm" disabled>BELUM SELESAI</button>
@@ -90,7 +90,7 @@
"orderable": false
}
],
order: [[1, 'asc']],
order: [[0, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
resources/views/pembayaran/senarailelongbayaran.blade.php
+10 -2
View File
@@ -15,7 +15,9 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Cawangan</th>
<th>Fasa</th>
<th>Tarikh Lelong</th>
<th>Status Lelong</th>
<th class="text-center">Action</th>
@@ -25,12 +27,18 @@
@foreach($arrayinfo as $data)
<tr>
<td>{{$loop->iteration}}</td>
<td>
<td>{{ $data['info']['lelong_id'] }}</td>
<td align = 'left'>
@foreach($data['detailsinfo'] as $details)
<span class="m-2">{{$details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{ $data['info']['tarikh_lelong'] }}</td>
<td>{{ $data['info']['fasa'] }}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $data['info']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>
@if($data['info']['sts_lelong'] == 3)
<button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
resources/views/tangguhlelong/senarailelongtangguh.blade.php
+3 -2
View File
@@ -17,8 +17,8 @@
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Harga Emas Asas</th>
<th>Tempoh</th>
<th>Caj Lelong</th>
@@ -37,6 +37,7 @@
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td>{{ $lel['info']['fasa']}}</td>
<!-- <td align = 'left'>
@foreach($lel['detailsinfo'] as $details)
<span class="m-2">{{$details['caw_name']}}</span><br>