KoPKB/admin-erahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in amirah-stokaudit (pull request #26)

Browse Source 
add column marhun stock audit
This commit is contained in:
nur amirah zulkipli
2024-01-25 00:52:05 +00:00
parent 90c60e4c76 77519d63d5
commit 812c6b51c0
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/akaun/laporan_stokaudit.blade.php
+3
View File
@@ -205,6 +205,7 @@
<th>No. KP</th>
<th>Berat</th>
<th>Nilai Marhun (RM)</th>
<th>Marhun</th>
<th>Pembiayaan Asal (RM)</th>
<th>Baki Pembiayaan (RM)</th>
<th>Kadar Upah</th>
@@ -222,6 +223,7 @@
<td>{{$item['nokp']}}</td>
<td>{{ number_format($item['berat'],2) }}</td>
<td>{{ number_format($item['nilaimarhun'],2) }}</td>
<td>{{ $item['marhun']}}</td>
<td>{{ number_format($item['pinjaman'],2) }}</td>
<td>{{ number_format($item['bakipjm'],2) }}</td>
<td>{{ number_format($item['kadarupah'],2) }}</td>
@@ -236,6 +238,7 @@
<th colspan='4'>Jumlah</th>
<th>{{ number_format($stokaudit['totalberat'],2) }}</th>
<th>{{ number_format($stokaudit['totalnilaimarhun'],2) }}</th>
<th></th>
<th>{{ number_format($stokaudit['totalpinjaman'],2) }}</th>
<th>{{ number_format($stokaudit['totalbakipjm'],2) }}</th>
<th></th>
resources/views/akaun/laporan_stokaudit_combine.blade.php
+6
View File
@@ -231,6 +231,7 @@
<th>No. KP</th>
<th>Berat</th>
<th>Nilai Marhun (RM)</th>
<th>Marhun</th>
<th>Pembiayaan Asal (RM)</th>
<th>Baki Pembiayaan (RM)</th>
<th>Kadar Upah</th>
@@ -249,6 +250,7 @@
<td>{{$item['nokp']}}</td>
<td>{{ number_format($item['berat'],2) }}</td>
<td>{{ number_format($item['nilaimarhun'],2) }}</td>
<td>{{ $item['marhun']}}</td>
<td>{{ number_format($item['pinjaman'],2) }}</td>
<td>{{ number_format($item['bakipjm'],2) }}</td>
<td>{{ number_format($item['kadarupah'],2) }}</td>
@@ -263,6 +265,7 @@
<th colspan='4'>Jumlah</th>
<th>{{ number_format($stokaudit_aktif['totalberat'],2) }}</th>
<th>{{ number_format($stokaudit_aktif['totalnilaimarhun'],2) }}</th>
<th></th>
<th>{{ number_format($stokaudit_aktif['totalpinjaman'],2) }}</th>
<th>{{ number_format($stokaudit_aktif['totalbakipjm'],2) }}</th>
<th></th>
@@ -318,6 +321,7 @@
<th>No. KP</th>
<th>Berat</th>
<th>Nilai Marhun (RM)</th>
<th>Marhun</th>
<th>Pembiayaan</th>
<th>Lanjutan</th>
</thead>
@@ -332,6 +336,7 @@
<td>{{$item['nokp']}}</td>
<td>{{ number_format($item['berat'],2) }}</td>
<td>{{ number_format($item['nilaimarhun'],2) }}</td>
<td>{{ $item['marhun']}}</td>
<td>@php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo
number_format($item['bakipjm'],2); @endphp</td>
<td>{{$item['lelong_tawarruq']}}</td>
@@ -342,6 +347,7 @@
<th colspan='4'>Jumlah</th>
<th>{{ number_format($stokaudit_takaktif['totalberat'],2) }}</th>
<th>{{ number_format($stokaudit_takaktif['totalnilaimarhun'],2) }}</th>
<th></th>
<th>{{ number_format($totalpinjaman,2) }}</th>
<th></th>
</tfoot>
resources/views/akaun/laporan_stokauditbelumaktif.blade.php
+3
View File
@@ -205,6 +205,7 @@
<th>No. KP</th>
<th>Berat</th>
<th>Nilai Marhun (RM)</th>
<th>Marhun</th>
<th>Pembiayaan</th>
<th>Lanjutan</th>
</thead>
@@ -218,6 +219,7 @@
<td>{{$item['nokp']}}</td>
<td>{{ number_format($item['berat'],2) }}</td>
<td>{{ number_format($item['nilaimarhun'],2) }}</td>
<td>{{ $item['marhun']}}</td>
<td>@php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo number_format($item['bakipjm'],2); @endphp</td>
<td>{{$item['lelong_tawarruq']}}</td>
</tr>
@@ -227,6 +229,7 @@
<th colspan='4'>Jumlah</th>
<th>{{ number_format($stokaudit['totalberat'],2) }}</th>
<th>{{ number_format($stokaudit['totalnilaimarhun'],2) }}</th>
<th></th>
<th>{{ number_format($totalpinjaman,2) }}</th>
<th></th>
</tfoot>