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

Merge branch 'branchbaru' into 'new-super'

Browse Source 
fix laporan gadaian dan penebusan

See merge request online-sistem1/kaunter!168
This commit is contained in:
hafifie rahman
2021-09-26 04:59:18 +00:00
parent 57b2441586 a1290f7854
commit f7d2430246
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/print/laporan_gadaian.blade.php
+4 -2
View File
@@ -214,7 +214,7 @@
<th>Keuntungan</th>
<th>Peratus (%)</th>
</tr>
@php $counter = 1; $totalpinjaman = 0; $totalberat = 0; $totalnm = 0; $totalupah = 0;@endphp
@php $counter = 1; $totalpinjaman = 0; $totalberat = 0; $totalnm = 0; $totalupah = 0; $bil = 0;@endphp
@foreach($gadai as $index=>$item)
@php $totalpinjaman += $item['pinjaman']; $totalberat += $item['berat']; $totalnm += $item['nilaimarhun']; $totalupah += $item['upah12']; @endphp
@if($index > 0)
@@ -250,6 +250,7 @@
@php $totalpinjamanteller += $item['pinjaman'];$totalnmteller += $item['nilaimarhun'];$totalberatteller += $item['berat'];$totalupah12 += $item['upah12']; @endphp
@if($index+1 < sizeof($gadai))
@if($item['teller'] != $gadai[$index + 1]['teller'])
@php if($item['teller'] != '')$bil += ($counter-1); @endphp
<tr>
<td colspan="6"><b>{{ $counter-1 }}</b> Jumlah surat bagi teller : <b>{{ $item['teller'] }}</b></td>
<td><b>{{ number_format($totalberatteller,2) }} </b></td>
@@ -261,6 +262,7 @@
@php $counter = 1;$totalupah12 = 0;$totalpinjamanteller = 0;$totalnmteller = 0; @endphp
@endif
@else
@php $bil += ($counter-1); @endphp
<tr>
<td colspan="6"><b>{{ $counter-1 }}</b> Jumlah surat bagi teller : <b>{{ $item['teller'] }}</b></td>
<td><b>{{ number_format($totalberatteller,2) }} </b></td>
@@ -275,7 +277,7 @@
<br><br>
<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
<tr>
<th colspan="9"></th>
<th colspan="9" style="text-align: center;"><b>JUMLAH BILANGAN = {{ $bil }}</b></th>
<th style="text-align:center;">Berat (g/m)</th>
<th style="text-align:center;">Nilai Marhun (RM)</th>
<th style="text-align:center;">Pembiayaan (RM)</th>
resources/views/print/laporan_penebusan.blade.php
+5 -1
View File
@@ -288,11 +288,13 @@
<br><br>
<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
<tr>
<th colspan="9"></th>
<th colspan="9" style="text-align: center;"><b>JUMLAH BILANGAN = {{ $tebuspengasingan['biltawarruq'] + $tebuspengasingan['bilarrahn'] }}</b></th>
<th style="text-align:center;">Nilai Marhun (RM)</th>
<th style="text-align:center;">Pembiayaan Asal(RM)</th>
<th style="text-align:center;">B. Pembiayaan (RM)</th>
<th style="text-align:center;">Keuntungan Rebet(RM)</th>
<th style="text-align:center;">Upah/Keuntungan (RM)</th>
<th style="text-align:center;">Keuntungan Sebenar(RM)</th>
<th style="text-align:center;">Jumlah (RM)</th>
</tr>
<tr>
@@ -300,7 +302,9 @@
<td>{{ number_format($totalnm,2) }}</td>
<td>{{ number_format($totalpinjamanasal,2) }}</td>
<td>{{ number_format($totalpinjaman,2) }}</td>
<td>@php $totalkeuntunganrebet = ($totalpinjaman + $totalupah) - $totalbayaran;echo number_format($totalkeuntunganrebet,2); @endphp</td>
<td>{{ number_format($totalupah,2) }}</td>
<td>{{ number_format($totalupah - $totalkeuntunganrebet,2) }}</td>
<td>{{ number_format($totalbayaran,2) }}</td>
</tr>
</table>