From 7d769ee2415bcb5584084b2137768cbf6fbbe352 Mon Sep 17 00:00:00 2001
From: Chris Smith <chrissmith@mount7.com>
Date: Mon, 10 Feb 2025 11:42:15 +0100
Subject: [PATCH 1/4] Fix undefined variable

---
 Core/Email.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Core/Email.php b/Core/Email.php
index ead3a41..787420e 100644
--- a/Core/Email.php
+++ b/Core/Email.php
@@ -44,6 +44,7 @@ public function sendOrderEmailToOwner($order, $subject = null)
         // send not pretending from order user, as different email domain rise spam filters
 
         // Original: $this->setFrom($shop->oxshops__oxowneremail->value);
+        $sFullName = '';
         if ($user->oxuser__oxcompany->value) {
             $sFullName = $user->oxuser__oxcompany->getRawValue() . ' | ';
         }

From 99b6b14c2af9d50b64b799d8b13a464b5da8c9db Mon Sep 17 00:00:00 2001
From: Chris Smith <chrissmith@mount7.com>
Date: Mon, 10 Feb 2025 11:50:57 +0100
Subject: [PATCH 2/4] Fix oxideshop requirement

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 0a8b19f..f8be067 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         }
     },
     "require": {
-        "oxid-esales/oxideshop-ce": ">=6.5 <6.10"
+        "oxid-esales/oxideshop-ce": "v6.x"
     },
     "autoload": {
         "psr-4": {

From 08058d9913deb5850491c1d9a1e5f434061467fa Mon Sep 17 00:00:00 2001
From: Christoph Kleine <christophkleine@mount7.com>
Date: Mon, 10 Feb 2025 18:18:02 +0100
Subject: [PATCH 3/4] Dynamically declare getRenderer method

---
 Core/Email.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Core/Email.php b/Core/Email.php
index 787420e..9ad03a7 100644
--- a/Core/Email.php
+++ b/Core/Email.php
@@ -24,6 +24,19 @@
 
 class Email extends Email_parent
 {
+    public function __construct()
+    {
+        parent::__construct();
+
+        if (!method_exists($this, 'getRenderer')) {
+            $this->getRenderer = function () {
+                $bridge = $this->getContainer()->get(TemplateRendererBridgeInterface::class);
+                $bridge->setEngine($this->_getSmarty());
+
+                return $bridge->getTemplateRenderer();
+            };
+        }
+    }
 
     public function sendOrderEmailToOwner($order, $subject = null)
     {
@@ -122,12 +135,4 @@ public function sendContactMail($emailAddress = null, $subject = null, $message
         $this->setReplyTo($emailAddress, "");
         return $this->send();
     }
-
-    private function getRenderer()
-    {
-        $bridge = $this->getContainer()->get(TemplateRendererBridgeInterface::class);
-        $bridge->setEngine($this->_getSmarty());
-
-        return $bridge->getTemplateRenderer();
-    }
 }

From 2d52ed1f79bbf6c317e364a7026f5331809d0c58 Mon Sep 17 00:00:00 2001
From: Christoph Kleine <christophkleine@mount7.com>
Date: Mon, 10 Feb 2025 18:18:02 +0100
Subject: [PATCH 4/4] Replace getRender method

---
 Core/Email.php | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/Core/Email.php b/Core/Email.php
index 9ad03a7..81ef227 100644
--- a/Core/Email.php
+++ b/Core/Email.php
@@ -21,23 +21,10 @@
 
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRendererBridgeInterface;
+use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
 
 class Email extends Email_parent
 {
-    public function __construct()
-    {
-        parent::__construct();
-
-        if (!method_exists($this, 'getRenderer')) {
-            $this->getRenderer = function () {
-                $bridge = $this->getContainer()->get(TemplateRendererBridgeInterface::class);
-                $bridge->setEngine($this->_getSmarty());
-
-                return $bridge->getTemplateRenderer();
-            };
-        }
-    }
-
     public function sendOrderEmailToOwner($order, $subject = null)
     {
         $config = Registry::getConfig();
@@ -77,7 +64,9 @@ public function sendOrderEmailToOwner($order, $subject = null)
         $this->setSmtp($shop);
 
         // create messages
-        $renderer = $this->getRenderer();
+        $container = ContainerFactory::getInstance()->getContainer();
+        $bridge = $container->get(TemplateRendererBridgeInterface::class);
+        $renderer = $bridge->getTemplateRenderer();
         $this->setViewData("order", $order);
 
         // Process view data array through oxoutput processor