From fc3889671e436bb3a2156d51bf52d1977ecbd7bb Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 27 Mar 2021 06:30:46 +1100 Subject: [PATCH] Fixes for HTMLEngine --- app/Models/Presenters/CompanyPresenter.php | 2 +- app/Utils/HtmlEngine.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/Presenters/CompanyPresenter.php b/app/Models/Presenters/CompanyPresenter.php index dfe8523f9254..d7cb21a24b56 100644 --- a/app/Models/Presenters/CompanyPresenter.php +++ b/app/Models/Presenters/CompanyPresenter.php @@ -97,7 +97,7 @@ class CompanyPresenter extends EntityPresenter } } - public function getSpcQrCode($client_currency, $invoice_number, $balance_due_raw) + public function getSpcQrCode($client_currency, $invoice_number, $balance_due_raw, $user_iban) { $settings = $this->entity->settings; diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 36452e255ecb..004ef0d1dc1a 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -288,7 +288,7 @@ class HtmlEngine $data['$signature'] = ['value' => $this->settings->email_signature ?: ' ', 'label' => '']; - $data['$spc_qr_code'] = ['value' => $this->company->present()->getSpcQrCode($this->client->currency()->code, $this->entity->number, $this->entity->balance), 'label' => '']; + $data['$spc_qr_code'] = ['value' => $this->company->present()->getSpcQrCode($this->client->currency()->code, $this->entity->number, $this->entity->balance, $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'company1', $this->settings->custom_value1, $this->client)), 'label' => '']; $logo = $this->company->present()->logo($this->settings);