Merged in sag-ujrah (pull request #27)
Add new template for sag ujrah and fix typo pembiayaan
This commit is contained in:
@@ -341,10 +341,14 @@ class GadaianController extends Controller
|
|||||||
|
|
||||||
$cawangan_detail = $cawangan[0];
|
$cawangan_detail = $cawangan[0];
|
||||||
|
|
||||||
|
$kadar_ujrah = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/kadarujrah/by_group_id/', [
|
||||||
|
'kodcaw' => $cawangan_detail['kodcaw']
|
||||||
|
])->json();
|
||||||
|
|
||||||
$pembayaran_segera = "https://spare.arrahn.com.my/pembayaransegera";
|
$pembayaran_segera = "https://spare.arrahn.com.my/pembayaransegera";
|
||||||
|
|
||||||
// return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu'));
|
// return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu'));
|
||||||
return view('print.sag_ujrah',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu'));
|
return view('print.sag_ujrah_2',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu', 'kadar_ujrah'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function resit($id)
|
public function resit($id)
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 55 KiB |
@@ -405,7 +405,7 @@ hr.new5 {
|
|||||||
<tr>
|
<tr>
|
||||||
<td style="width:30%"><b>Bayaran Harga Jualan</b></td>
|
<td style="width:30%"><b>Bayaran Harga Jualan</b></td>
|
||||||
<td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'],2) }} </b></td>
|
<td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'],2) }} </b></td>
|
||||||
<td style="width:30%">Ansuran Pembiyaan</td>
|
<td style="width:30%">Ansuran Pembiayaan</td>
|
||||||
<td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
|
<td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
@@ -507,7 +507,7 @@ hr.new5 {
|
|||||||
<tr>
|
<tr>
|
||||||
<td style="width:30%"><b>Bayaran Harga Jualan</b></td>
|
<td style="width:30%"><b>Bayaran Harga Jualan</b></td>
|
||||||
<td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'],2) }} </b></td>
|
<td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'],2) }} </b></td>
|
||||||
<td style="width:30%">Ansuran Pembiyaan</td>
|
<td style="width:30%">Ansuran Pembiayaan</td>
|
||||||
<td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
|
<td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
@@ -480,7 +480,7 @@
|
|||||||
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
|
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
|
||||||
<table id="payment" style="width: 50%">
|
<table id="payment" style="width: 50%">
|
||||||
<tr>
|
<tr>
|
||||||
<td>Ansuran Pembiyaan</td>
|
<td>Ansuran Pembiayaan</td>
|
||||||
<td>: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} </td>
|
<td>: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} </td>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -597,7 +597,7 @@
|
|||||||
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
|
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
|
||||||
<table id="payment" style="width: 50%">
|
<table id="payment" style="width: 50%">
|
||||||
<tr>
|
<tr>
|
||||||
<td>Ansuran Pembiyaan</td>
|
<td>Ansuran Pembiayaan</td>
|
||||||
<td>: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} </td>
|
<td>: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} </td>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -418,7 +418,7 @@ hr.new5 {
|
|||||||
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
|
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="width:10px">Pembiyaan Baru</td>
|
<td style="width:10px">Pembiayaan Baru</td>
|
||||||
<td style="width:5px"> </td>
|
<td style="width:5px"> </td>
|
||||||
<td style="width:10px">: RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
|
<td style="width:10px">: RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -521,7 +521,7 @@ hr.new5 {
|
|||||||
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
|
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="width:10px">Pembiyaan Baru</td>
|
<td style="width:10px">Pembiayaan Baru</td>
|
||||||
<td style="width:5px"> </td>
|
<td style="width:5px"> </td>
|
||||||
<td style="width:10px">: RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
|
<td style="width:10px">: RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user