From b1802554823da6d6ead110bc745b32541b9713ba Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 17 Nov 2022 17:02:49 +0800 Subject: [PATCH] update design table --- app/Http/Controllers/PaymentController.php | 9 ++++- app/Http/Controllers/PembidaController.php | 8 +++- .../views/pembayaran/SAGBidItem.blade.php | 17 ++++++--- .../pembayaran/kaunterpembayaran.blade.php | 33 ++++++++++------ .../pembayaran/senarailelongbayaran.blade.php | 19 ++++++++-- .../listkebenaranbayarantunai.blade.php | 19 +++++++--- .../pembida/senaraipemenangbycaw.blade.php | 38 ++++++++++++------- 7 files changed, 100 insertions(+), 43 deletions(-) diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index b238817a..4478f92f 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -47,8 +47,10 @@ class PaymentController extends Controller array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); // dd($detailsinfo); } + $datacaw = Cawangan::where('caw_code','=', $user->kodcaw) + ->get(); - return view('pembayaran.senarailelongbayaran',compact('lelong', 'arrayinfo')); + return view('pembayaran.senarailelongbayaran',compact('datacaw','lelong', 'arrayinfo')); } @@ -111,7 +113,10 @@ class PaymentController extends Controller } - return view('pembayaran.kaunterpembayaran',compact('listwinner','lelong_id')); + $datacaw = Cawangan::where('caw_code','=', $user->kodcaw) + ->get(); + + return view('pembayaran.kaunterpembayaran',compact('datacaw','listwinner','lelong_id')); } diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 4b0856fc..881d44c8 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -485,8 +485,10 @@ class PembidaController extends Controller array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); } // dd($request->kodcaw); + $datacaw = Cawangan::where('caw_code','=',$kodcaw) + ->get(); - return view('pembida.listkebenaranbayarantunai',compact('lelong','arrayinfo')); + return view('pembida.listkebenaranbayarantunai',compact('datacaw','lelong','arrayinfo')); } // public function senaraipemenangbycaw(Request $request, $lelong_id){ @@ -596,9 +598,11 @@ class PembidaController extends Controller $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment']; } + $datacaw = Cawangan::where('caw_code','=',$caw_code) + ->get(); // return view('pembayaran.kaunterpembayaran',compact('listwinner','lelong_id')); - return view('pembida.senaraipemenangbycaw',compact('listwinner','lelong_id','caw_code')); + return view('pembida.senaraipemenangbycaw',compact('datacaw','listwinner','lelong_id','caw_code')); } diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 4b50df8d..d5e4573b 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -10,7 +10,7 @@
- Cawangan : @foreach($datacaw as $data1) + Senarai SAG : @foreach($datacaw as $data1) {{$data1['caw_name']}} @endforeach
@@ -74,7 +74,7 @@ - +
@@ -130,20 +130,25 @@
No
- @if($statuspayment->opencash == '1') + {{-- {{dd($statuspayment->status_payment)}} --}} + @if($statuspayment->opencash == '1' && $statuspayment->status_payment == NULL)
{{-- Kembali --}} {{-- --}}
- @elseif($statuspayment->opencash == '0') + @elseif($statuspayment->opencash == '0' && $statuspayment->status_payment == NULL)

Sila Hubungi Operasi Untuk Kebenaran

+ @elseif($statuspayment->opencash == '1' && $statuspayment->status_payment == '1') +
+ +
@endif -
+ {{--
Kembali -
+
--}} diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index 52c62eec..a36f4e38 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -4,6 +4,7 @@
+
@if ($message = Session::get('success'))
@@ -14,8 +15,18 @@

{{ $message }}

@endif -

Senarai Bayaran Pemenang

- + {{--

Senarai Bayaran Pemenang

--}} +
+ + + +
+ Senarai Bayaran Pemenang : @foreach($datacaw as $data1) + {{$data1['caw_name']}} + @endforeach +
+
+
@@ -28,7 +39,7 @@ - + {{-- --}} @@ -36,7 +47,7 @@ @foreach($listwinner as $winner) - + @@ -49,31 +60,31 @@ @endif - - - + --}} @endforeach
NoStatus Bayaran Penyata Bayaran Slip SerahanResit PembayaranResit PembayaranTindakan
{{ $loop->iteration }} {{ $winner['details']['name']}}{{ $winner['details']['name']}} {{ $winner['details']['nokp']}} {{ $winner['details']['notelbimbit']}} {{ $winner['total_surat']}} + + + {{-- - {{-- @if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) ) --}} - + {{-- @endif --}}
-
+ {{--
Kembali -
+
--}}
diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php index 587386c1..de2398d9 100644 --- a/resources/views/pembayaran/senarailelongbayaran.blade.php +++ b/resources/views/pembayaran/senarailelongbayaran.blade.php @@ -10,13 +10,24 @@

{{ $message }}

@endif -

Senarai Lelong

+
+
+
+ + + +
+ Senarai Lelong : @foreach($datacaw as $data1) + {{$data1['caw_name']}} + @endforeach +
+
- + {{-- --}} @@ -28,11 +39,11 @@ - + --}}
No ID LelongCawanganCawanganFasa Tarikh Lelong Status Lelong
{{$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'] ); diff --git a/resources/views/pembida/listkebenaranbayarantunai.blade.php b/resources/views/pembida/listkebenaranbayarantunai.blade.php index 8bae945e..21086f50 100644 --- a/resources/views/pembida/listkebenaranbayarantunai.blade.php +++ b/resources/views/pembida/listkebenaranbayarantunai.blade.php @@ -1,17 +1,26 @@ @extends('layouts.app') @section('content') -
-
+
+
+ {{--
--}} @if ($message = Session::get('success'))

{{ $message }}

@endif -

KEBENARAN BAYARAN TUNAI

- +
+
+ + + +
+ Kebenaran Bayaran Tunai +
+
+
@@ -37,7 +46,7 @@ @endphp
No @foreach($lel['detailsinfo'] as $details) - + {{ $details['caw_name']}}
@endforeach diff --git a/resources/views/pembida/senaraipemenangbycaw.blade.php b/resources/views/pembida/senaraipemenangbycaw.blade.php index 1653e9d6..5c11ea8f 100644 --- a/resources/views/pembida/senaraipemenangbycaw.blade.php +++ b/resources/views/pembida/senaraipemenangbycaw.blade.php @@ -4,21 +4,33 @@
-
+
+
+ {{--
--}} @if ($message = Session::get('success'))

{{ $message }}

@endif -
-

Senarai Bayaran Pemenang

- +
+
+ + + +
+ Senarai Pemenang : @foreach($datacaw as $data1) + {{$data1['caw_name']}} + @endforeach +
+
+
+ {{--
--}} + {{--
--}} +
- + @@ -35,13 +47,13 @@ @foreach($listwinner as $winner) - + - --}} - @endforeach
NoNamaNama No Kad Pengenalan No Telefon Bilangan Surat
{{ $loop->iteration }} {{ $winner['details']['name']}}{{ $winner['details']['name']}} {{ $winner['details']['nokp']}} {{ $winner['details']['notelbimbit']}} {{ $winner['total_surat']}} {{ number_format($winner['totalBid'], 2, '.', ',')}} {{ number_format($winner['totalPay'], 2, '.', ',')}} + @if($winner['totalPay'] < $winner['totalBid']) @elseif($winner['totalPay'] == $winner['totalBid']) @@ -59,16 +71,16 @@ - + +
-
+ {{--
Kembali -
+
--}}