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

add function sah pada home account

Browse Source
This commit is contained in:
Nur Izzati Zulkifli
2022-10-26 16:40:40 +08:00
parent 6cfa5b9a8a
commit c815963fda
7 changed files with 427 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+164 -56
View File
@@ -129,6 +129,163 @@ class AccountController extends Controller
return view('account.listbayaranonline',compact('listwinner','lelong_id', 'getkodcaw', 'kodcaw'));
}
// public function sahsagonline($lelong_id, $user_id, $caw_code) //hoklama komen pada 25hb10
// {
// $userdetails = User::where('id', $user_id)->first();
// $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
// ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
// ->join('resit', 'payment.resit_id', '=', 'resit.id')
// ->where('lelongbid.lelong_id', $lelong_id)
// ->where('lelongbidder.user_id', $userdetails['id'])
// ->where('lelongbid.kodcaw', $caw_code)
// ->where('lelongbidder.status_bidder', 1)
// // ->where('payment.status_payment_opt', 3)
// // ->orWhere('payment.status_payment_opt', 2)
// ->where('lelongbidder.status_payment', 2)
// ->select('lelongbidder.id as lelongbidder_id',
// 'lelongbidder.user_id',
// 'lelongbidder.hargabida',
// 'lelongbidder.status_bidder',
// 'lelongbidder.status_payment',
// 'lelongbidder.masa_bidaan',
// 'lelongbid.id as lelongbid_id',
// 'lelongbid.lelong_id',
// 'lelongbid.caw_id',
// 'lelongbid.kodcaw',
// 'lelongbid.norujukan',
// 'lelongbid.t_lelong',
// 'lelongbid.hargaasas',
// 'lelongbid.hargajual',
// 'lelongbid.t_jual',
// 'lelongbid.status_jual',
// 'lelongbid.status_payment as sts_payment_lelbid',
// 'lelongbid.status_semak',
// 'payment.id as payment_id',
// 'payment.remark',
// 'payment.kodcaw',
// 'payment.status_payment_opt',
// 'payment.resit_id',
// 'payment.status',
// 'payment.remark',
// 'payment.total_payment',
// 'payment.disahkan_pada',
// 'payment.disahkan_oleh',
// 'resit.reference_no'
// )
// ->get();
// // dd($senaraisag);
// // $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
// // ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
// // ->where('payment.user_id', $user_id)
// // ->where('payment.kodcaw', $caw_code)
// // ->where('lelongbidder.status_bidder', 1)
// // ->where('payment.status_payment_opt', 3)
// // ->orWhere('payment.status_payment_opt', 2)
// // ->where('lelongbidder.status_payment', 2)
// // ->where('payment.lelong_id', $lelong_id)
// // ->where('payment.kodcaw', $caw_code)
// // ->where('payment.user_id', $user_id)
// // ->get()->toArray();
// // dd($senaraisag);
// foreach($senaraisag as $index1=>$sag)
// {
// if($sag)
// {
// // dd($sag);
// $checking = Payment::join('lelongbid', 'payment.lelong_id', '=', 'lelongbid.lelong_id')
// ->where('payment.id', $sag['payment_id'])
// ->where('lelongbid.status_jual', 1)
// ->where('payment.kodcaw', $caw_code)
// ->where('lelongbid.status_payment', 1)
// ->whereNotNull('payment.disahkan_pada')
// ->whereNotNull('payment.disahkan_pada')
// ->first();
// $senaraisag[$index1]['checking_payment'] = $checking;
// // dd($checking);
// }
// else
// {
// //
// }
// }
// $saggroupbyid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
// ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
// ->where('lelongbid.lelong_id', $lelong_id)
// ->where('lelongbidder.user_id', $user_id)
// ->where('lelongbid.kodcaw', $caw_code)
// ->where('lelongbidder.status_bidder', 1)
// ->where('payment.status_payment_opt', 3)
// ->orWhere('payment.status_payment_opt', 2)
// ->where('lelongbidder.status_payment', 2)
// ->select(
// 'lelongbidder.payment_id as payment_id'
// )
// ->groupBy('lelongbidder.payment_id')
// ->get();
// // $payments = Payment::whereIn($saggroupbyid)->get()
// $total_payment = Payment::whereIn('id',$saggroupbyid)->get()->sum('total_payment');
// $getresit = FileResit::join('payment', 'fileresit.payment_id', '=', 'payment.id')
// ->where('payment.lelong_id', $lelong_id)
// ->where('payment.user_id', $user_id)
// ->where('payment.kodcaw', $caw_code)
// ->get()->toArray();
// $array_resit = [];
// foreach($getresit as $index1=>$resit)
// {
// $getresit[$index1]['resit64'] = 'data:image/' . $resit['file_type'] . ';base64' . base64_encode($resit['filename']);
// }
// return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment', 'caw_code', 'userdetails', 'getresit'));
// }
public function sahbayaronline(Request $request)
{
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$user = Auth::user();
$total_payment = 0;
$senaraisag = $request->senarai_sag;
foreach(json_decode($senaraisag) as $sag)
{
$payment = Payment::where('id', $sag->payment_id)->first();
$payment->disahkan_oleh = $user->id;
$payment->disahkan_pada = $currentdate;
$payment->save();
$total_payment = $total_payment + $payment->total_payment;
$eachbid = LelongBid::where('id',$sag->lelongbid_id)->first();
$eachbid->status_payment = 1;
$eachbid->status_jual = 1;
$eachbid->status_semak = 1;
$eachbid->t_jual = $currentdate;
$eachbid->save();
$bidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id)
->where('payment_id', $sag->payment_id)
->where('user_id', $sag->user_id)
->first();
$bidder->status_payment = 1;
$bidder->update();
}
return redirect()->route('account.senarailelongan')->with('success','Pembayaran Berjaya');
}
public function sahsagonline($lelong_id, $user_id, $caw_code)
{
$userdetails = User::where('id', $user_id)->first();
@@ -171,24 +328,9 @@ class AccountController extends Controller
'payment.total_payment',
'payment.disahkan_pada',
'payment.disahkan_oleh',
'resit.reference_no',
'resit.reference_no'
)
->get();
// dd($senaraisag);
// $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
// ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
// ->where('payment.user_id', $user_id)
// ->where('payment.kodcaw', $caw_code)
// ->where('lelongbidder.status_bidder', 1)
// ->where('payment.status_payment_opt', 3)
// ->orWhere('payment.status_payment_opt', 2)
// ->where('lelongbidder.status_payment', 2)
// ->where('payment.lelong_id', $lelong_id)
// ->where('payment.kodcaw', $caw_code)
// ->where('payment.user_id', $user_id)
// ->get()->toArray();
// dd($senaraisag);
foreach($senaraisag as $index1=>$sag)
{
@@ -205,6 +347,11 @@ class AccountController extends Controller
->whereNotNull('payment.disahkan_pada')
->first();
$noresit = Resit::where('lelong_id',$lelong_id)
->where('user_id','=',$user_id)
->first();
$senaraisag[$index1]['checking_payment'] = $checking;
// dd($checking);
}
@@ -243,45 +390,6 @@ class AccountController extends Controller
$getresit[$index1]['resit64'] = 'data:image/' . $resit['file_type'] . ';base64' . base64_encode($resit['filename']);
}
return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment', 'caw_code', 'userdetails', 'getresit'));
}
public function sahbayaronline(Request $request)
{
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$user = Auth::user();
$total_payment = 0;
$senaraisag = $request->senarai_sag;
foreach(json_decode($senaraisag) as $sag)
{
$payment = Payment::where('id', $sag->payment_id)->first();
$payment->disahkan_oleh = $user->id;
$payment->disahkan_pada = $currentdate;
$payment->save();
$total_payment = $total_payment + $payment->total_payment;
$eachbid = LelongBid::where('id',$sag->lelongbid_id)->first();
$eachbid->status_payment = 1;
$eachbid->status_jual = 1;
$eachbid->status_semak = 1;
$eachbid->t_jual = $currentdate;
$eachbid->save();
$bidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id)
->where('payment_id', $sag->payment_id)
->where('user_id', $sag->user_id)
->first();
$bidder->status_payment = 1;
$bidder->update();
}
return redirect()->route('account.senarailelongan')->with('success','Pembayaran Berjaya');
return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment', 'caw_code', 'userdetails', 'getresit','noresit'));
}
}
app/Http/Controllers/HomeController.php
+69 -1
View File
@@ -14,6 +14,9 @@ use App\Models\Pengesahan;
use Carbon\Carbon;
use App\Models\Cawangan;
use App\Models\LelongBid;
use App\Models\Payment;
use App\Models\User;
use App\Models\LelongBidder;
use Hash;
class HomeController extends Controller
@@ -170,9 +173,74 @@ class HomeController extends Controller
array_push($arrayinfomenang,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
}
//end paparan pemenang lelongan harini
//paparan untuk account
$arrayinfoaccount = [];
$dateTimedummy = date('2022-10-23');
$senarai = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->select('lelong_id','tarikh_lelong','lelong.fasa','sts_lelong')
->distinct()
->orderBy('lelong_id')
->where('lelong.sts_lelong', 3)
->where('tarikh_lelong', '=', $dateTimedummy)
->get()
->toArray();
// dd($senarai);
foreach($senarai as $details)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->join('lelongbid', 'lelongbid.caw_id', '=', 'cawangan_lelong.caw_id')
->join('payment','payment.norujukan','=','lelongbid.norujukan')
->select('cawangan_lelong.lelong_id','cawangan_lelong.caw_id','caw_name','caw_code')
->where('lelongbid.lelong_id',$details['lelong_id'])
->distinct()
->orderBy('lelong_id')
->get()
->toArray();
// dd($detailsinfo);
foreach($detailsinfo as $index1=>$details1)
{
// dd($details1['caw_code']);
$listwinner = Payment::join('lelongbid', 'payment.kodcaw', '=', 'lelongbid.kodcaw')
->join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $details1['lelong_id'])
->where('payment.kodcaw', $details1['caw_code'])
->where('lelongbidder.status_payment', 2)
->where('payment.status', 2)
->whereNull('payment.disahkan_pada')
->orWhere(function ($query) {
$query->where('payment.status_payment_opt', 3)
->where('payment.status_payment_opt', 2);
})
->select('lelongbidder.user_id', 'payment.user_id')
->groupBy('lelongbidder.user_id', 'payment.user_id')
->get();
// dd($listwinner);
foreach($listwinner as $index=>$listwin)
{
$namawinner = User::where('id', $listwin['user_id'])
->first();
// dd($namawinner);
// $listwinner[$index]['namawinner'] = sizeof($namawinner);
$listwinner[$index]['nama'] = $namawinner['name'];
$listwinner[$index]['caw_code'] = $details1['caw_code'];
}
// dd($listwinner[$index]['nama']);
}
array_push($arrayinfoaccount,['detail'=>$details, 'detailsinfo'=>$detailsinfo, 'listwinner'=>$listwinner]);
}
//endpaparan untuk account page
return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo','sag','semakCountArray','arrayinfomenang'));
return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo','sag','semakCountArray','arrayinfomenang','arrayinfoaccount'));
}
public/img/new.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

