Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added client address to invoice/quote reports

Browse Source
This commit is contained in:
Hillel Coren 2019-05-26 11:23:18 +03:00
parent c6a6926b7f
commit 003a5be614
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Ninja/Reports/InvoiceReport.php
View File

@ -25,6 +25,8 @@ class InvoiceReport extends AbstractReport
'private_notes' => ['columnSelector-false'], 'private_notes' => ['columnSelector-false'],
'vat_number' => ['columnSelector-false'], 'vat_number' => ['columnSelector-false'],
'user' => ['columnSelector-false'], 'user' => ['columnSelector-false'],
'billing_address' => ['columnSelector-false'],
'shipping_address' => ['columnSelector-false'],
]; ];
if (TaxRate::scope()->count()) { if (TaxRate::scope()->count()) {
@ -121,6 +123,8 @@ class InvoiceReport extends AbstractReport
$invoice->private_notes, $invoice->private_notes,
$client->vat_number, $client->vat_number,
$invoice->user->getDisplayName(), $invoice->user->getDisplayName(),
trim(str_replace('<br/>', ', ', $client->present()->address()), ', '),
trim(str_replace('<br/>', ', ', $client->present()->address(ADDRESS_SHIPPING)), ', '),
]; ];
if ($hasTaxRates) { if ($hasTaxRates) {

4
app/Ninja/Reports/QuoteReport.php
View File

@ -19,6 +19,8 @@ class QuoteReport extends AbstractReport
'status' => [], 'status' => [],
'private_notes' => ['columnSelector-false'], 'private_notes' => ['columnSelector-false'],
'user' => ['columnSelector-false'], 'user' => ['columnSelector-false'],
'billing_address' => ['columnSelector-false'],
'shipping_address' => ['columnSelector-false'],
]; ];
if (TaxRate::scope()->count()) { if (TaxRate::scope()->count()) {
@ -87,6 +89,8 @@ class QuoteReport extends AbstractReport
$invoice->present()->status(), $invoice->present()->status(),
$invoice->private_notes, $invoice->private_notes,
$invoice->user->getDisplayName(), $invoice->user->getDisplayName(),
trim(str_replace('<br/>', ', ', $client->present()->address()), ', '),
trim(str_replace('<br/>', ', ', $client->present()->address(ADDRESS_SHIPPING)), ', '),
]; ];
if ($hasTaxRates) { if ($hasTaxRates) {