From 82a83a5ccd379da1a5885f2bee4d0d1699135b07 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Tue, 5 Jul 2022 22:40:26 +0800 Subject: [PATCH] update status payment operasi dan acc --- app/Http/Controllers/AccountController.php | 21 ++-- app/Http/Controllers/PembidaController.php | 58 +++++---- app/Http/Controllers/SerahanController.php | 39 +++++- .../Controllers/TangguhLelongController.php | 2 +- .../views/account/sahsagonline.blade.php | 4 - .../views/pembida/detailsbidaan.blade.php | 18 +-- .../views/pembida/pembayaranbidaan.blade.php | 103 +++++++--------- .../pembida/senlelpembayaranbidaan.blade.php | 2 +- .../views/serahan/laporanserahan.blade.php | 77 ++++++------ resources/views/serahan/pembayaran.blade.php | 38 +++--- .../serahan/senarailelongbayaran.blade.php | 111 ++++++++++++++++++ routes/web.php | 4 +- 12 files changed, 306 insertions(+), 171 deletions(-) create mode 100644 resources/views/serahan/senarailelongbayaran.blade.php diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 7e323359..a8b454f0 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -66,15 +66,12 @@ class AccountController extends Controller ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbid.kodcaw', $kodcaw) - ->where('payment.status_payment_opt', 3) - ->orWhere('payment.status_payment_opt', 2) ->where('lelongbidder.status_payment', 2) ->whereNull('payment.disahkan_pada') - ->select('.lelongbidder.user_id' - ) + ->select('lelongbidder.user_id') ->groupBy('lelongbidder.user_id') ->get(); - + // dd($listwinner); foreach($listwinner as $index1=>$winner){ @@ -83,13 +80,13 @@ class AccountController extends Controller $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.kodcaw',$kodcaw) + ->where('lelongbid.kodcaw',$kodcaw) ->where('lelongbidder.status_bidder', 1) - ->where('payment.status_payment_opt', 3) - ->orWhere('payment.status_payment_opt', 2) ->where('lelongbid.lelong_id', $lelong_id) + // ->where('payment.status_payment_opt', 3) + // ->orWhere('payment.status_payment_opt', 2) ->get(); - // dd($SAGWin->sum('hargabida')); + // dd($SAGWin); $id_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('lelongbidder.user_id', $winner['user_id']) @@ -130,8 +127,8 @@ class AccountController extends Controller ->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('payment.status_payment_opt', 3) + // ->orWhere('payment.status_payment_opt', 2) ->where('lelongbidder.status_payment', 2) ->get()->toArray(); // dd($senaraisag); @@ -198,7 +195,7 @@ class AccountController extends Controller 'lelongbid.id as lelongbid_id', 'payment.id as payment_id', 'lelongbid.lelong_id', - 'lelongbidder.user_id', + 'lelongbidder.user_id' ) ->get(); diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 18f927e4..f73dfd9c 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -16,6 +16,9 @@ use App\Models\CawanganLelong; use App\Models\LelongBidder; use App\Models\LelongBid; use App\Models\Payment; +use App\Models\Cawangan; + + class PembidaController extends Controller { @@ -211,45 +214,56 @@ class PembidaController extends Controller public function pembayaranbidaan(Request $request) { // dd($request->all()); + $getkodcaw = Cawangan::where('caw_code', $request->kodcaw)->select('caw_name')->first(); $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $request->lelong_id) ->where('lelongbid.kodcaw', $request->kodcaw) - ->select('lelongbidder.user_id' - ) + ->select('lelongbidder.user_id') ->groupBy('lelongbidder.user_id') ->get()->toArray(); + // dd($listwinner); foreach($listwinner as $index1=>$winner) { $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.nopembeli', $winner['user_id']) + ->where('lelongbid.kodcaw', $request->kodcaw) ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $request->lelong_id) ->get(); - // dd($userdetails); + // dd($SAGWin); - foreach($SAGWin as $index2=>$sag) - { + // foreach($SAGWin as $index2=>$sag) + // { - $detailspayment = Payment::where('id', $sag->payment_id)->first(); - // dd($detailspayment); - } + // $detailspayment = Payment::where('id', $sag->payment_id)->first(); + // // dd($detailspayment); + // } - $payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - ->where('user_id', $winner['user_id']) + $payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbidder.user_id', $winner['user_id']) ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $request->lelong_id) - ->select('payment_id')->groupBy('payment_id')->get(); + ->where('lelongbid.kodcaw',$request->kodcaw) + ->select('lelongbidder.payment_id') + ->groupBy('lelongbidder.payment_id') + ->get(); + // dd($payment_id); $total_payment = 0; - foreach($payment_id as $id) + foreach($payment as $id) { $payment = Payment::where('id', $id->payment_id) ->first(); + // dd($payment); + + if($payment){ + $payment_id = $id->payment_id; $total_payment = $total_payment + $payment->total_payment; } } @@ -258,18 +272,19 @@ class PembidaController extends Controller $listwinner[$index1]['total_surat'] = sizeof($SAGWin); $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); $listwinner[$index1]['totalPay'] = $total_payment; - $listwinner[$index1]['payment_id'] = $payment_id; - $listwinner[$index1]['jenisbayaran']['status_payment'] = $sag->status_payment; - $listwinner[$index1]['jenisbayaran']['status'] = $detailspayment['status']; + } + $kodcaw = $request->kodcaw; - - return view('pembida.pembayaranbidaan',compact('listwinner', 'kodcaw')); + $lelong_id = $request->lelong_id; + $payment_id = $request->payment_id; + // dd($kodcaw); + return view('pembida.pembayaranbidaan',compact('listwinner','lelong_id', 'getkodcaw', 'kodcaw')); } - public function detailsbidaan($user_id, $payment_id, $kodcaw) + public function detailsbidaan($user_id, $kodcaw) { $userdetail = User::where('id', $user_id)->first(); @@ -277,8 +292,8 @@ class PembidaController extends Controller $infos = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') ->join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') ->where('lelongbidder.user_id', $user_id) - ->where('lelongbidder.payment_id', $payment_id) - ->where('cawangan.caw_code', $kodcaw) + // ->where('lelongbidder.payment_id', $payment_id) + ->where('lelongbid.kodcaw', $kodcaw) ->where('lelongbidder.status_payment', 1) ->select('lelongbid.id as lelongbid_id', 'lelongbidder.id as lelongbidder_id', @@ -294,6 +309,7 @@ class PembidaController extends Controller 'lelongbidder.notelbimbit' ) ->get(); + // dd($infos); foreach ($infos as $index1 => $info) { diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php index ab5e18a8..6b12b032 100644 --- a/app/Http/Controllers/SerahanController.php +++ b/app/Http/Controllers/SerahanController.php @@ -38,18 +38,45 @@ class SerahanController extends Controller public function laporanserahan() { - $user = Auth::user(); + // $user = Auth::user(); - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('cawangan.caw_code','=',$user->kodcaw) - ->get(); + // $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + // ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + // ->where('cawangan.caw_code','=',$user->kodcaw) + // ->get(); - return view('serahan.laporanserahan',compact('lelongid')); + // return view('serahan.laporanserahan',compact('lelongid')); + $arrayinfo = []; + + $user = Auth::user(); + + $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->select('lelong.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('serahan.laporanserahan',compact('lelong', 'arrayinfo')); + } public function pembayaran($lelong_id){ diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 60ad2c88..c4d4d6b1 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -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('fasa','lelong_id','cawangan.caw_code','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong.fasa','lelong_id','cawangan.caw_code','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->distinct() ->get() ->toArray(); diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php index d9d039bd..171c4939 100644 --- a/resources/views/account/sahsagonline.blade.php +++ b/resources/views/account/sahsagonline.blade.php @@ -79,11 +79,7 @@
{{-- Kembali --}} - @if($checking) - - @else - @endif
diff --git a/resources/views/pembida/detailsbidaan.blade.php b/resources/views/pembida/detailsbidaan.blade.php index 9f531df3..82fc6576 100644 --- a/resources/views/pembida/detailsbidaan.blade.php +++ b/resources/views/pembida/detailsbidaan.blade.php @@ -3,9 +3,11 @@ @section('content')
-
-

