From b925b536c1ccdcfb4b2396a53dc8f7162852fa27 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 29 Nov 2023 08:50:18 +1100 Subject: [PATCH] Fixes for htmlengine --- app/Utils/HtmlEngine.php | 10 +++++++++- app/Utils/PaymentHtmlEngine.php | 7 +++++++ app/Utils/VendorHtmlEngine.php | 7 +++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index e21fee56447a..9775a4ad4007 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -90,6 +90,12 @@ class HtmlEngine $this->helpers = new Helpers(); } + public function setSettings($settings): self + { + $this->settings = $settings; + + return $this; + } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -138,7 +144,8 @@ class HtmlEngine $data['$app_url'] = ['value' => $this->generateAppUrl(), 'label' => '']; $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')]; $data['$to'] = ['value' => '', 'label' => ctrans('texts.to')]; - $data['$ship_to'] = ['value' => '', 'label' => ctrans('texts.ship_to')]; + $data['$shipping'] = ['value' => '', 'label' => ctrans('texts.ship_to')]; + $data['$total_tax_labels'] = ['value' => $this->totalTaxLabels(), 'label' => ctrans('texts.taxes')]; $data['$total_tax_values'] = ['value' => $this->totalTaxValues(), 'label' => ctrans('texts.taxes')]; $data['$line_tax_labels'] = ['value' => $this->lineTaxLabels(), 'label' => ctrans('texts.taxes')]; @@ -147,6 +154,7 @@ class HtmlEngine $data['$status_logo'] = ['value' => ' ', 'label' => ' ']; $data['$delivery_note'] = ['value' => ' ', 'label' => ctrans('texts.delivery_note')]; $data['$receipt'] = ['value' => ' ', 'label' => ctrans('texts.receipt')]; + $data['$shipping'] = ['value' => ' ', 'label' => ctrans('texts.ship_to')]; $data['$invoice.date'] = &$data['$date']; $data['$invoiceDate'] = &$data['$date']; diff --git a/app/Utils/PaymentHtmlEngine.php b/app/Utils/PaymentHtmlEngine.php index b8cf29e4057d..7c376d20cd43 100644 --- a/app/Utils/PaymentHtmlEngine.php +++ b/app/Utils/PaymentHtmlEngine.php @@ -45,6 +45,13 @@ class PaymentHtmlEngine $this->helpers = new Helpers(); } + public function setSettings($settings):self + { + $this->settings = $settings; + + return $this; + } + public function makePaymentVariables() { App::forgetInstance('translator'); diff --git a/app/Utils/VendorHtmlEngine.php b/app/Utils/VendorHtmlEngine.php index 8a7fddfbbe22..2e0765c84d21 100644 --- a/app/Utils/VendorHtmlEngine.php +++ b/app/Utils/VendorHtmlEngine.php @@ -83,6 +83,13 @@ class VendorHtmlEngine $this->helpers = new Helpers(); } + public function setSettings($settings):self + { + $this->settings = $settings; + + return $this; + } + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////