Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 08:14:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for missing variables prop in pre payments

Browse Source
This commit is contained in:
David Bomba 2024-02-20 07:28:53 +11:00
parent e87c618778
commit 25df7eacad
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/ClientPortal/InvoiceController.php
View File

@ -236,7 +236,6 @@ class InvoiceController extends Controller
'hashed_ids' => $invoices->pluck('hashed_id'), 'hashed_ids' => $invoices->pluck('hashed_id'),
'total' => $total, 'total' => $total,
'variables' => $variables, 'variables' => $variables,
]; ];
return $this->render('invoices.payment', $data); return $this->render('invoices.payment', $data);

4
app/Http/Controllers/ClientPortal/PrePaymentController.php
View File

@ -88,6 +88,8 @@ class PrePaymentController extends Controller
$total = $invoice->balance; $total = $invoice->balance;
$invitation = $invoice->invitations->first();
//format totals //format totals
$formatted_total = Number::formatMoney($invoice->amount, auth()->guard('contact')->user()->client); $formatted_total = Number::formatMoney($invoice->amount, auth()->guard('contact')->user()->client);
@ -113,6 +115,8 @@ class PrePaymentController extends Controller
'frequency_id' => $request->frequency_id, 'frequency_id' => $request->frequency_id,
'remaining_cycles' => $request->remaining_cycles, 'remaining_cycles' => $request->remaining_cycles,
'is_recurring' => $request->is_recurring == 'on' ? true : false, 'is_recurring' => $request->is_recurring == 'on' ? true : false,
'variables' => $variables = ($invitation && auth()->guard('contact')->user()->client->getSetting('show_accept_invoice_terms')) ? (new HtmlEngine($invitation))->generateLabelsAndValues() : false,
]; ];
return $this->render('invoices.payment', $data); return $this->render('invoices.payment', $data);