tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

Browse source
This commit is contained in:
Hillel Coren 2016-04-08 10:38:17 +03:00
commit 1118824fce
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Account.php
View file

@ -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 "<p>" . trans('texts.email_signature') . "\n<br>\$account</ p>";
return "<p>" . trans('texts.email_signature') . "\n<br>\$account</p>";
}
}

4
app/Ninja/Transformers/InvoiceTransformer.php
View file

@ -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,