From ee5d18381dd00cd35f1bea21d8af82bffd07737e Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Wed, 18 May 2022 00:42:22 +0800 Subject: [PATCH 1/2] butiran bidaan --- app/Http/Controllers/PembidaController.php | 12 ++- .../views/pembida/detailsbidaan.blade.php | 0 resources/views/pembida/kemaskini.blade.php | 2 +- .../views/pembida/pembayaranbidaan.blade.php | 97 ++++++++++--------- routes/web.php | 1 + 5 files changed, 59 insertions(+), 53 deletions(-) create mode 100644 resources/views/pembida/detailsbidaan.blade.php diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 230d6872..88f0b975 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -202,7 +202,7 @@ class PembidaController extends Controller ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $request->lelong_id) ->get(); - // dd($SAGWin); + // dd($userdetails); foreach($SAGWin as $index2=>$sag) { @@ -232,17 +232,19 @@ class PembidaController extends Controller $listwinner[$index1]['total_surat'] = sizeof($SAGWin); $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); $listwinner[$index1]['totalPay'] = $total_payment; - $listwinner[$index1][$index2]['remarks'] = $detailspayment['remark']; - $listwinner[$index1][$index2]['status_payment'] = $sag->status_payment; - $listwinner[$index1][$index2]['status'] = $detailspayment['status']; + $listwinner[$index1]['paymentid'] = $payment_id; + $listwinner[$index1]['jenisbayaran']['remarks'] = $detailspayment['remark']; + $listwinner[$index1]['jenisbayaran']['status_payment'] = $sag->status_payment; + $listwinner[$index1]['jenisbayaran']['status'] = $detailspayment['status']; } return view('pembida.pembayaranbidaan',compact('listwinner')); } - public function detailsbidaan(Request $request) + public function detailsbidaan($user_id, $payment_id) { + dd($user_id); } diff --git a/resources/views/pembida/detailsbidaan.blade.php b/resources/views/pembida/detailsbidaan.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/resources/views/pembida/kemaskini.blade.php b/resources/views/pembida/kemaskini.blade.php index 013aa6df..fc5a595b 100644 --- a/resources/views/pembida/kemaskini.blade.php +++ b/resources/views/pembida/kemaskini.blade.php @@ -8,7 +8,7 @@

{{ $message }}

- @endif + @endif
@csrf diff --git a/resources/views/pembida/pembayaranbidaan.blade.php b/resources/views/pembida/pembayaranbidaan.blade.php index c51650ac..1d48405f 100644 --- a/resources/views/pembida/pembayaranbidaan.blade.php +++ b/resources/views/pembida/pembayaranbidaan.blade.php @@ -10,55 +10,58 @@

{{ $message }}

