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

Merged in resit-tebus-ansuran-ujrah (pull request #34)

Browse Source 
update resit tebus lama & ujrah on wakil section
This commit is contained in:
Amir Hassan Hamzan
2023-12-19 16:56:55 +00:00
parent 868f44552a e19b683c85
commit 3cbd4dfd1c
2 changed files with 223 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/print/resittebus.blade.php
+80 -11
View File
@@ -407,11 +407,11 @@ hr.new5 {
</tr> </tr>
<tr> <tr>
<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td>Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }}</td> <td colspan="7"> </td> <td> </td><td> </td><td>Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }}</td>
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td>Masa Bayaran </td> <td colspan="7"> </td> <td> </td><td> </td><td>Masa Bayaran </td>
@php @php
$masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']); $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']);
$masa = date('H:i:s', $masa_bayaran); $masa = date('H:i:s', $masa_bayaran);
@@ -423,7 +423,35 @@ hr.new5 {
</table> </table>
<br> <br>
<h1 style="float:left;position:absolute;margin-left:100px;">T</h1> <div style="display: flex; justify-content:center">
<h1 style="">T</h1>
@if (sizeof($wakil) != 0)
<table id="payment">
<tr>
<td colspan="2">Maklumat Wakil</td>
</tr>
<tr>
<td style="width:7px">Nama</td>
<td style="width:10px">: {{ $wakil['nama'] }}</td>
</tr>
<tr>
<td style="width:7px">No K/P</td>
<td style="width:10px">: {{ $wakil['nokp'] }}</td>
</tr>
<tr>
<td style="width:7px">No Telefon</td>
<td style="width:10px">: {{ $wakil['telefon'] }}</td>
</tr>
<tr>
<td style="width:7px">Alamat</td>
<td style="width:10px;">: {{ $wakil['alamat1'] }}</td>
</tr>
{{-- <tr>
<td style="width:7px">No Siri Wakil</td>
<td style="width:10px">: S9090232-001</td>
</tr> --}}
</table>
@endif
<table id="payment"> <table id="payment">
<tr> <tr>
@@ -456,6 +484,8 @@ hr.new5 {
<td style="width:10px; font-size:17px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td> <td style="width:10px; font-size:17px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td>
</tr> </tr>
</table> </table>
</div>
<table id="payment" style="border: none; margin-top:20px; width:60%"> <table id="payment" style="border: none; margin-top:20px; width:60%">
<tr> <tr>
<td>Marhun: {{ $gadai['marhun'] }}</td> <td>Marhun: {{ $gadai['marhun'] }}</td>
@@ -486,11 +516,8 @@ hr.new5 {
</tr> </tr>
</table> </table>
<br> <br>
<br>
<hr class="new2"></hr> <hr class="new2"></hr>
<br>
</table> </table>
<div class="header-style"> <div class="header-style">
@@ -511,11 +538,11 @@ hr.new5 {
</tr> </tr>
<tr> <tr>
<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td>Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }}</td> <td colspan="7"> </td> <td> </td><td> </td><td>Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }}</td>
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td>Masa Bayaran </td> <td colspan="7"> </td> <td> </td><td> </td><td>Masa Bayaran </td>
@php @php
$masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']); $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']);
$masa = date('H:i:s', $masa_bayaran); $masa = date('H:i:s', $masa_bayaran);
@@ -525,7 +552,35 @@ hr.new5 {
</table> </table>
<br> <br>
<h1 style="float:left;position:absolute;margin-left:100px;">T</h1> <div style="display: flex; justify-content:center">
<h1 style="">T</h1>
@if (sizeof($wakil) != 0)
<table id="payment">
<tr>
<td colspan="2">Maklumat Wakil</td>
</tr>
<tr>
<td style="width:7px">Nama</td>
<td style="width:10px">: {{ $wakil['nama'] }}</td>
</tr>
<tr>
<td style="width:7px">No K/P</td>
<td style="width:10px">: {{ $wakil['nokp'] }}</td>
</tr>
<tr>
<td style="width:7px">No Telefon</td>
<td style="width:10px">: {{ $wakil['telefon'] }}</td>
</tr>
<tr>
<td style="width:7px">Alamat</td>
<td style="width:10px;">: {{ $wakil['alamat1'] }}</td>
</tr>
{{-- <tr>
<td style="width:7px">No Siri Wakil</td>
<td style="width:10px">: S9090232-001</td>
</tr> --}}
</table>
@endif
<table id="payment"> <table id="payment">
<tr> <tr>
@@ -558,7 +613,7 @@ hr.new5 {
<td style="width:10px; font-size:17px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td> <td style="width:10px; font-size:17px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td>
</tr> </tr>
</table> </table>
</div>
<table id="payment" style="border: none; margin-top:20px; width:60%"> <table id="payment" style="border: none; margin-top:20px; width:60%">
<tr> <tr>
@@ -588,7 +643,21 @@ hr.new5 {
</tr> </tr>
</table> </table>
<table id="semakan"> <table id="inside" style="width: 45%; margin-top:20px">
<tr>
<td>Duit Pelanggan</td>
<td>: RM {{ number_format($transaction_tebus['duitpelanggan'], 2) }}</td>
</tr>
<tr>
<td>Jumlah Perlu Dibayar</td>
<td>: RM {{ number_format($transaction_tebus['duit_masuk'], 2) }}</td>
</tr>
<tr>
<td>Baki</td>
<td>: RM {{ number_format($transaction_tebus['bakipelanggan'], 2) }}</td>
</tr>
</table>
<table id="semakan" style="margin-top: 0">
<tr style="visibility: hidden"> <tr style="visibility: hidden">
<td colspan="3">.................................................... </td> <td colspan="3">.................................................... </td>
<td></td> <td></td>
resources/views/print/resittebus_ujrah.blade.php
+143 -116
View File
@@ -467,15 +467,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="3">Nama Wakil </td> <td colspan="7"></td>
<td>: @php
if (sizeof($wakil) != 0) {
echo $wakil['nama'];
} else {
echo '';
}
@endphp </td>
<td colspan="3"> </td>
<td> </td> <td> </td>
<td> </td> <td> </td>
<td>Tempoh Simpan</td> <td>Tempoh Simpan</td>
@@ -483,15 +475,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P Wakil </td> <td colspan="7"></td>
<td>: @php
if (sizeof($wakil) != 0) {
echo $wakil['nokp'];
} else {
echo '';
}
@endphp </td>
<td colspan="3"> </td>
<td> </td> <td> </td>
<td> </td> <td> </td>
<td>Masa Bayaran</td> <td>Masa Bayaran</td>
@@ -504,45 +488,75 @@
</table> </table>
<br> <br>
<h1 style="float:left;position:absolute;margin-left:100px;">T</h1> <div style="display: flex; justify-content:center">
<table id="payment"> <h1 style="">T</h1>
<tr> @if (sizeof($wakil) != 0)
<td style="width:10px">Baki Pembiayaan</td> <table id="payment">
<td style="width:10px">: RM {{ number_format($gadai['bakipjm'], 2) }} </td> <tr>
</tr> <td colspan="2">Maklumat Wakil</td>
<tr> </tr>
<td style="width:10px">Keuntungan</td> <tr>
<td style="width:10px">: RM {{ number_format($penebusan['onepercent'], 2) }}</td> <td style="width:7px">Nama</td>
</tr> <td style="width:10px">: {{ $wakil['nama'] }}</td>
<tr> </tr>
<td style="width:10px">(-) Rebat Untung</td> <tr>
<td style="width:10px">: RM <td style="width:7px">No K/P</td>
{{ number_format($totalrebate['onepercent'], 2) }} <td style="width:10px">: {{ $wakil['nokp'] }}</td>
</td> </tr>
</tr> <tr>
<tr> <td style="width:7px">No Telefon</td>
<td style="width:10px">Ujrah</td> <td style="width:10px">: {{ $wakil['telefon'] }}</td>
<td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td> </tr>
</tr> <tr>
<tr> <td style="width:7px">Alamat</td>
<td style="width:10px">(-) Rebat Ujrah</td> <td style="width:10px;">: {{ $wakil['alamat1'] }}</td>
<td style="width:10px">: RM </tr>
{{ number_format($totalrebate['ujrah'], 2) }} </td> {{-- <tr>
</tr> <td style="width:7px">No Siri Wakil</td>
<tr> <td style="width:10px">: S9090232-001</td>
<td></td> </tr> --}}
</tr> </table>
<tr> @endif
<td></td> <table id="payment">
</tr> <tr>
<tr> <td style="width:10px">Baki Pembiayaan</td>
<td></td> <td style="width:10px">: RM {{ number_format($gadai['bakipjm'], 2) }} </td>
</tr> </tr>
<tr> <tr>
<td style="font-size:17px"><strong>Jumlah Perlu Dibayar</strong></td> <td style="width:10px">Keuntungan</td>
<td style="font-size: 17px"><strong>: RM {{ number_format($transaction_tebus['duit_masuk'], 2) }}</strong></td> <td style="width:10px">: RM {{ number_format($penebusan['onepercent'], 2) }}</td>
</tr> </tr>
</table> <tr>
<td style="width:10px">(-) Rebat Untung</td>
<td style="width:10px">: RM
{{ number_format($totalrebate['onepercent'], 2) }}
</td>
</tr>
<tr>
<td style="width:10px">Ujrah</td>
<td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Rebat Ujrah</td>
<td style="width:10px">: RM
{{ number_format($totalrebate['ujrah'], 2) }} </td>
</tr>
<tr>
<td></td>
</tr>
<tr>
<td></td>
</tr>
<tr>
<td></td>
</tr>
<tr>
<td style="font-size:17px"><strong>Jumlah Perlu Dibayar</strong></td>
<td style="font-size: 17px"><strong>: RM
{{ number_format($transaction_tebus['duit_masuk'], 2) }}</strong></td>
</tr>
</table>
</div>
<table id="payment" style="border: none; margin-top:20px; width: 60%"> <table id="payment" style="border: none; margin-top:20px; width: 60%">
<tr> <tr>
<td>Marhun: {{ $gadai['marhun'] }}</td> <td>Marhun: {{ $gadai['marhun'] }}</td>
@@ -610,15 +624,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="3">Nama Wakil </td> <td colspan="7"> </td>
<td>: @php
if (sizeof($wakil) != 0) {
echo $wakil['nama'];
} else {
echo '';
}
@endphp </td>
<td colspan="3"> </td>
<td> </td> <td> </td>
<td> </td> <td> </td>
<td>Tempoh Simpan</td> <td>Tempoh Simpan</td>
@@ -626,15 +632,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P Wakil </td> <td colspan="7"> </td>
<td>: @php
if (sizeof($wakil) != 0) {
echo $wakil['nokp'];
} else {
echo '';
}
@endphp </td>
<td colspan="3"> </td>
<td> </td> <td> </td>
<td> </td> <td> </td>
<td>Masa Bayaran</td> <td>Masa Bayaran</td>
@@ -647,46 +645,75 @@
</table> </table>
<br> <br>
<h1 style="float:left;position:absolute;margin-left:100px;">T</h1> <div style="display: flex; justify-content:center">
<h1 style="">T</h1>
<table id="payment"> @if (sizeof($wakil) != 0)
<tr> <table id="payment">
<td style="width:10px">Baki Pembiayaan</td> <tr>
<td style="width:10px">: RM {{ number_format($gadai['bakipjm'], 2) }} </td> <td colspan="2">Maklumat Wakil</td>
</tr> </tr>
<tr> <tr>
<td style="width:10px">Keuntungan</td> <td style="width:7px">Nama</td>
<td style="width:10px">: RM {{ number_format($penebusan['onepercent'], 2) }}</td> <td style="width:10px">: {{ $wakil['nama'] }}</td>
</tr> </tr>
<tr> <tr>
<td style="width:10px">(-) Rebat Untung</td> <td style="width:7px">No K/P</td>
<td style="width:10px">: RM <td style="width:10px">: {{ $wakil['nokp'] }}</td>
{{ number_format($totalrebate['onepercent'], 2) }} </tr>
</td> <tr>
</tr> <td style="width:7px">No Telefon</td>
<tr> <td style="width:10px">: {{ $wakil['telefon'] }}</td>
<td style="width:10px">Ujrah</td> </tr>
<td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td> <tr>
</tr> <td style="width:7px">Alamat</td>
<tr> <td style="width:10px;">: {{ $wakil['alamat1'] }}</td>
<td style="width:10px">(-) Rebat Ujrah</td> </tr>
<td style="width:10px">: RM {{-- <tr>
{{ number_format($totalrebate['ujrah'], 2) }} </td> <td style="width:7px">No Siri Wakil</td>
</tr> <td style="width:10px">: S9090232-001</td>
<tr> </tr> --}}
<td></td> </table>
</tr> @endif
<tr> <table id="payment">
<td></td> <tr>
</tr> <td style="width:10px">Baki Pembiayaan</td>
<tr> <td style="width:10px">: RM {{ number_format($gadai['bakipjm'], 2) }} </td>
<td></td> </tr>
</tr> <tr>
<tr> <td style="width:10px">Keuntungan</td>
<td style="font-size:17px"><strong>Jumlah Perlu Dibayar</strong></td> <td style="width:10px">: RM {{ number_format($penebusan['onepercent'], 2) }}</td>
<td style="font-size: 17px"><strong>: RM {{ number_format($transaction_tebus['duit_masuk'], 2) }}</strong></td> </tr>
</tr> <tr>
</table> <td style="width:10px">(-) Rebat Untung</td>
<td style="width:10px">: RM
{{ number_format($totalrebate['onepercent'], 2) }}
</td>
</tr>
<tr>
<td style="width:10px">Ujrah</td>
<td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Rebat Ujrah</td>
<td style="width:10px">: RM
{{ number_format($totalrebate['ujrah'], 2) }} </td>
</tr>
<tr>
<td></td>
</tr>
<tr>
<td></td>
</tr>
<tr>
<td></td>
</tr>
<tr>
<td style="font-size:17px"><strong>Jumlah Perlu Dibayar</strong></td>
<td style="font-size: 17px"><strong>: RM
{{ number_format($transaction_tebus['duit_masuk'], 2) }}</strong></td>
</tr>
</table>
</div>
<table id="payment" style="border: none; margin-top:20px; width: 60%"> <table id="payment" style="border: none; margin-top:20px; width: 60%">
<tr> <tr>
@@ -725,7 +752,7 @@
<td>: RM {{ number_format($transaction_tebus['bakipelanggan'], 2) }}</td> <td>: RM {{ number_format($transaction_tebus['bakipelanggan'], 2) }}</td>
</tr> </tr>
</table> </table>
<table id="semakan"> <table id="semakan" style="margin-top: 0">
<tr style="visibility: hidden"> <tr style="visibility: hidden">
<td colspan="3">.................................................... </td> <td colspan="3">.................................................... </td>
<td></td> <td></td>