KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'nisha' into 'main'

Browse Source 
update code tangguhlelong

See merge request online-sistem1/lelong!224
This commit is contained in:
Nur Izzati Zulkifli
2022-10-13 04:54:52 +00:00
parent 3398102112 b398e860fc
commit 16dc08284d
2 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TangguhLelongController.php
+20 -3
View File
@@ -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()
resources/views/pdf/brgtangguhlelong.blade.php
+21 -7
View File
@@ -153,9 +153,11 @@
<tr>
<td width="15%">Alamat Pelanggan</td>
<td width="1%">:</td>
<td width="23%">{{ strtoupper($borang['nama']['alamat1']) }} <br>
{!! ($borang['nama']['alamat2'] === null || $borang['nama']['alamat2'] === '') ? '' : '<br>' . strtoupper($borang['nama']['alamat2']) !!} <br>
{{ ' ' . $borang['nama']['poskod'] . ' ' . strtoupper($borang['nama']['namadaerah']) . ' ' . strtoupper($borang['nama']['negeri'])}}</td>
<td width="23%">{{ strtoupper($borang['nama']['alamat1']) }}
{{-- {!! ($borang['nama']['alamat1'] === null || $borang['nama']['alamat1'] === '') ? '' : '<br>' . strtoupper($borang['nama']['alamat1']) !!} <br> --}}
{!! ($borang['nama']['alamat2'] === null || $borang['nama']['alamat2'] === '') ? '' : '<br>' . strtoupper($borang['nama']['alamat2']) !!} <br>
{{ ' ' . $borang['nama']['poskod'] . ' ' . strtoupper($borang['nama']['namadaerah']) . ' ' . strtoupper($borang['nama']['negeri'])}}</td>
<td></td>
<td width="15%">Alamat Baru <br> (sekiranya ada perubahan)</td>
<td width="1%">:</td>
@@ -278,7 +280,7 @@
<td>............................</td>
<td colspan="4"></td>
</tr>
<tr><u>Pengesahan / Komen</u></tr>
<tr colspan="7"><u>Pengesahan / Komen</u></tr>
<tr>
<td>Penilai</td>
<td>:</td>
@@ -297,14 +299,19 @@
<td></td>
<td>_______________________________</td>
</tr>
<tr></tr>
<tr>
<td></td>
<td></td>
<td>............................<br> (nama Penilai)</td>
@foreach($roles_harian_penilai as $penilai)
<td>............................<br> {{ $penilai['name'] }}</td>
@endforeach
<td></td>
<td></td>
<td></td>
<td>............................<br> (nama Khazanah)</td>
@foreach($roles_harian_khazanah as $khazanah)
<td>............................<br> {{ $khazanah['name'] }}</td>
@endforeach
</tr>
<tr>
<td>PC</td>
@@ -324,10 +331,17 @@
<td></td>
<td></td>
</tr>
<tr></tr>
<tr>
<td></td>
<td></td>
<td>............................<br> (nama PC)</td>
@if(empty($roles_harian_pc))
<td>............................<br> (Nama PC)</td>
@else
@foreach($roles_harian_pc as $pc)
<td>............................<br> {{ $pc['name'] }}</td>
@endforeach
@endif
<td></td>
<td></td>
<td></td>