@endif - - +
+ + + + + + + + + + + + + + + + @foreach($listwinner as $index1=>$winner) - - - - - - - - - - + + + + + + + + + + - - - @foreach($listwinner as $index1=>$winner) - - - - - - - - - - - - - @endforeach - -
BilNama PembidaNo Kad PengenalanBilangan Surat Jumlah Bidaan (RM) Amaun Telah Dibayar (RM)Status PembayaranRemarkStatusAction
BilNama PembidaNo Kad PengenalanBilangan Surat Jumlah Bidaan (RM) Amaun Telah Dibayar (RM)Status PembayaranRemarkStatusAction{{ $loop->iteration }}{{ $winner['details']['name'] }}{{ $winner['details']['nokp'] }}{{ $winner['total_surat'] }}{{ $winner['totalBid'] }}{{ $winner['totalPay'] }} + @if($winner['jenisbayaran']['status'] == 1) + + @elseif($winner['jenisbayaran']['status'] == 2) + + @endif + + + + @if($winner['jenisbayaran']['status_payment'] == 1) + + @endif + + {{ dd($winner['paymentid']) }} + +
{{ $loop->iteration }}{{ $winner['details']['name'] }}{{ $winner['details']['nokp'] }}{{ $winner['total_surat'] }}{{ $winner['totalBid'] }}{{ $winner['totalPay'] }} - @if($winner[$index1]['status'] == 1) - - @elseif($winner[$index1]['status'] == 2) - - @endif - - - - @if($winner[$index1]['status_payment'] == 1) - - @endif - -
-
- Kembali -
- + @endforeach + + +
+ Kembali +
+ +
diff --git a/routes/web.php b/routes/web.php index 0f07ced7..fecda131 100644 --- a/routes/web.php +++ b/routes/web.php @@ -184,6 +184,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/{userid}/{paymentid}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']); }); Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () { From fc2279dbb89be6392fc96f4fb6df488b952884fb Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Tue, 24 May 2022 14:38:10 +0800 Subject: [PATCH 2/2] senarai payment by operasi --- app/Http/Controllers/PembidaController.php | 56 +++++++- .../views/pembida/detailsbidaan.blade.php | 135 ++++++++++++++++++ .../views/pembida/pembayaranbidaan.blade.php | 18 ++- .../views/pengesahan/senarailelong.blade.php | 2 +- routes/web.php | 2 +- 5 files changed, 204 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 88f0b975..9f53592c 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -14,6 +14,7 @@ use App\Models\File; use App\Models\Lelong; use App\Models\CawanganLelong; use App\Models\LelongBidder; +use App\Models\LelongBid; use App\Models\Payment; class PembidaController extends Controller @@ -232,20 +233,67 @@ class PembidaController extends Controller $listwinner[$index1]['total_surat'] = sizeof($SAGWin); $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); $listwinner[$index1]['totalPay'] = $total_payment; - $listwinner[$index1]['paymentid'] = $payment_id; + $listwinner[$index1]['payment_id'] = $payment_id; $listwinner[$index1]['jenisbayaran']['remarks'] = $detailspayment['remark']; $listwinner[$index1]['jenisbayaran']['status_payment'] = $sag->status_payment; $listwinner[$index1]['jenisbayaran']['status'] = $detailspayment['status']; } - return view('pembida.pembayaranbidaan',compact('listwinner')); + $kodcaw = $request->kodcaw; + + return view('pembida.pembayaranbidaan',compact('listwinner', 'kodcaw')); } - public function detailsbidaan($user_id, $payment_id) + public function detailsbidaan($user_id, $payment_id, $kodcaw) { - dd($user_id); + + $userdetail = User::where('id', $user_id)->first(); + + $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.status_payment', 1) + ->select('lelongbid.id as lelongbid_id', + 'lelongbidder.id as lelongbidder_id', + 'lelongbid.lelong_id', + 'lelongbidder.payment_id', + 'lelongbid.t_lelong', + 'cawangan.caw_name', + 'lelongbid.norujukan', + 'lelongbid.marhun', + 'lelongbid.hargaasas', + 'lelongbidder.hargabida', + 'lelongbid.nilaimarhun', + 'lelongbid.berat', + 'lelongbidder.masa_bidaan', + 'lelongbidder.notelbimbit' + ) + ->get(); + + foreach ($infos as $index1 => $info) + { + $butiranbidaan = Payment::join('resit', 'payment.resit_id', '=', 'resit.id') + ->where('payment.id', $info['payment_id']) + ->where('payment.lelong_id', $info['lelong_id']) + ->whereNotNull('payment.disahkan_oleh') + ->whereNotNull('payment.disahkan_pada') + ->select('payment.remark', + 'resit.reference_no' + ) + ->get(); + // dd($butiranbidaan); + + $infos[$index1]['info'] = $info; + // dd($infos[$index1]['info']); + $infos[$index1]['butiran_bidaan'] = $butiranbidaan; + // dd($infos[$index1]['butiran_bidaan']); + } + + return view('pembida.detailsbidaan', compact('infos', 'userdetail', 'kodcaw')); } } diff --git a/resources/views/pembida/detailsbidaan.blade.php b/resources/views/pembida/detailsbidaan.blade.php index e69de29b..889a3da2 100644 --- a/resources/views/pembida/detailsbidaan.blade.php +++ b/resources/views/pembida/detailsbidaan.blade.php @@ -0,0 +1,135 @@ +@extends('layouts.app') + +@section('content') +
+
+
+

Butiran Bidaan Pembida Yang Menang

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

{{ $message }}

+
+ @endif + +
+
+
+

Tarikh Lelong : {{ $infos[0]['t_lelong'] }}

+

Cawangan : {{ $infos[0]['caw_name'] }}

+

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

+

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

+

No Tel Bimbit : {{ $infos[0]['notelbimbit'] }}

+
+
+
+ + + + + + + + + + + + + + + + + @foreach($infos as $inf) + + + + + + + + + + + + + + @endforeach + +
BilNo RujukanMarhunHarga Asas (RM)Harga Bida (RM)Nilai Marhun (RM)Berat (gm)Masa BidaanKaedah PembayaranNo Resit
{{ $loop->iteration }}{{ $inf['info']['norujukan'] }}{{ $inf['info']['marhun'] }}{{ $inf['info']['hargaasas'] }}{{ $inf['info']['hargabida'] }}{{ $inf['info']['nilaimarhun'] }}{{ $inf['info']['berat'] }}{{ $inf['info']['masa_bidaan'] }} + @foreach($inf['butiran_bidaan'] as $butiran_bidaan) + {{ $butiran_bidaan['remark'] }} + @endforeach + + @foreach($inf['butiran_bidaan'] as $butiran_bidaan) + {{ $butiran_bidaan['reference_no'] }} + @endforeach +
+
+ Kembali +
+
+
+
+ + +@endsection diff --git a/resources/views/pembida/pembayaranbidaan.blade.php b/resources/views/pembida/pembayaranbidaan.blade.php index 1d48405f..74ea3941 100644 --- a/resources/views/pembida/pembayaranbidaan.blade.php +++ b/resources/views/pembida/pembayaranbidaan.blade.php @@ -50,8 +50,8 @@ @endif - {{ dd($winner['paymentid']) }} - + {{-- {{ dd($winner) }} --}} + @endforeach @@ -77,11 +77,23 @@ "orderable": false }, { + "targets": 6, + "orderable": false + }, + { "targets": 7, "orderable": false + }, + { + "targets": 8, + "orderable": false + }, + { + "targets": 9, + "orderable": false } ], - order: [[1, 'asc']], + order: [[0, 'asc']], "info": false, "lengthChange": false, "pageLength": 15, diff --git a/resources/views/pengesahan/senarailelong.blade.php b/resources/views/pengesahan/senarailelong.blade.php index ceae1024..ed711bc5 100644 --- a/resources/views/pengesahan/senarailelong.blade.php +++ b/resources/views/pengesahan/senarailelong.blade.php @@ -38,7 +38,7 @@ {{$lel['detail']['jbg']}} {{$lel['detail']['cajlelong']}} - + @endforeach diff --git a/routes/web.php b/routes/web.php index fecda131..a9757c0b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -184,7 +184,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/{userid}/{paymentid}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']); + Route::get('/detailsbidaan/{user_id}/{payment_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']); }); Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () {