Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

Ensure recurring invoice footer uses the latest account setting

Browse Source
This commit is contained in:
Hillel Coren 2017-10-24 22:12:53 +03:00
parent 0be04fa023
commit 351fd45c80
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -501,8 +501,13 @@ class InvoiceRepository extends BaseRepository
$invoice->terms = ''; $invoice->terms = '';
} }
$invoice->invoice_footer = (isset($data['invoice_footer']) && trim($data['invoice_footer'])) ? trim($data['invoice_footer']) : (! $publicId && $account->invoice_footer ? $account->invoice_footer : ''); if (isset($data['invoice_footer']) && trim($data['invoice_footer'])) {
$invoice->public_notes = isset($data['public_notes']) ? trim($data['public_notes']) : ''; $invoice->invoice_footer = trim($data['invoice_footer']);
} elseif ($isNew && ! $invoice->is_recurring && $account->invoice_footer) {
$invoice->invoice_footer = $account->invoice_footer;
} else {
$invoice->invoice_footer = '';
}
// process date variables if not recurring // process date variables if not recurring
if (! $invoice->is_recurring) { if (! $invoice->is_recurring) {