Merge branch 'lapfix' into 'new-super'

fix laporan ringkasan

See merge request online-sistem1/kaunter!180
This commit is contained in:
hafifie rahman
2021-10-13 06:32:14 +00:00
@@ -31,7 +31,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="{{ asset('vendor/bootstrap/js/bootstrap.min.js') }}"></script>
<table id="header">
{{-- <table id="header">
<tr>
<th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
<th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
@@ -48,61 +48,88 @@
<td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
<td></td>
</tr>
</table>
</table> --}}
<h5 class="mb-4 pl-2 font-weight-bold">LAPORAN RINGKASAN TRANSAKSI HARIAN - {{ $cawangan_detail['namacaw'] }}</h5>
<p style="font-weight: bold;margin-left: 10px;">Tarikh : {{ $ringkasan_date }} <span style="margin-left:20px;">Tarikh Cetak : {{ $tarikh_cetak }}</span></p>
<div class="row p-4">
<div class="col-6 box">
<div class="row pl-4 pr-4 pb-4">
<div class="col-7 box">
<div class="row form-group">
<div class="col-12">
<p><b>A) LAPORAN HARIAN</b></p>
</div>
<div class="col-6">1. PEMBIAYAAN</div>
<div class="col-6">{{ 'RM '. number_format($laporan['total_gadai'],2) }}</div>
<div class="col-6">2. PENEBUSAN</div>
<div class="col-6">{{ 'RM '. number_format($laporan['total_tebus'],2) }}</div>
<div class="col-6">3. ANSURAN PEMBIAYAAN</div>
<div class="col-6">{{ 'RM '. number_format($laporan['total_ansuran'],2) }}</div>
<div class="col-6">4. BAYARAN ONLINE</div>
<div class="col-6"> RM 0.00 </div>
<div class="col-6">5. KEUNTUNGAN</div>
<div class="col-6">{{ 'RM '. number_format($laporan['total_keuntungan'],2) }}</div>
<div class="col-6">6. KEUNTUNGAN ONLINE</div>
<div class="col-6"> RM 0.00 </div>
<div class="col-12">
<p><b>A) TRANSAKSI HARIAN</b></p>
</div>
<div class="col-5">1. PEMBIAYAAN</div>
<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-5">2. PEMBIAYAAN PENEBUSAN</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-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-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-4">{{ 'RM '. number_format($laporan['total_keuntungan_online'],2) }}</div>
<div class="col-3 font-weight-bold"> </div>
<div class="col-5">8. PELANGGAN BARU</div>
<div class="col-4"></div>
<div class="col-3 font-weight-bold">{{ $laporan['bilangan_customer_baru'] }}</div>
</div>
</div>
<div class="col-6 box">
<div class="col-5 box">
<div class="row form-group">
<div class="col-12">
<p><b>B) BIL TRANSAKSI</b></p>
</div>
<div class="col-6">1. PEMBIAYAAN</div>
<div class="col-6">{{ $laporan['bilangan_gadai'] }}</div>
<div class="col-6">2. PENEBUSAN</div>
<div class="col-6">{{ $laporan['bilangan_tebus'] }}</div>
<div class="col-6">3. ANSURAN PEMBIAYAAN</div>
<div class="col-6">{{ $laporan['bilangan_ansuran'] }}</div>
<div class="col-6">4. BAYARAN ONLINE</div>
<div class="col-6"> 0 </div>
<div class="col-6">5. PELANGGAN BARU</div>
<div class="col-6">{{ $laporan['bilangan_customer_baru'] }}</div>
<div class="col-12">
<p><b>B) PENDAHULUAN/SERAHAN HQ</b></p>
</div>
<div class="col-6">1. PENDAHULUAN</div>
<div class="col-6">{{ 'RM '. number_format($laporan['totalpendahuluan'],2) }}</div>
<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">{{ 'RM '. number_format($laporan['serahanbayaranOnline'],2) }}</div>
</div>
</div>
</div>
<div class="row p-4">
<div class="row pl-4 pr-4 pb-4">
<div class="col-6 box">
<div class="row form-group">
<div class="col-12">
<p><b>C) WANG PETI BESI</b></p>
</div>
<div class="col-6">1. SISTEM</div>
<div class="col-6">1. BAKI AKHIR</div>
<div class="col-6">{{ 'RM '. number_format($laporan['petibesi_sistem'],2) }}</div>
<div class="col-6">2. IMBANG DUGA</div>
<div class="col-6">2. TUNAI DI TANGAN</div>
<div class="col-6">{{ 'RM '. number_format($laporan['petibesiimbangduga'],2) }}</div>
<div class="col-6">3. DENOMINASI</div>
<div class="col-6">{{ 'RM '. number_format($laporan['petibesi_deno'],2) }}</div>
<div class="col-6 d-none">3. DENOMINASI</div>
<div class="col-6 d-none">{{ 'RM '. number_format($laporan['petibesi_deno'],2) }}</div>
</div>
</div>
<div class="col-6 box">
@@ -114,13 +141,13 @@
<div class="col-6">{{ 'RM '. number_format($laporan['panjar_harian'],2) }}</div>
<div class="col-6">2. BULANAN</div>
<div class="col-6">{{ 'RM '. number_format($laporan['panjar_bulanan'],2) }}</div>
<div class="col-6">3. TERKUMPUL (TAHUNAN)</div>
<div class="col-6">3. TAHUNAN</div>
<div class="col-6">{{ 'RM '. number_format($laporan['panjar_tahunan'],2) }}</div>
</div>
</div>
</div>
<div class="row p-4">
<div class="row pl-4 pr-4 pb-4">
<div class="col-12 box">
<div class="row">
<div class="col-12">
@@ -129,37 +156,52 @@
</div>
<div class="row">
<div class="col-12">
<table class="table">
<table class="table" style="font-size:14px;">
<thead>
<tr>
<th></th>
<th></th>
<th>Pembiayaan</th>
<th>Nilai Marhun</th>
<th>Bil</th>
<th>Pembiayaan (RM)</th>
<th>Pinjaman (RM)</th>
<th>Ansuran Pemb. (RM)</th>
<th>NM Pemb. (RM)</th>
<th>NM Pinj. (RM)</th>
<th>Bil Pemb.</th>
<th>Bil Pinj.</th>
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>IMBANG DUGA</td>
<td>{{ 'RM '. number_format($laporan['outstandingimbangduga'],2) }}</td>
<td> Not Applicable </td>
<td> Not Applicable </td>
<td>{{ number_format($laporan['rekodpemb'],2) }}</td>
<td>{{ number_format($laporan['rekodpinj'],2) }} </td>
<td>{{ number_format($laporan['bayaranpend'],2) }} </td>
<td>{{ number_format($laporan['rekodpembnm'],2) }}</td>
<td>{{ number_format($laporan['rekodpinjnm'],2) }}</td>
<td>{{ number_format($laporan['rekodpembbil'],0) }}</td>
<td>{{ number_format($laporan['rekodpinjbil'],0) }}</td>
</tr>
<tr>
<tr {{ ($ringkasan_date == $tarikh_cetak) ? '' : 'class=d-none' }}>
<td>2</td>
<td>STOK AUDIT</td>
<td>{{ 'RM '. number_format($laporan['stokauditpembiayaan'],2) }}</td>
<td>{{ 'RM '. number_format($laporan['stokauditnilaimarhun'],2) }}</td>
<td>{{ 'RM '. number_format($laporan['stokauditpembiayaan'],2) }}</td>
<td></td>
<td></td>
<td>{{ 'RM '. number_format($laporan['stokauditnilaimarhun'],2) }} </td>
<td> </td>
<td> </td>
<td>{{ number_format($laporan['stokauditcount']) }}</td>
</tr>
<tr>
<tr class="d-none">
<td>3</td>
<td>KAWALAN STOK</td>
<td>{{ 'RM '. number_format($totalpinjkawalanstok,2) }}</td>
<td> Not Applicable </td>
<td>{{ number_format($totalbilkawalanstok) }}</td>
<td> Not Applicable </td>
<td> Not Applicable </td>
<td> Not Applicable </td>
</tr>
</tbody>
</table>
@@ -168,25 +210,30 @@
</div>
</div>
<div class="row p-4">
<div class="col-6 box">
<div class="row pl-4 pr-4 pb-4">
<div class="col-12 box">
<div class="row form-group">
<div class="col-12">
<p><b>F) LELONG</b></p>
</div>
<div class="col-6">1. LELONG HARI INI</div>
<div class="col-6">{{ 'RM '. number_format($laporan['jumlah_lelong'],2) }}</div>
<div class="col-6">2. BAKI</div>
<div class="col-6">{{ 'RM '. number_format($laporan['baki_lelong'],2) }}</div>
<div class="col-6">3. RUGI</div>
<div class="col-6">{{ 'RM '. number_format($laporan['rugi_lelong'],2) }}</div>
<div class="col-6">4. CAJ LELONG</div>
<div class="col-6">{{ 'RM '. number_format($laporan['cas_lelong'],2) }}</div>
<div class="col-6">5. BIL</div>
<div class="col-6">{{ $laporan['bilangan_lelong'] }}</div>
<div class="col-4">1. LELONG HARI INI</div>
<div class="col-4">{{ 'RM '. number_format($laporan['jumlah_lelong'],2) }}</div>
<div class="col-4"></div>
<div class="col-4">2. BAKI</div>
<div class="col-2">{{ 'RM '. number_format($laporan['baki_lelong'],2) }}</div>
<div class="col-3">{{ 'RM '. number_format($laporan['bayar_baki_lelong'],2) }}</div>
<div class="col-4">3. RUGI</div>
<div class="col-2">{{ 'RM '. number_format($laporan['rugi_lelong'],2) }}</div>
<div class="col-3">{{ 'RM '. number_format($laporan['bayar_rugi_lelong'],2) }}</div>
<div class="col-4">4. CAJ LELONG</div>
<div class="col-4">{{ 'RM '. number_format($laporan['cas_lelong'],2) }}</div>
<div class="col-3"></div>
<div class="col-4">5. BIL</div>
<div class="col-4">{{ $laporan['bilangan_lelong'] }}</div>
<div class="col-4"></div>
</div>
</div>
<div class="col-6 box">
{{-- <div class="col-6 box">
<div class="row form-group">
<div class="col-12">
<p><b>G) BAYAR BAKI LELONG</b></p>
@@ -196,14 +243,14 @@
<div class="col-6">2. RUGI LELONG</div>
<div class="col-6">{{ 'RM '. number_format($laporan['bayar_rugi_lelong'],2) }}</div>
</div>
</div>
</div> --}}
</div>
<div class="row p-4">
<div class="row pl-4 pr-4 pb-4">
<div class="col-12 box">
<div class="row">
<div class="col-12">
<p><b>H) PERATUSAN PEMBIAYAAN</b></p>
<p><b>G) PERATUSAN PEMBIAYAAN</b></p>
</div>
</div>
<div class="row">