Merge branch 'main' of https://bitbucket.org/arrahn-pkb/lelong into izzati-ujrah

This commit is contained in:
Nur Izzati Zulkifli
2023-12-26 21:51:05 +08:00
3 changed files with 56 additions and 23 deletions
@@ -49,11 +49,13 @@
<th>Cawangan</th>
<th>Bil Lelong</th>
<th>Berat (gm)</th>
<th>Nilai Marhun Asal(RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Harga Jual (RM)</th>
<th>Caj Lelong (RM)</th>
<th>Baki Lelong (RM)</th>
<th>Rugi Lelong (RM)</th>
{{-- <th class="text-center">Tindakan</th> --}}
</tr>
</thead>
@@ -69,11 +71,14 @@
<td style="white-space: nowrap;">{{ $send['caw_name'] }}</td>
<td>{{ $send['bil_lelong'] }} </td>
<td>{{ number_format($send['total_berat'], 2) }} </td>
<td>{{ number_format($send['total_nilaimarhun'], 2) }} </td>
<td>{{ number_format($send['total_pembiayaan'], 2) }} </td>
<td>{{ number_format($send['total_bakiupah'] , 2) }} </td>
<td>{{ number_format($send['total_hargajual'] , 2) }} </td>
<td>{{ number_format($send['total_cajlelong'] , 2) }} </td>
<td>{{ number_format($send['total_baki'] , 2) }} </td>
<td>{{ number_format(-$send['total_rugi'] , 2) }} </td>
{{-- <td>
<a href=" {{ route('analisa.tempbycawsimulasi', [$send['kodcaw'],$t_gadai1,$fasa]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Gadaian"><i class="far fa-edit"></i></a>
@@ -87,11 +92,13 @@
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td><b>{{ $jum_billelong }}</b></td>
<td><b>{{ number_format($jum_berat, 2) }}</b></td>
<td><b>{{ number_format($jum_nilaimarhun, 2) }}</b></td>
<td><b>{{ number_format($jum_pembiayaan, 2) }}</b></td>
<td><b>{{ number_format($jum_bakiupah, 2) }}</b></td>
<td><b>{{ number_format($jum_hargajual, 2) }}</b></td>
<td><b>{{ number_format($jum_cajlelong, 2) }}</b></td>
<td><b>{{ number_format($jum_baki, 2) }}</b></td>
<td><b>-{{ number_format($jum_rugi, 2) }}</b></td>
</tr>
</tfoot>
</table>
@@ -120,7 +127,7 @@
"orderable": false
}
],
order: [[1, 'asc']],
order: [[0, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
@@ -7,9 +7,9 @@
width: 100%;
}
#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
#sim td {padding:3px 5px 3px 5px; padding-right:5px;}, #sim th {
border: 0px solid;
padding: 1px;
padding: 0px;
text-align: left;
}
@@ -153,12 +153,13 @@
<th>Cawangan</th>
<th>Bil Lelong</th>
<th>Berat (gm)</th>
<th>Nilai Marhun Asal(RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Harga Jual (RM)</th>
<th>Caj Lelong (RM)</th>
<th>Baki Lelong (RM)</th>
{{-- <th class="text-center">Tindakan</th> --}}
<th>Rugi Lelong (RM)</th>
</tr>
</thead>
<tbody>
@@ -171,13 +172,15 @@
<td>{{ $count++ }}</td>
<td>{{ $send['kodcaw'] }}</td>
<td style="white-space: nowrap;">{{ $send['caw_name'] }}</td>
<td>{{ $send['bil_lelong'] }} </td>
<td>{{ number_format($send['total_berat'], 2) }} </td>
<td>{{ number_format($send['total_pembiayaan'], 2) }} </td>
<td>{{ number_format($send['total_bakiupah'] , 2) }} </td>
<td>{{ number_format($send['total_hargajual'] , 2) }} </td>
<td>{{ number_format($send['total_cajlelong'] , 2) }} </td>
<td>{{ number_format($send['total_baki'] , 2) }} </td>
<td align="center">{{ number_format($send['bil_lelong'], 0) }} </td>
<td align="center">{{ number_format($send['total_berat'], 2) }} </td>
<td align="right">{{ number_format($send['total_nilaimarhun'], 2) }} </td>
<td align="right">{{ number_format($send['total_pembiayaan'], 2) }} </td>
<td align="right">{{ number_format($send['total_bakiupah'] , 2) }} </td>
<td align="right">{{ number_format($send['total_hargajual'] , 2) }} </td>
<td align="right">{{ number_format($send['total_cajlelong'] , 2) }} </td>
<td align="right">{{ number_format($send['total_baki'] , 2) }} </td>
<td align="right">({{ number_format($send['total_rugi'] , 2) }}) </td>
{{-- <td>
<a href=" {{ route('analisa.tempbycawsimulasi', [$send['kodcaw'],$t_gadai1,$fasa]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Gadaian"><i class="far fa-edit"></i></a>
@@ -189,13 +192,16 @@
<tfoot>
<tr>
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td><b>{{ $jum_billelong }}</b></td>
<td><b>{{ number_format($jum_berat, 2) }}</b></td>
<td><b>{{ number_format($jum_pembiayaan, 2) }}</b></td>
<td><b>{{ number_format($jum_bakiupah, 2) }}</b></td>
<td><b>{{ number_format($jum_hargajual, 2) }}</b></td>
<td><b>{{ number_format($jum_cajlelong, 2) }}</b></td>
<td><b>{{ number_format($jum_baki, 2) }}</b></td>
<td align="center"><b>{{ number_format($jum_billelong, 0) }}</b></td>
<td align="center"><b>{{ number_format($jum_berat, 2) }}</b></td>
<td align="right"><b>{{ number_format($jum_nilaimarhun, 2) }}</b></td>
<td align="right"><b>{{ number_format($jum_pembiayaan, 2) }}</b></td>
<td align="right"><b>{{ number_format($jum_bakiupah, 2) }}</b></td>
<td align="right"><b>{{ number_format($jum_hargajual, 2) }}</b></td>
<td align="right"><b>{{ number_format($jum_cajlelong, 2) }}</b></td>
<td align="right"><b>{{ number_format($jum_baki, 2) }}</b></td>
<td align="right"><b>({{ number_format($jum_rugi, 2) }})</b></td>
</tr>
</tfoot>
</table>