From 3eb03e7ad42c957f1783a92f915229a875ce17e6 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 7 Oct 2021 19:01:10 +1100 Subject: [PATCH] Fixes for terms --- app/Services/Invoice/InvoiceService.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php index 918002f8dbc9..22063cc4b809 100644 --- a/app/Services/Invoice/InvoiceService.php +++ b/app/Services/Invoice/InvoiceService.php @@ -452,13 +452,13 @@ class InvoiceService if (! $this->invoice->design_id) $this->invoice->design_id = $this->decodePrimaryKey($settings->invoice_design_id); - if (!isset($this->invoice->footer)) + if (!isset($this->invoice->footer) || empty($this->invoice->footer)) $this->invoice->footer = $settings->invoice_footer; - if (!isset($this->invoice->terms)) + if (!isset($this->invoice->terms) || empty($this->invoice->terms)) $this->invoice->terms = $settings->invoice_terms; - if (!isset($this->invoice->public_notes)) + if (!isset($this->invoice->public_notes) || empty($this->invoice->public_notes)) $this->invoice->public_notes = $this->invoice->client->public_notes; /* If client currency differs from the company default currency, then insert the client exchange rate on the model.*/