Butiran Bidaan Pembida Yang Menang

+
+
@if ($message = Session::get('failed'))

{{ $message }}

@@ -13,7 +15,7 @@ @endif
-
+
@@ -42,8 +44,8 @@ - - + +
{{ $loop->iteration }} {{ $inf['info']['norujukan'] }} {{ $inf['info']['marhun'] }}{{ $inf['info']['hargaasas'] }}{{ $inf['info']['hargabida'] }}{{ number_format($inf['info']['hargaasas'], 2, '.', ',') }}{{ number_format($inf['info']['hargabida'], 2, '.', ',') }} {{ $inf['info']['masa_bidaan'] }} @foreach($inf['butiran_bidaan'] as $butiran_bidaan) @@ -60,9 +62,7 @@ @endforeach
-
- Kembali -
+
diff --git a/resources/views/pembida/pembayaranbidaan.blade.php b/resources/views/pembida/pembayaranbidaan.blade.php index ac6312e5..02d39940 100644 --- a/resources/views/pembida/pembayaranbidaan.blade.php +++ b/resources/views/pembida/pembayaranbidaan.blade.php @@ -5,88 +5,65 @@
+
@if ($message = Session::get('success'))

{{ $message }}

@endif - - - - - - - - - - - - - - - - @foreach($listwinner as $index1=>$winner) +

