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

Merge branch 'atie' into 'main'

Browse Source 
update laporan lelong

See merge request online-sistem1/lelong!420
This commit is contained in:
Nur Izzati Zulkifli
2023-03-22 01:29:08 +00:00
parent 848bccd97b 35d108629e
commit 0179d1d66e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ReportCawanganController.php
+2 -2
View File
@@ -329,7 +329,7 @@ class ReportCawanganController extends Controller
->where('lelongbid.lelong_id','=',$lelong_id)
->where('lelongbid.kodcaw','=',$user['kodcaw'])
->where('lelongbidder.status_bidder','=','1')
->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan',
->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.bakiupah',
'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder')
->get()->toArray();
@@ -339,7 +339,7 @@ class ReportCawanganController extends Controller
$total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun'];
$total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman'];
$total_upahsimpan = $total_upahsimpan + $laplelong['upahsimpan'];
$total_upahsimpan = $total_upahsimpan + $laplelong['bakiupah'];
$total_cajlelong = $total_cajlelong + $laplelong['cajlelong'];
$total_hargalelong = $total_hargalelong + $laplelong['hargabida'];
$total_bakirugi = $total_bakirugi + $laplelong['baki'];
resources/views/pdf/laporanlelfullcaw.blade.php
+1 -1
View File
@@ -180,7 +180,7 @@ tr:nth-child(even) {
<td align="right">{{ number_format($laporan['nilaimarhun'], 2, '.', ',')}}</td>
<td align="right">{{ number_format($laporan['pinjaman'], 2, '.', ',')}}</td>
<td align="right">{{ number_format($laporan['margin'], 2, '.', ',')}}</td>
<td align="right">{{ number_format($laporan['upahsimpan'], 2, '.', ',')}}</td>
<td align="right">{{ number_format($laporan['bakiupah'], 2, '.', ',')}}</td>
<td align="right">{{ number_format($laporan['cajlelong'], 2, '.', ',')}}</td>
<td align="right">{{ number_format($laporan['hargabida'], 2, '.', ',')}}</td>
<?php