diff --git a/app/Ninja/Reports/InvoiceReport.php b/app/Ninja/Reports/InvoiceReport.php index 3918deb668fe..1dce1b17b1b9 100644 --- a/app/Ninja/Reports/InvoiceReport.php +++ b/app/Ninja/Reports/InvoiceReport.php @@ -25,6 +25,8 @@ class InvoiceReport extends AbstractReport 'private_notes' => ['columnSelector-false'], 'vat_number' => ['columnSelector-false'], 'user' => ['columnSelector-false'], + 'billing_address' => ['columnSelector-false'], + 'shipping_address' => ['columnSelector-false'], ]; if (TaxRate::scope()->count()) { @@ -121,6 +123,8 @@ class InvoiceReport extends AbstractReport $invoice->private_notes, $client->vat_number, $invoice->user->getDisplayName(), + trim(str_replace('
', ', ', $client->present()->address()), ', '), + trim(str_replace('
', ', ', $client->present()->address(ADDRESS_SHIPPING)), ', '), ]; if ($hasTaxRates) { diff --git a/app/Ninja/Reports/QuoteReport.php b/app/Ninja/Reports/QuoteReport.php index e17c3070d292..ccdba056d151 100644 --- a/app/Ninja/Reports/QuoteReport.php +++ b/app/Ninja/Reports/QuoteReport.php @@ -19,6 +19,8 @@ class QuoteReport extends AbstractReport 'status' => [], 'private_notes' => ['columnSelector-false'], 'user' => ['columnSelector-false'], + 'billing_address' => ['columnSelector-false'], + 'shipping_address' => ['columnSelector-false'], ]; if (TaxRate::scope()->count()) { @@ -87,6 +89,8 @@ class QuoteReport extends AbstractReport $invoice->present()->status(), $invoice->private_notes, $invoice->user->getDisplayName(), + trim(str_replace('
', ', ', $client->present()->address()), ', '), + trim(str_replace('
', ', ', $client->present()->address(ADDRESS_SHIPPING)), ', '), ]; if ($hasTaxRates) {