Senarai Pembayaran Bidaan

+

{{ $getkodcaw['caw_name'] }}

+
BilNama PembidaNo Kad PengenalanBilangan Surat Jumlah Bidaan (RM) Amaun Telah Dibayar (RM)Status PembayaranStatusTindakan
+ - - - - - - - - - + + + + + + + + - @endforeach - -
{{ $loop->iteration }}{{ $winner['details']['name'] }}{{ $winner['details']['nokp'] }}{{ $winner['total_surat'] }}{{ number_format($winner['totalBid'], 2, '.', ',') }}{{ number_format($winner['totalPay'], 2, '.', ',') }} - @if($winner['jenisbayaran']['status'] == 1) - - @elseif($winner['jenisbayaran']['status'] == 2) - - @endif - - @if($winner['jenisbayaran']['status_payment'] == 1) - - @endif - - {{-- {{ dd($winner) }} --}} - - NoNamaNo Kad PengenalanNo TelefonBilangan SuratJumlah Pembayaran(RM)Jumlah Bidaan(RM)Maklumat
-
- Kembali -
-
- + + + @foreach($listwinner as $winner) + + {{ $loop->iteration }} + {{ $winner['details']['name']}} + {{ $winner['details']['nokp']}} + {{ $winner['details']['notelbimbit']}} + {{ $winner['total_surat']}} + {{ number_format($winner['totalPay'], 2, '.', ',')}} + {{ number_format($winner['totalBid'], 2, '.', ',')}} + + + + + @endforeach + + +
-@endsection \ No newline at end of file +@endsection + diff --git a/resources/views/pembida/senlelpembayaranbidaan.blade.php b/resources/views/pembida/senlelpembayaranbidaan.blade.php index ae6bf044..4e6a577e 100644 --- a/resources/views/pembida/senlelpembayaranbidaan.blade.php +++ b/resources/views/pembida/senlelpembayaranbidaan.blade.php @@ -21,7 +21,7 @@ Tempoh Caj Lelong Status Lelong - Tindakan + diff --git a/resources/views/serahan/laporanserahan.blade.php b/resources/views/serahan/laporanserahan.blade.php index 751d8328..fdb803f9 100644 --- a/resources/views/serahan/laporanserahan.blade.php +++ b/resources/views/serahan/laporanserahan.blade.php @@ -1,53 +1,64 @@ @extends('layouts.app') @section('content') +
- @if ($message = Session::get('success')) + @if ($message = Session::get('success'))

{{ $message }}

- @endif -
- - - - - - - - - - - - - @foreach ($lelongid as $bid) - - - - - - + @endif +

Senarai Lelong

