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

resolve conflict

Browse Source
This commit is contained in:
afiq
2021-08-06 09:34:49 +08:00
parent 9c88047218 27fa6fea0b
commit ecaa6a7357
66 changed files with 2234 additions and 4384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/print/laporan_penebusan.blade.php
+32 -20
View File
@@ -198,30 +198,30 @@
<th>Norujukan</th>
<th>Nama</th>
<th>No KP</th>
<th>T Gadai</th>
<th>T Tebus</th>
<th>Masa</th>
<th>JBG</th>
<th>J Tebus</th>
<th width="6%;">Nilai Marhun(RM)</th>
<th width="6%;">Pembiayaan(RM)</th>
<th width="6%;">Upah/Keuntungan(RM)</th>
<th width="6%;">Bayaran(RM)</th>
<th width="6%;">Jumlah(RM)</th>
</tr>
@php $counter = 1; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
@php $counter = 1;$totalnm = 0; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
@foreach($tebus as $index=>$item)
@php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += $item['pinjaman']; $totalupah += $item['bakiupah'];@endphp
@php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += $item['pinjaman']; $totalupah += $item['bakiupah']; $totalnm += $item['nilaimarhun'];@endphp
@if($index > 0)
@if($item['teller'] != $tebus[$index - 1]['teller'])
<tr>
<td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
</tr>
@php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
@php $totalnmteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
@endif
@else
<tr>
<td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
</tr>
@php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
@php $totalnmteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
@endif
<tr>
<td>{{ $counter }}</td>
@@ -229,34 +229,30 @@
<td>{{ $item['nama'] }}</td>
<td>{{ $item['nokp'] }}</td>
<td>
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_gadai']);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate);
@endphp
</td>
<td>
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_tebus']);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate);
@php
$dt = new DateTime($item['tarikh_bayaran']);
$time = $dt->format('h:i:s');
echo date($time);
@endphp
</td>
<td>{{ $item['jbg'] }}</td>
<td>{{$item['jenistebus']}}</td>
<td>
{{ number_format($item['nilaimarhun'],2) }}
</td>
<td>{{ number_format($item['pinjaman'],2) }}</td>
<td>{{ number_format($item['bakiupah'],2) }}</td>
<td>{{ number_format($item['bakipjm'],2) }}</td>
<td>@php if($item['jenistebus'] == 'S'){ $total=($item['pinjaman']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp</td>
</tr>
@php $counter++; @endphp
@php $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
@php $totalnmteller += $item['nilaimarhun']; $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
@php $totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp
@if($index+1 < sizeof($tebus))
@if($item['teller'] != $tebus[$index + 1]['teller'])
<tr class="new-page">
<td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
<td></td>
<td><b>{{ number_format($totalnmteller,2) }} </b></td>
<td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
<td><b>{{ number_format($totalupahteller,2) }} </b></td>
<td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
@@ -267,7 +263,7 @@
@else
<tr class="new-page">
<td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
<td></td>
<td><b>{{ number_format($totalnmteller,2) }}</b></td>
<td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
<td><b>{{ number_format($totalupahteller,2) }} </b></td>
<td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
@@ -281,12 +277,14 @@
<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
<tr>
<th colspan="9"></th>
<th style="text-align:center;">Nilai Marhun (RM)</th>
<th style="text-align:center;">Pembiayaan (RM)</th>
<th style="text-align:center;">Upah/Keuntungan (RM)</th>
<th style="text-align:center;">Jumlah (RM)</th>
</tr>
<tr>
<td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
<td>{{ number_format($totalnm,2) }}</td>
<td>{{ number_format($totalpinjaman,2) }}</td>
<td>{{ number_format($totalupah,2) }}</td>
<td>{{ number_format($totalbayaran,2) }}</td>
@@ -329,6 +327,18 @@
{{-- <h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5> --}}
<br>
<br>
<table id="sign">
<tr>
<td>{{ $ansuran['bilangan'] }}</td>
<td>Ansuran Pembiayaan</td>
<td>{{ number_format($ansuran['totalpendahuluan'],2) }}</td>
<td>{{ number_format($ansuran['totalkeuntungan'],2) }}</td>
<td> Not Applicable </td>
</tr>
</table>
<br>
<br>
<table id="sign">
@@ -355,3 +365,5 @@