resources/views/account/sahsagonline.blade.php
+28 -13
View File
@@ -19,16 +19,17 @@
<p> <b>Nama Pembida : </b> {{ $userdetails['name'] }}</p>
<p> <b>No Kad Pengenalan : </b> {{ $userdetails['nokp'] }}</p>
<p> <b>No Telefon : </b> {{ $userdetails['notelbimbit'] }}</p>
{{-- <p> <b>No Resit: </b>{{ $noresit['reference_no'] }}</p> --}}
</div>
</div>
</div>
<form action="{{ route('account.sahbayaronline') }}" method="POST" id="formsahbayaronline">
@csrf
@csrf
<input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
<input type="hidden" name="user_id" value="{{ $user_id }}" />
<input type="hidden" name="senarai_sag" value="{{ $senaraisag }}" />
<table class="table table-striped table-xl text-center" id="tablekaunter" style="width:100%">
<thead class="bg-primary text-white">
{{-- <thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>No Rujukan</th>
@@ -40,8 +41,8 @@
<th>Nota</th>
<th class="text-center">Status</th>
</tr>
</thead>
<tbody>
</thead> --}}
{{-- <tbody>
@foreach($senaraisag as $sag)
<tr>
<td> {{ $loop->iteration }} </td>
@@ -63,34 +64,48 @@
</td>
</tr>
@endforeach
</tbody>
</tbody> --}}
<tr>
<td colspan="2"><b> No.Resit</b></td>
<td colspan="2"></td>
<td><b>{{ $noresit['reference_no'] }}</b></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td colspan="2"><b> Jumlah Bayaran</b></td>
<td colspan="2"></td>
<td><b>RM{{ number_format($senaraisag->sum('hargabida'), 2, '.', ',') }}</b></td>
<td></td>
<td>
<span class="btn btn-info btn-sm hovernone-info" disabled>TELAH DIBAYAR</span>
</td>
{{-- <td>
@if($getresit)
<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#exampleModal">
Lihat Resit <i class="fas fa-file-alt"></i>
</button>
@else
@endif
</td>
</td> --}}
<td></td>
<td></td>
</tr>
</table>
<div class="modal-footer" style="margin-top:2%;">
<div style="margin-top:2%; align:center">
{{-- <a href="{{ route('account.listbayaranonline', [$lelong_id,$caw_code]) }}" class="btn btn-primary">Kembali</a> --}}
{{-- @foreach($senaraisag as $senarai) --}}
@if($sag['checking_payment'])
{{-- @if($sag['checking_payment'])
<button type="button" class="btn btn-success" disabled>Berjaya Disahkan</button>
@else
<button type="button" class="btn btn-warning" onclick="confirm()" >Sahkan</button>
@endif
@else --}}
<button type="button" class="btn btn-success" onclick="confirm()" >Sahkan</button>
{{-- @endif --}}
{{-- @endforeach --}}
</div>
</div>
</form>
</div>
</div>
resources/views/home.blade.php
+54 -1
View File
@@ -321,7 +321,60 @@
@endhasrole
@hasrole('account')
I am a account!
I am a account!<br>
@if(count($arrayinfoaccount)> 0)
PENGESAHAN BAYARAN ONLINE
<table class="table table-striped table-xl text-center" id="senarailelongan" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
{{-- <th>Cawangan</th> --}}
<th>Nama</th>
<th>Fasa</th>
<th>Status Lelong</th>
</tr>
</thead>
<tbody>
@foreach($arrayinfoaccount as $data)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $data['detail']['lelong_id']}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $data['detail']['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
<td align='left'>
@foreach($data['detailsinfo'] as $details)
{{-- <a href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a> --}}
<strong><span class="m-2">{{ $details['caw_name']}}</span></strong><br>
@endforeach
@foreach($data['listwinner'] as $details)
<a href=" {{ route('account.sahsagonline', ['lelong_id'=>$data['detail']['lelong_id'],'user_id'=>$details['user_id'], 'caw_code'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Pengesahan"><i class="far fa-edit"></i></a>
<span class="m-2">{{ $details['caw_name']}}</span> {{$details['nama']}}<img src="{{ asset('img/new.gif') }}" alt="description of myimage"><br>
@endforeach
</td>
{{-- <td align='left'>
@foreach($data['listwinner'] as $details)
<a href=" {{ route('account.sahsagonline', ['lelong_id'=>$data['detail']['lelong_id'],'user_id'=>$details['user_id'], 'caw_code'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Pengesahan"><i class="far fa-edit"></i></a>
<span class="m-2">{{ $details['caw_name']}}</span> {{$details['nama']}}<br>
@endforeach
</td> --}}
<td>{{ $data['detail']['fasa'] }}</td>
<td>
@if($data['detail']['sts_lelong'] == 3)
<button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
@endif
@endhasrole
@hasrole('pembida')
I am a pembida!
resources/views/home/listbayaranonline.blade.php
+111
View File
@@ -0,0 +1,111 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div><br>
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<h4> Senarai Bayaran Atas Talian </h4>
<p><i class="fas fa-caret-right"></i> {{ $getkodcaw['caw_name'] }}</p>
<table class="table table-striped table-xl text-center" id="sahsagonline" 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 Pembayaran(RM)</th>
<th>Jumlah Bidaan(RM)</th>
<th class="text-center">Tindakan</th>
</tr>
</thead>
<tbody>
@foreach($listwinner as $winner)
<tr>
<td> {{ $loop->iteration }} </td>
<td class="text-left">{{ $winner['details']['name']}}</td>
<td>{{ $winner['details']['nokp']}}</td>
<td>{{ $winner['details']['notelbimbit']}}</td>
<td>{{ $winner['total_surat']}}</td>
<td>{{ number_format($winner['totalPay'], 2, '.', ',')}}</td>
<td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
<td>
<a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('account.senarailelongan') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablesahsagonline = $('#sahsagonline').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"orderable": false
}
],
order: [[0, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Cawangan',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
// $('.addcaw').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addcaw').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
</script>
@endsection
routes/web.php
+1
View File
@@ -424,6 +424,7 @@ Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'accoun
Route::get('/listbayaranonline/{lelong_id}/{kodcaw}', ['as'=>'account.listbayaranonline','uses'=>'AccountController@listbayaranonline']);
Route::get('/sahsagonline/{lelong_id}/{user_id}/{caw_code}', ['as'=>'account.sahsagonline','uses'=>'AccountController@sahsagonline']);
Route::post('/sahbayaronline', ['as'=>'account.sahbayaronline','uses'=>'AccountController@sahbayaronline']);
Route::get('/listbayaranonlinehome', ['as'=>'account.listbayaranonlinehome','uses'=>'AccountController@listbayaranonlinehome']);
});