Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Fix for payment terms list

Browse Source
This commit is contained in:
Hillel Coren 2017-06-13 11:13:41 +03:00
parent 1cb9c15925
commit 94e7ff637d
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/PaymentTerm.php
View File

@ -36,7 +36,7 @@ class PaymentTerm extends EntityModel
public static function getSelectOptions() public static function getSelectOptions()
{ {
$terms = Cache::get('paymentTerms'); $terms = PaymentTerm::whereAccountId(0)->get();
foreach (PaymentTerm::scope()->get() as $term) { foreach (PaymentTerm::scope()->get() as $term) {
$terms->push($term); $terms->push($term);

4
resources/views/partials/email_templates.blade.php
View File

@ -42,8 +42,8 @@
'customClient2': invoice ? invoice.client.custom_value2 : 'custom value', 'customClient2': invoice ? invoice.client.custom_value2 : 'custom value',
'customContact1': invoice ? invoice.client.contacts[0].custom_value1 : 'custom value', 'customContact1': invoice ? invoice.client.contacts[0].custom_value1 : 'custom value',
'customContact2': invoice ? invoice.client.contacts[0].custom_value2 : 'custom value', 'customContact2': invoice ? invoice.client.contacts[0].custom_value2 : 'custom value',
'customInvoice1': invoice ? invoice.custom_value1 : 'custom value', 'customInvoice1': invoice ? invoice.custom_text_value1 : 'custom value',
'customInvoice2': invoice ? invoice.custom_value2 : 'custom value', 'customInvoice2': invoice ? invoice.custom_text_value2 : 'custom value',
}; };
// Add any available payment method links // Add any available payment method links