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

fix resolve conflict

Browse Source
This commit is contained in:
Hafifie PKB
2023-12-12 13:07:37 +08:00
parent d49b2655f9 769a29c0c5
commit 1a851feaec
7 changed files with 1717 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomersController.php
+5
View File
@@ -62,6 +62,11 @@ class CustomersController extends Controller
$customer_page = ($cawangan_info['version'] == 'v1') ? 'customers.v1.info' : 'customers.v2.info';
if($request->tebus_auto_tawarruq_berjaya === 'true'){
$request->session()->flash('activate_tab', 'SAG_baru');
}
return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi'));
}
app/Http/Controllers/GadaianController.php
+5 -1
View File
@@ -341,13 +341,17 @@ class GadaianController extends Controller
$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";
// return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu'));
if($gadai_detail['tagbaru'] == 1)
{
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'));
}else{
return view('print.sag',compact('gadai_detail','customer_detail','marhun_detail','cawangan_detail','api_url','pembayaran_segera','auth_username','mutu'));
}
public/img/kopkb.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 55 KiB

resources/views/print/resitansuran.blade.php
+2 -2
View File
@@ -405,7 +405,7 @@ hr.new5 {
<tr>
<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:30%">Ansuran Pembiyaan</td>
<td style="width:30%">Ansuran Pembiayaan</td>
<td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
</tr>
<tr>
@@ -507,7 +507,7 @@ hr.new5 {
<tr>
<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:30%">Ansuran Pembiyaan</td>
<td style="width:30%">Ansuran Pembiayaan</td>
<td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
</tr>
<tr>
resources/views/print/resitansuran_ujrah.blade.php
+2 -2
View File
@@ -480,7 +480,7 @@
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
<table id="payment" style="width: 50%">
<tr>
<td>Ansuran Pembiyaan</td>
<td>Ansuran Pembiayaan</td>
<td>: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} </td>
</td>
</tr>
@@ -597,7 +597,7 @@
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
<table id="payment" style="width: 50%">
<tr>
<td>Ansuran Pembiyaan</td>
<td>Ansuran Pembiayaan</td>
<td>: RM {{ number_format($transaction['bayaran_pembiayaan'], 2) }} </td>
</td>
</tr>
resources/views/print/resittebusautotawarruq.blade.php
+2 -2
View File
@@ -418,7 +418,7 @@ hr.new5 {
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
</tr>
<tr>
<td style="width:10px">Pembiyaan Baru</td>
<td style="width:10px">Pembiayaan Baru</td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
</tr>
@@ -521,7 +521,7 @@ hr.new5 {
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
</tr>
<tr>
<td style="width:10px">Pembiyaan Baru</td>
<td style="width:10px">Pembiayaan Baru</td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
</tr>
resources/views/print/sag_ujrah_2.blade.php
+1701
View File
File diff suppressed because it is too large Load Diff