Merge branch 'atie' into 'main'

update buang nilai marhun dlm pdfcajrugilelong

See merge request online-sistem1/lelong!415
This commit is contained in:
Nur Izzati Zulkifli
2023-03-15 06:12:40 +00:00
@@ -153,7 +153,7 @@
{{-- <th>Nama Pelanggan</th> --}} {{-- <th>Nama Pelanggan</th> --}}
<th>Tempoh</th> <th>Tempoh</th>
<th>Berat (gm)</th> <th>Berat (gm)</th>
<th>Nilai Marhun Asal (RM)</th> {{-- <th>Nilai Marhun Asal (RM)</th> --}}
<th>Pembiayaan (RM)</th> <th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th> <th>Keuntungan (RM)</th>
<th>Harga Asas (RM)</th> <th>Harga Asas (RM)</th>
@@ -177,7 +177,7 @@
{{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']['nama']}}</td> --}} {{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']['nama']}}</td> --}}
<td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td> <td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td> <td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td> {{-- <td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td> --}}
<td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td> <td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
<td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td> <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
{{-- <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td> --}} {{-- <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td> --}}
@@ -226,7 +226,7 @@
<tr> <tr>
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td> <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td> <td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td> {{-- <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td> --}}
<td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td> <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td> <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td> <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>