1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00

Fix report titles for custom fields

This commit is contained in:
Hillel Coren 2018-02-14 13:29:28 +02:00
parent 682c12440d
commit 7e4627a423
4 changed files with 8 additions and 8 deletions

View File

@ -23,10 +23,10 @@ class ClientReport extends AbstractReport
$account = $user->account;
if ($account->custom_client_label1) {
$columns[$account->custom_client_label1] = ['columnSelector-false', 'custom'];
$columns[$account->present()->customClientLabel1] = ['columnSelector-false', 'custom'];
}
if ($account->custom_client_label2) {
$columns[$account->custom_client_label2] = ['columnSelector-false', 'custom'];
$columns[$account->present()->customClientLabel2] = ['columnSelector-false', 'custom'];
}
return $columns;

View File

@ -32,10 +32,10 @@ class InvoiceReport extends AbstractReport
$account = auth()->user()->account;
if ($account->custom_invoice_text_label1) {
$columns[$account->custom_invoice_text_label1] = ['columnSelector-false', 'custom'];
$columns[$account->present()->customInvoiceTextLabel1] = ['columnSelector-false', 'custom'];
}
if ($account->custom_invoice_text_label1) {
$columns[$account->custom_invoice_text_label1] = ['columnSelector-false', 'custom'];
$columns[$account->present()->customInvoiceTextLabel2] = ['columnSelector-false', 'custom'];
}
return $columns;

View File

@ -32,11 +32,11 @@ class ProductReport extends AbstractReport
}
if ($account->custom_invoice_item_label1) {
$columns[Utils::getCustomLabel($account->custom_invoice_item_label1)] = ['columnSelector-false', 'custom'];
$columns[$account->present()->customProductLabel1] = ['columnSelector-false', 'custom'];
}
if ($account->custom_invoice_item_label2) {
$columns[Utils::getCustomLabel($account->custom_invoice_item_label2)] = ['columnSelector-false', 'custom'];
$columns[$account->present()->customProductLabel2] = ['columnSelector-false', 'custom'];
}
return $columns;

View File

@ -28,10 +28,10 @@ class QuoteReport extends AbstractReport
$account = auth()->user()->account;
if ($account->custom_invoice_text_label1) {
$columns[$account->custom_invoice_text_label1] = ['columnSelector-false', 'custom'];
$columns[$account->present()->customInvoiceTextLabel1] = ['columnSelector-false', 'custom'];
}
if ($account->custom_invoice_text_label1) {
$columns[$account->custom_invoice_text_label1] = ['columnSelector-false', 'custom'];
$columns[$account->present()->customInvoiceTextLabel2] = ['columnSelector-false', 'custom'];
}
return $columns;