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

Merge branch 'lapfix' into 'new-super'

Browse Source 
Fix skit2

See merge request online-sistem1/kaunter!181
This commit is contained in:
hafifie rahman
2021-10-13 17:14:28 +00:00
parent 8264f8fe2b 398ee25a7c
commit aa73837bd6
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/print/laporan_ringkasanharian.blade.php
+25 -23
View File
@@ -65,35 +65,37 @@
<div class="col-4">{{ 'RM '. number_format($laporan['total_gadai'],2) }}</div>
<div class="col-3 font-weight-bold">{{ $laporan['bilangan_gadai'] }}</div>
<div class="col-12">2. PENYELESAIAN PEMBIAYAAN</div>
<div class="col-5">2. PEMBIAYAAN PENEBUSAN</div>
<div class="col-5 pl-5">a. <span style="font-size:14px;">PEMBIAYAAN DIBAYAR</span></div>
<div class="col-4">{{ 'RM '. number_format($laporan['total_tebus'],2) }}</div>
<div class="col-3 font-weight-bold">{{ $laporan['bilangan_tebus'] }}</div>
<div class="col-5">3. PEMBIAYAAN ANSURAN</div>
<div class="col-5 pl-5">b. <span style="font-size:14px;">KEUNTUNGAN DIBAYAR</span></div>
<div class="col-4">{{ 'RM '. number_format($laporan['upahsimpankaunter'],2) }}</div>
<div class="col-3 font-weight-bold"></div>
<div class="col-12">3. ANSURAN PEMBIAYAAN</div>
<div class="col-5 pl-5">a. <span style="font-size:14px;">PEMBIAYAAN DIBAYAR</span></div>
<div class="col-4">{{ 'RM '. number_format($laporan['total_ansuran'],2) }}</div>
<div class="col-3 font-weight-bold">{{ $laporan['bilangan_ansuran'] }}</div>
<div class="col-5">4. PEMBIAYAAN ONLINE</div>
<div class="col-5 pl-5">b. <span style="font-size:14px;">KEUNTUNGAN DIBAYAR</span></div>
<div class="col-4">{{ 'RM '. number_format($laporan['keuntungansebenarkaunter'],2) }}</div>
<div class="col-3 font-weight-bold"></div>
<div class="col-12">4. BAYARAN ONLINE</div>
<div class="col-5 pl-5">a. <span style="font-size:14px;">PEMBIAYAAN DIBAYAR</span></div>
<div class="col-4">{{ 'RM '. number_format($laporan['total_ansuranonline'],2) }}</div>
<div class="col-3 font-weight-bold">{{ $laporan['bilangan_ansuranonline'] }}</div>
<div class="col-5">5. KEUNTUNGAN PENEBUSAN</div>
<div class="col-4">{{ 'RM '. number_format($laporan['upahsimpankaunter'],2) }}</div>
<div class="col-3 font-weight-bold"> </div>
<div class="col-5">7. KEUNTUNGAN ANSURAN</div>
<div class="col-4">{{ 'RM '. number_format($laporan['keuntungansebenarkaunter'],2) }}</div>
<div class="col-3 font-weight-bold"> </div>
<div class="col-5">7. KEUNTUNGAN ONLINE</div>
<div class="col-5 pl-5">b. <span style="font-size:14px;">KEUNTUNGAN DIBAYAR</span></div>
<div class="col-4">{{ 'RM '. number_format($laporan['total_keuntungan_online'],2) }}</div>
<div class="col-3 font-weight-bold"> </div>
<div class="col-3 font-weight-bold"></div>
<div class="col-5">8. PELANGGAN BARU</div>
<div class="col-5">5. PELANGGAN BARU</div>
<div class="col-4"></div>
<div class="col-3 font-weight-bold">{{ $laporan['bilangan_customer_baru'] }}</div>
@@ -111,7 +113,7 @@
<div class="col-6">2. SERAHAN</div>
<div class="col-6">{{ 'RM '. number_format($laporan['totalserahan'],2) }}</div>
<div class="col-6">2. SERAHAN ONLINE</div>
<div class="col-6">3. SERAHAN ONLINE</div>
<div class="col-6">{{ 'RM '. number_format($laporan['serahanbayaranOnline'],2) }}</div>
</div>
@@ -156,7 +158,7 @@
</div>
<div class="row">
<div class="col-12">
<table class="table" style="font-size:14px;">
<table class="table text-center" style="font-size:14px;">
<thead>
<tr>
<th></th>
@@ -185,10 +187,10 @@
<tr {{ ($ringkasan_date == $tarikh_cetak) ? '' : 'class=d-none' }}>
<td>2</td>
<td>STOK AUDIT</td>
<td>{{ 'RM '. number_format($laporan['stokauditpembiayaan'],2) }}</td>
<td>{{ number_format($laporan['stokauditpembiayaan'],2) }}</td>
<td></td>
<td></td>
<td>{{ 'RM '. number_format($laporan['stokauditnilaimarhun'],2) }} </td>
<td>{{ number_format($laporan['stokauditnilaimarhun'],2) }} </td>
<td> </td>
<td> </td>
<td>{{ number_format($laporan['stokauditcount']) }}</td>
@@ -196,9 +198,9 @@
<tr class="d-none">
<td>3</td>
<td>KAWALAN STOK</td>
<td>{{ 'RM '. number_format($totalpinjkawalanstok,2) }}</td>
<td>{{ number_format($totalpinjkawalanstok,2) }}</td>
<td> Not Applicable </td>
<td>{{ number_format($totalbilkawalanstok) }}</td>
<td>{{ number_format($totalbilkawalanstok,0) }}</td>
<td> Not Applicable </td>
<td> Not Applicable </td>
<td> Not Applicable </td>
resources/views/print/laporan_upah.blade.php
+3 -3
View File
@@ -228,7 +228,7 @@
</tr>
@php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalsebenar = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; $totalsebenarteller = 0; @endphp
@foreach($advansur as $index=>$item)
@php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman']; $totalsebenar += $item['upahSebenar'];@endphp
@php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman']; $totalsebenar += $item['upahsebenar'];@endphp
@if($index > 0)
@if($item['teller'] != $advansur[$index - 1]['teller'])
<tr>
@@ -250,11 +250,11 @@
<td>{{ $item['teller'] }}</td>
<td>{{ $item['jbg'] }}</td>
<td>{{ number_format($item['pinjaman'],2) }}</td>
<td>{{ number_format($item['upahSebenar'],2) }}</td>
<td>{{ number_format($item['upahsebenar'],2) }}</td>
<td>{{ number_format($item['upahDibayar'],2) }}</td>
</tr>
@php $counter++; @endphp
@php $totalbayaranteller += $item['upahDibayar']; $totalsebenarteller += $item['upahSebenar']; $totalpembiayaanteller += $item['pinjaman']; @endphp
@php $totalbayaranteller += $item['upahDibayar']; $totalsebenarteller += $item['upahsebenar']; $totalpembiayaanteller += $item['pinjaman']; @endphp
@if($index+1 < sizeof($advansur))
@if($item['teller'] != $advansur[$index + 1]['teller'])
<tr>