From f543ff4a939ab5635b068f707a126e0808f30f5e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 26 Sep 2021 13:25:45 +1000 Subject: [PATCH] Convert reserved keyworks --- app/Factory/RecurringInvoiceToInvoiceFactory.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/Factory/RecurringInvoiceToInvoiceFactory.php b/app/Factory/RecurringInvoiceToInvoiceFactory.php index f96c7514fd83..3b9879cecfb9 100644 --- a/app/Factory/RecurringInvoiceToInvoiceFactory.php +++ b/app/Factory/RecurringInvoiceToInvoiceFactory.php @@ -25,9 +25,9 @@ class RecurringInvoiceToInvoiceFactory $invoice->discount = $recurring_invoice->discount; $invoice->is_amount_discount = $recurring_invoice->is_amount_discount; $invoice->po_number = $recurring_invoice->po_number; - $invoice->footer = $recurring_invoice->footer; - $invoice->terms = $recurring_invoice->terms; - $invoice->public_notes = $recurring_invoice->public_notes; + $invoice->footer = self::tranformObject($recurring_invoice->footer, $client); + $invoice->terms = self::tranformObject($recurring_invoice->terms, $client); + $invoice->public_notes = self::tranformObject($recurring_invoice->public_notes, $client); $invoice->private_notes = $recurring_invoice->private_notes; //$invoice->date = now()->format($client->date_format()); //$invoice->due_date = $recurring_invoice->calculateDueDate(now()); @@ -76,4 +76,9 @@ class RecurringInvoiceToInvoiceFactory return $line_items; } + + private static function tranformObject($object, $client) + { + return Helpers::processReservedKeywords($object, $client); + } }