From 881aa4add91d80b4e68fc10e74de0d00ed4eb753 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 24 May 2023 14:47:05 +1000 Subject: [PATCH] Fixes for custom email template --- app/PaymentDrivers/PaytracePaymentDriver.php | 2 -- app/Services/Email/EmailDefaults.php | 16 +++++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php index 2097ea89ce86..5f33ea843e3a 100644 --- a/app/PaymentDrivers/PaytracePaymentDriver.php +++ b/app/PaymentDrivers/PaytracePaymentDriver.php @@ -144,8 +144,6 @@ class PaytracePaymentDriver extends BaseDriver $response = $this->gatewayRequest('/v1/transactions/sale/by_customer', $data); - nlog($response); - if ($response && $response->success) { $data = [ 'gateway_type_id' => $cgt->gateway_type_id, diff --git a/app/Services/Email/EmailDefaults.php b/app/Services/Email/EmailDefaults.php index 79f1612915bf..47d80f5702b0 100644 --- a/app/Services/Email/EmailDefaults.php +++ b/app/Services/Email/EmailDefaults.php @@ -168,14 +168,10 @@ class EmailDefaults */ private function setBody(): self { - if ($this->template == 'email.template.custom') { - $this->email->email_object->body = (str_replace('$body', $this->email->email_object->body, $this->email->email_object->settings->email_style_custom)); - return $this; - } - - if ($this->email->email_object->body) { + + if (strlen($this->email->email_object->body) > 3) { // A Custom Message has been set in the email screen. - return $this; + // return $this; } elseif (strlen($this->email->email_object->settings?->{$this->email->email_object->email_template_body}) > 3) { // A body has been saved in the settings. $this->email->email_object->body = $this->email->email_object->settings?->{$this->email->email_object->email_template_body}; @@ -183,7 +179,13 @@ class EmailDefaults // Default template to be used $this->email->email_object->body = EmailTemplateDefaults::getDefaultTemplate($this->email->email_object->email_template_body, $this->locale); } + + if ($this->template == 'email.template.custom') { + $this->email->email_object->body = (str_replace('$body', $this->email->email_object->body, str_replace(["\r","\n"], "", $this->email->email_object->settings->email_style_custom))); + } + return $this; + } /**