From 351fd45c80d8c85493db6a684930e0b005b6a1d3 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 24 Oct 2017 22:12:53 +0300
Subject: [PATCH] Ensure recurring invoice footer uses the latest account
 setting

---
 app/Ninja/Repositories/InvoiceRepository.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 229963b097b4..88e98a5fc404 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -501,8 +501,13 @@ class InvoiceRepository extends BaseRepository
             $invoice->terms = '';
         }
 
-        $invoice->invoice_footer = (isset($data['invoice_footer']) && trim($data['invoice_footer'])) ? trim($data['invoice_footer']) : (! $publicId && $account->invoice_footer ? $account->invoice_footer : '');
-        $invoice->public_notes = isset($data['public_notes']) ? trim($data['public_notes']) : '';
+        if (isset($data['invoice_footer']) && trim($data['invoice_footer'])) {
+            $invoice->invoice_footer = trim($data['invoice_footer']);
+        } elseif ($isNew && ! $invoice->is_recurring && $account->invoice_footer) {
+            $invoice->invoice_footer = $account->invoice_footer;
+        } else {
+            $invoice->invoice_footer = '';
+        }
 
         // process date variables if not recurring
         if (! $invoice->is_recurring) {