From b398e860fcabfe9e3088f25a6cf32d59f3e4e2fd Mon Sep 17 00:00:00 2001 From: nishaMuhd Date: Thu, 13 Oct 2022 12:50:03 +0800 Subject: [PATCH] update code tangguhlelong --- .../Controllers/TangguhLelongController.php | 23 +++++++++++++-- .../views/pdf/brgtangguhlelong.blade.php | 28 ++++++++++++++----- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 0e2d5f87..c8086e19 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use Illuminate\Support\Facades\Http; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Carbon\Carbon; @@ -552,7 +553,7 @@ class TangguhLelongController extends Controller $history = TangguhLelong::where('lelongbid_id',$bidmarhun->id) ->first(); - //dd($bidmarhun->id); + //dd($bidmarhun->id); if($history) { @@ -592,13 +593,29 @@ class TangguhLelongController extends Controller $lelongbid[$index1]['nama'] = ($customer) ? $customer : dd($nokp); } + + //get staf cwgn roles harian + $roles_harian_penilai = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'penilai' + ])->json(); + + $roles_harian_khazanah = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'khazanah' + ])->json(); + + $roles_harian_pc = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'pc' + ])->json(); + + // dd($roles_harian_penilai,$roles_harian_khazanah,$roles_harian_pc); } // return view('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','t_mohon','nokp')); - $pdf = PDF::loadView('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp')) + $pdf = PDF::loadView('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc')) ->setPaper('a4', 'potrait'); - return $pdf->download('Borang Tangguh Lelong.pdf'); + return $pdf->download('Borang Tangguh Lelong '.$lelong_id.'.pdf'); + } public function sentangguh() diff --git a/resources/views/pdf/brgtangguhlelong.blade.php b/resources/views/pdf/brgtangguhlelong.blade.php index 10b5dc84..d0f63d6d 100644 --- a/resources/views/pdf/brgtangguhlelong.blade.php +++ b/resources/views/pdf/brgtangguhlelong.blade.php @@ -153,9 +153,11 @@ Alamat Pelanggan : - {{ strtoupper($borang['nama']['alamat1']) }}
- {!! ($borang['nama']['alamat2'] === null || $borang['nama']['alamat2'] === '') ? '' : '
' . strtoupper($borang['nama']['alamat2']) !!}
- {{ ' ' . $borang['nama']['poskod'] . ' ' . strtoupper($borang['nama']['namadaerah']) . ' ' . strtoupper($borang['nama']['negeri'])}} + {{ strtoupper($borang['nama']['alamat1']) }} + {{-- {!! ($borang['nama']['alamat1'] === null || $borang['nama']['alamat1'] === '') ? '' : '
' . strtoupper($borang['nama']['alamat1']) !!}
--}} + {!! ($borang['nama']['alamat2'] === null || $borang['nama']['alamat2'] === '') ? '' : '
' . strtoupper($borang['nama']['alamat2']) !!}
+ {{ ' ' . $borang['nama']['poskod'] . ' ' . strtoupper($borang['nama']['namadaerah']) . ' ' . strtoupper($borang['nama']['negeri'])}} + Alamat Baru
(sekiranya ada perubahan) : @@ -278,7 +280,7 @@ ............................ - Pengesahan / Komen + Pengesahan / Komen Penilai : @@ -297,14 +299,19 @@ _______________________________ + - ............................
(nama Penilai) + @foreach($roles_harian_penilai as $penilai) + ............................
{{ $penilai['name'] }} + @endforeach - ............................
(nama Khazanah) + @foreach($roles_harian_khazanah as $khazanah) + ............................
{{ $khazanah['name'] }} + @endforeach PC @@ -324,10 +331,17 @@ + - ............................
(nama PC) + @if(empty($roles_harian_pc)) + ............................
(Nama PC) + @else + @foreach($roles_harian_pc as $pc) + ............................
{{ $pc['name'] }} + @endforeach + @endif