+
ID LelongTarikh LelongTindakan
{{ $bid->lelong_id}}{{ $bid->tarikh_lelong }} - -
+ + + + + + + + + + + + + @foreach($arrayinfo as $data) + + + + - -
NoID LelongCawanganFasaTarikh LelongStatus LelongTindakan
{{$loop->iteration}}{{ $data['info']['lelong_id'] }} + @foreach($data['detailsinfo'] as $details) + {{$details['caw_name']}}
@endforeach -
-
+ + {{ $data['info']['fasa'] }} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $data['info']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + + @if($data['info']['sts_lelong'] == 3) + + @endif + + + + @endforeach + +
-
-@endsection +@endsection \ No newline at end of file diff --git a/resources/views/serahan/pembayaran.blade.php b/resources/views/serahan/pembayaran.blade.php index 997420f7..5ac7c310 100644 --- a/resources/views/serahan/pembayaran.blade.php +++ b/resources/views/serahan/pembayaran.blade.php @@ -25,11 +25,11 @@ @foreach($payment as $pay) {{ $loop->iteration }} - {{ $pay['details']['name']}} + {{ $pay['details']['name']}} {{ $pay['details']['nokp']}} {{ $pay['details']['notelbimbit']}} {{ $pay['total_surat']}} - {{ $pay['totalBid']}} + {{ number_format($pay['totalBid'], 2, '.', ',')}} {{-- --}} @@ -89,7 +89,7 @@ "orderable": false } ], - order: [[1, 'asc']], + order: [[1, 'desc']], // "ordering": false, "info": false, "lengthChange": false, @@ -98,22 +98,22 @@ buttons: [ // 'copy', 'excel', 'pdf' // { text: 'copy', className: 'btn btn-primary' }, - { - className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim', - text: '', - titleAttr: 'Tambah Simulasi', - action: function ( e, dt, node, config ) { - alert( 'Button activated' ); - } - }, - { - className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', - titleAttr: 'Export to CSV', - text: '', - action: function ( e, dt, node, config ) { - $("#exportform").submit(); - } - } + // { + // className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim', + // text: '', + // titleAttr: 'Tambah Simulasi', + // action: function ( e, dt, node, config ) { + // alert( 'Button activated' ); + // } + // }, + // { + // className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', + // titleAttr: 'Export to CSV', + // text: '', + // action: function ( e, dt, node, config ) { + // $("#exportform").submit(); + // } + // } ] }); diff --git a/resources/views/serahan/senarailelongbayaran.blade.php b/resources/views/serahan/senarailelongbayaran.blade.php new file mode 100644 index 00000000..587386c1 --- /dev/null +++ b/resources/views/serahan/senarailelongbayaran.blade.php @@ -0,0 +1,111 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif +

Senarai Lelong

+ + + + + + + + + + + + + + @foreach($arrayinfo as $data) + + + + + + + + + + @endforeach + +
NoID LelongCawanganFasaTarikh LelongStatus LelongTindakan
{{$loop->iteration}}{{ $data['info']['lelong_id'] }} + @foreach($data['detailsinfo'] as $details) + {{$details['caw_name']}}
+ @endforeach + 		{{ $data['info']['fasa'] }}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $data['info']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + @if($data['info']['sts_lelong'] == 3) + + @endif +
+
+
+
+ + + +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 663df8bd..e02b62dc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -226,7 +226,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::post('/update',['as'=>'pembida.update','uses'=>'PembidaController@update']); Route::get('/senlelpembayaranbidaan',['as'=>'pembida.senlelpembayaranbidaan','uses'=>'PembidaController@senlelpembayaranbidaan']); Route::get('/pembayaranbidaan',['as'=>'pembida.pembayaranbidaan','uses'=>'PembidaController@pembayaranbidaan']); - Route::get('/detailsbidaan/{user_id}/{payment_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']); + Route::get('/detailsbidaan/{user_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']); }); @@ -270,7 +270,7 @@ Route::group(['middleware' => ['permission:tetapan'],'prefix'=>'tetapan'], funct Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () { Route::get('/laporanserahan',['as'=>'serahan.laporanserahan','uses'=>'SerahanController@laporanserahan']); - Route::get('/pembayaran/{id}',['as'=>'serahan.pembayaran','uses'=>'SerahanController@pembayaran']); + Route::get('/pembayaran/{lelong_id}',['as'=>'serahan.pembayaran','uses'=>'SerahanController@pembayaran']); Route::get('/penyatabayaran/{user_id}/{lelong_id}',['as'=>'serahan.penyatabayaran','uses'=>'SerahanController@penyatabayaran']); Route::get('/resitpembayaran/{user_id}/{lelong_id}',['as'=>'serahan.resitpembayaran','uses'=>'SerahanController@resitpembayaran']); Route::get('/senaraibid/{user_id}/{lelong_id}',['as'=>'serahan.senaraibid','uses'=>'SerahanController@senaraibid']);