diff --git a/app/Models/Account.php b/app/Models/Account.php index 4f8b6834ba48..5fe2cccf7d7f 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -983,7 +983,7 @@ class Account extends Eloquent // Add line breaks if HTML isn't already being used return strip_tags($this->email_footer) == $this->email_footer ? nl2br($this->email_footer) : $this->email_footer; } else { - return "

" . trans('texts.email_signature') . "\n
\$account"; + return "

" . trans('texts.email_signature') . "\n
\$account

"; } } diff --git a/app/Ninja/Transformers/InvoiceTransformer.php b/app/Ninja/Transformers/InvoiceTransformer.php index 81999a2a6481..413f43ce1a10 100644 --- a/app/Ninja/Transformers/InvoiceTransformer.php +++ b/app/Ninja/Transformers/InvoiceTransformer.php @@ -87,9 +87,9 @@ class InvoiceTransformer extends EntityTransformer 'end_date' => $invoice->end_date, 'last_sent_date' => $invoice->last_sent_date, 'recurring_invoice_id' => (int) $invoice->recurring_invoice_id, - 'tax_name1' => $invoice->tax_name1, + 'tax_name1' => $invoice->tax_name1 ? $invoice->tax_name1 : '', 'tax_rate1' => (float) $invoice->tax_rate1, - 'tax_name2' => $invoice->tax_name2, + 'tax_name2' => $invoice->tax_name2 ? $invoice->tax_name2 : '', 'tax_rate2' => (float) $invoice->tax_rate2, 'amount' => (float) $invoice->amount, 'balance' => (float) $invoice->balance,