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

Merge branch 'kaunter' into 'new-super'

Browse Source 
resit baru

See merge request online-sistem1/kaunter!186
This commit is contained in:
arrahn pkb
2021-11-07 17:15:34 +00:00
parent 0656448c85 2cb2e34913
commit a4e02a3914
3 changed files with 88 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+3 -1
View File
@@ -507,11 +507,13 @@ class GadaianController extends Controller
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
$totalBayaranAnsuran = Http::get(config('api.url') . '/api/transaction/norujukan/total/ansuran',['norujukan'=>$id])->json();
// dd($wakil);
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction'));
return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
}
public function resitbelumtebus($id)
resources/views/print/resitansuran.blade.php
+49 -41
View File
@@ -142,15 +142,6 @@ hr.new5 {
color: white;
}
#salinan {
font-family: Arial, Helvetica, sans-serif;
border-collapse:collapse;
@@ -390,7 +381,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td> <b>Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }}</b> </td>
<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td> <b>Tempoh Simpanan</b></td><td>:<b> {{ $gadai['tempoh'] }}</b> </td>
</tr>
<tr>
@@ -404,23 +395,31 @@ hr.new5 {
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
<table id="payment">
<tr>
<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
</tr>
<tr>
<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b> </td>
</tr>
<tr>
<td style="width:10px">Harga/Baki Harga Jualan</td>
<td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
<td style="width:10px">Pembiayaan/Baki Pembiayaan</td>
<td style="width:10px">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
</tr>
<tr>
<td style="width:10px">Bayaran Harga Jualan</td>
<td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
<td style="width:10px">Ansuran Pembiyaan</td>
<td style="width:10px">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Baki Harga Jualan</b></td>
<td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b> </td>
<td style="width:10px"><b>Baki Pembiayaan</b></td>
<td style="width:10px">:<b> RM {{ number_format($gadai['bakipjm'],2) }}</b> </td>
</tr>
<tr>
<td style="width:10px"></td>
<td style="width:10px"></td>
<td style="width:10px"><b>Keuntungan</b></td>
<td style="width:10px">:<b> RM {{ number_format($transaction['bayaran_keuntungan'],2) }}</b> </td>
</tr>
</table>
<br>
@@ -501,21 +500,30 @@ hr.new5 {
<table id="payment">
<tr>
<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
</tr>
<tr>
<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b></td>
</tr>
<tr>
<td style="width:10px">Harga/Baki Harga Jualan</td>
<td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
<td style="width:10px">Pembiayaan/Baki Pembiayaan</td>
<td style="width:10px">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
</tr>
<tr>
<td style="width:10px">Bayaran Harga Jualan</td>
<td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
<td style="width:10px">Ansuran Pembiyaan</td>
<td style="width:10px">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Baki Harga Jualan</b></td>
<td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b> </td>
<td style="width:10px"><b>Baki Pembiayaan</b></td>
<td style="width:10px">:<b> RM {{ number_format($gadai['bakipjm'],2) }}</b> </td>
</tr>
<tr>
<td style="width:10px"></td>
<td style="width:10px"></td>
<td style="width:10px"><b>Keuntungan</b></td>
<td style="width:10px">:<b> RM {{ number_format($transaction['bayaran_keuntungan'],2) }}</b> </td>
</tr>
</table>
<br>
resources/views/print/resittebus.blade.php
+36 -37
View File
@@ -427,27 +427,26 @@ hr.new5 {
<h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
<table id="payment">
<tr>
<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
</tr>
<tr>
<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['hargajualan']),2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($totaltransaction,2) }}</td>
</tr>
<tr>
<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakihargajualan'],2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Rebate</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
<tr>
<td style="width:10px">Harga Jualan</td>
<td style="width:10px">: RM {{ number_format(($gadai['hargajualan']),2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td>
<tr>
<td style="width:10px">(-) Jumlah Ansuran Telah Dibayar</td>
<td style="width:10px">: RM {{ number_format($totalBayaranAnsuran,2) }}</td>
</tr>
<tr>
<td style="width:10px">Baki Harga Jualan</td>
<td style="width:10px">: RM {{ number_format($gadai['bakihargajualan'],2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Ibra' (Rebat)</td>
<td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Tebus Keseluruhan</b></td>
<td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td>
</tr>
</table>
<br>
@@ -530,26 +529,26 @@ hr.new5 {
<h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
<table id="payment">
<tr>
<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
</tr>
<tr>
<td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['hargajualan']),2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($totaltransaction,2) }} </td>
</tr>
<tr>
<td style="width:10px">Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakihargajualan'],2) }}</td>
</tr>
<tr>
<td style="width:10px">(-) Rebate</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
<tr>
<td style="width:10px">Harga Jualan</td>
<td style="width:10px">: RM {{ number_format(($gadai['hargajualan']),2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</b></td>
<tr>
<td style="width:10px">(-) Jumlah Ansuran Telah Dibayar</td>
<td style="width:10px">: RM {{ number_format($totalBayaranAnsuran,2) }}</td>
</tr>
<tr>
<td style="width:10px">Baki Harga Jualan</td>
<td style="width:10px">: RM {{ number_format($gadai['bakihargajualan'],2) }} </td>
</tr>
<tr>
<td style="width:10px">(-) Ibra' (Rebat)</td>
<td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Tebus Keseluruhan</b></td>
<td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td>
</tr>
</table>
<br>