From c815963fda505d9cc61f8d68d5615ff109b74e2a Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 26 Oct 2022 16:40:40 +0800 Subject: [PATCH] add function sah pada home account --- app/Http/Controllers/AccountController.php | 220 +++++++++++++----- app/Http/Controllers/HomeController.php | 70 +++++- public/img/new.gif | Bin 0 -> 1402 bytes .../views/account/sahsagonline.blade.php | 41 ++-- resources/views/home.blade.php | 55 ++++- .../views/home/listbayaranonline.blade.php | 111 +++++++++ routes/web.php | 1 + 7 files changed, 427 insertions(+), 71 deletions(-) create mode 100644 public/img/new.gif create mode 100644 resources/views/home/listbayaranonline.blade.php diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index cf2aa4b0..914f7efb 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -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')); } } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index d8c16467..6c162dc0 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -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')); } diff --git a/public/img/new.gif b/public/img/new.gif new file mode 100644 index 0000000000000000000000000000000000000000..011786bb45b68be07cd2cddba36057633f305bc9 GIT binary patch literal 1402 zcmZ?wbhEHbRA3NbXlED&qaiS&LqPFAx1VcBu(M-;tC5}oGb1oC6o0aCrZDg`=zszS zluep}^nNhj52p45dHeStIB=k$q2WJJ{6E8gFa@N6EFfSh|8R2VvNhL}PFMaCXS2KS z)^~Sn$jMuqyw7aQuDVpQ=heErHj{Y;8h=(MF)#$p%u$-Jaek6#tlpIH`4dZW)pm#K z>;KwlwLf^v>EL%wchla4ZE~(ZTArgTs`Bf&nSQNfOO(E>s=I-{QL0j)N>F!<^aL|0 zk(o1O1*zfoRCKq;hOO21oEsT+YerAjJi(*ad3-`nB#+c= z=PusnTCUYm=U2?GO)Hhszjmt5xAMb0{mA0^QAra|sWN>nY^Z56%_t}>(gV5l-}{h^ z%wh$1PdA0M%$!t(^2B0=#Ny)A+@ze;6ovB4k_@n%bADcNNl|HXNoIbYLU3w{LRwLN zt`#pAFPCFZaz<)yrGjr}UP^g>QFgI{XI`=%FIRw`zn+3qeuaXmfdMa%@=FvF x3kp&bixe{Rz|JgING?iEEP=T&QK2X`J+rtZwFoFumReK{a%FxRR+lqa0{}cP?STLQ literal 0 HcmV?d00001 diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php index 06f89df2..f0d219d1 100644 --- a/resources/views/account/sahsagonline.blade.php +++ b/resources/views/account/sahsagonline.blade.php @@ -19,16 +19,17 @@

Nama Pembida : {{ $userdetails['name'] }}

No Kad Pengenalan : {{ $userdetails['nokp'] }}

No Telefon : {{ $userdetails['notelbimbit'] }}

+ {{--

No Resit: {{ $noresit['reference_no'] }}

--}} - +
- @csrf + @csrf - + {{-- @@ -40,8 +41,8 @@ - - + --}} + {{-- @foreach($senaraisag as $sag) @@ -63,34 +64,48 @@ @endforeach - + --}} + + + + + + + + + + - + {{-- + --}}
No No RujukanNota Status
{{ $loop->iteration }}
No.Resit{{ $noresit['reference_no'] }}
Jumlah Bayaran RM{{ number_format($senaraisag->sum('hargabida'), 2, '.', ',') }} + TELAH DIBAYAR + @if($getresit) @else @endif -
-
+ +
{{-- Kembali --}} {{-- @foreach($senaraisag as $senarai) --}} - @if($sag['checking_payment']) + {{-- @if($sag['checking_payment']) - @else - - @endif + @else --}} + + {{-- @endif --}} {{-- @endforeach --}}
+
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index e9e8518f..036a28fb 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -321,7 +321,60 @@ @endhasrole @hasrole('account') - I am a account! + I am a account!
+ @if(count($arrayinfoaccount)> 0) + PENGESAHAN BAYARAN ONLINE + + + + + + + {{-- --}} + + + + + + + @foreach($arrayinfoaccount as $data) + + + + + + {{-- --}} + + + + @endforeach + +
NoID LelongTarikh LelongCawanganNamaFasaStatus Lelong
{{ $loop->iteration }}{{ $data['detail']['lelong_id']}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $data['detail']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + @foreach($data['detailsinfo'] as $details) + {{-- --}} + {{ $details['caw_name']}}
+ + @endforeach + @foreach($data['listwinner'] as $details) + + {{ $details['caw_name']}} {{$details['nama']}}description of myimage
+ @endforeach + 		+ @foreach($data['listwinner'] as $details) + + {{ $details['caw_name']}} {{$details['nama']}}
+ @endforeach + + 		{{ $data['detail']['fasa'] }} + @if($data['detail']['sts_lelong'] == 3) + + @endif +
+ @endif @endhasrole @hasrole('pembida') I am a pembida! diff --git a/resources/views/home/listbayaranonline.blade.php b/resources/views/home/listbayaranonline.blade.php new file mode 100644 index 00000000..08015fcb --- /dev/null +++ b/resources/views/home/listbayaranonline.blade.php @@ -0,0 +1,111 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif +

Senarai Bayaran Atas Talian

+

{{ $getkodcaw['caw_name'] }}

+ + + + + + + + + + + + + + + @foreach($listwinner as $winner) + + + + + + + + + + + @endforeach + +
NoNamaNo Kad PengenalanNo TelefonBilangan SuratJumlah Pembayaran(RM)Jumlah Bidaan(RM)Tindakan
{{ $loop->iteration }} {{ $winner['details']['name']}}{{ $winner['details']['nokp']}}{{ $winner['details']['notelbimbit']}}{{ $winner['total_surat']}}{{ number_format($winner['totalPay'], 2, '.', ',')}}{{ number_format($winner['totalBid'], 2, '.', ',')}} + +
+
+ Kembali +
+
+
+
+ + + +@endsection + diff --git a/routes/web.php b/routes/web.php index 6aff15fa..a30bb92c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -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']); });