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

fix resit tebus total rebate

Browse Source
This commit is contained in:
Hafifie PKB
2023-12-06 15:49:32 +08:00
parent 6feec1a6b1
commit cc48bf3565
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+3 -1
View File
@@ -556,6 +556,8 @@ class GadaianController extends Controller
$totalBayaranAnsuran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/norujukan/total/ansuran',['norujukan'=>$id])->json();
$totalrebate = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/totalrebate',['norujukan'=>$id])->json();
// dd($wakil);
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
@@ -563,7 +565,7 @@ class GadaianController extends Controller
$khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first();
if($gadai['tagbaru'] == 1) {
return view('print.resittebus_ujrah',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
return view('print.resittebus_ujrah',compact('totalrebate','transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
} else {
return view('print.resittebus',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
}
resources/views/print/resittebus_ujrah.blade.php
+4 -4
View File
@@ -517,7 +517,7 @@
<tr>
<td style="width:10px">(-) Rebat Untung</td>
<td style="width:10px">: RM
{{ number_format($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet'], 2) }}
{{ number_format($totalrebate['onepercent'], 2) }}
</td>
</tr>
<tr>
@@ -527,7 +527,7 @@
<tr>
<td style="width:10px">(-) Rebat Ujrah</td>
<td style="width:10px">: RM
{{ number_format($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet'], 2) }} </td>
{{ number_format($totalrebate['ujrah'], 2) }} </td>
</tr>
<tr>
<td></td>
@@ -661,7 +661,7 @@
<tr>
<td style="width:10px">(-) Rebat Untung</td>
<td style="width:10px">: RM
{{ number_format($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet'], 2) }}
{{ number_format($totalrebate['onepercent'], 2) }}
</td>
</tr>
<tr>
@@ -671,7 +671,7 @@
<tr>
<td style="width:10px">(-) Rebat Ujrah</td>
<td style="width:10px">: RM
{{ number_format($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet'], 2) }} </td>
{{ number_format($totalrebate['ujrah'], 2) }} </td>
</tr>
<tr>
<td></td>