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

Merge branch 'atie' into 'main'

Browse Source 
update butiran brg lelong op n caw

See merge request online-sistem1/lelong!328
This commit is contained in:
Nur Izzati Zulkifli
2022-12-10 15:57:13 +00:00
parent 0b3ae0ea96 5b2feb3e14
commit d57c53687c
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ReportController.php
+3 -5
View File
@@ -93,7 +93,7 @@ class ReportController extends Controller
->find($lelong_id);
$cawangan = $test->cawangan
->where('caw_code','=',$kodcaw);
->where('caw_code','=',$kodcaw)->first();
// dd($cawangan[0]['caw_name']);
$lelong_bid = $test->lelongBid
@@ -197,19 +197,17 @@ class ReportController extends Controller
$lelongs[$index1]['detailmarhun']=$marhun;
}
array_push($arraycaw,[
'berat'=>$berat,
'harga'=>$harga,
'n_marhun'=>$nilai_marhun,
'hargaasas'=>$hargaasas
'hargaasas'=>$hargaasas,
]);
$pdf = PDF::loadView('pdf.listlelongdetails',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo','nilai_marhun'
$pdf = PDF::loadView('pdf.listlelongdetails',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo'
))->setPaper('a4', 'potrait');
return $pdf->download('Senarai Lelong Details.pdf');
resources/views/pdf/laporanbrgleldetailscaw.blade.php
+5 -1
View File
@@ -167,6 +167,7 @@ tr:nth-child(even) {
@foreach ($lelongs as $marhun)
@php $nilaimarhun = 0; @endphp
<tr>
<td>{{ $loop->iteration }} </td>
<td>{{ $marhun['norujukan'] }}</td>
@@ -183,6 +184,9 @@ tr:nth-child(even) {
{{ $item['harga'] }}<br>
@endforeach</td>
<td align="right">@foreach ($marhun['detailmarhun'] as $item)
@php
$nilaimarhun += $item['n_marhun'];
@endphp
{{ number_format($item['n_marhun'], 2, '.', ',') }}<br>
@endforeach</td>
<td align="right">@foreach ($marhun['detailmarhun'] as $item)
@@ -199,7 +203,7 @@ tr:nth-child(even) {
<td colspan="4" align="left"></td>
<td align="right"><b>{{ number_format($marhun['berat'], 2, '.', ',') }}</b></td>
<td></td>
<td align="right"><b>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</b></td>
<td align="right"><b>{{ number_format($nilaimarhun, 2, '.', ',') }}</b></td>
<td align="right"><b>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</b></td>
<td></td>
</tr>
resources/views/pdf/listlelong.blade.php
+1 -1
View File
@@ -92,7 +92,7 @@ tr:nth-child(even) {
<br>
<tr>
<td>Batch Lelong: {{$test['id']}}</td>
<td>Cawangan : {{$cawangan[0]['caw_name']}}
<td>Cawangan : {{$cawangan['caw_name']}}
<tr>
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $test['tarikh_lelong'] );
resources/views/pdf/listlelongdetails.blade.php
+6 -2
View File
@@ -163,9 +163,10 @@ tr:nth-child(even) {
</tr>
</thead>
@foreach ($lelongs as $marhun)
@php $nilaimarhun = 0; @endphp
<tr>
<td>{{ $loop->iteration }} </td>
<td>{{ $marhun['norujukan'] }}</td>
@@ -182,6 +183,9 @@ tr:nth-child(even) {
{{ $item['harga'] }}<br>
@endforeach</td>
<td align="right">@foreach ($marhun['detailmarhun'] as $item)
@php
$nilaimarhun += $item['n_marhun'];
@endphp
{{ number_format($item['n_marhun'], 2, '.', ',') }}<br>
@endforeach</td>
<td align="right">@foreach ($marhun['detailmarhun'] as $item)
@@ -198,7 +202,7 @@ tr:nth-child(even) {
<td colspan="4" align="left"></td>
<td align="right"><b>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
<td></td>
<td align="right"><b>{{ number_format($marhun['nmarhuns'], 2, '.', ',') }}</td>
<td align="right"><b>{{ number_format($nilaimarhun, 2, '.', ',') }}</td>
<td align="right"><b>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
<td></td>
</tr>