fix Maintanence-Mode in Module-Config-Section

OXID-eSales · Dec 1, 2023 · 053db2f · 053db2f
1 parent 27ba1cf
commit 053db2f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.3] - 2023-12-01
+
+# Fixed
+- Compatibility-Issue with Unzer-Module
+- Maintanence-Mode in Module-Config-Section
+
 ## [1.1.2] - 2023-11-14
 
 # Fixed

diff --git a/src/Core/Module.php b/src/Core/Module.php
@@ -13,7 +13,7 @@ final class Module
 {
     public const MODULE_NAME_DE = 'Adyen Payment für OXID';
     public const MODULE_NAME_EN = 'Adyen Payment for OXID';
-    public const MODULE_VERSION = '1.1.2';
+    public const MODULE_VERSION = '1.1.3';
     public const MODULE_VERSION_FULL = self::MODULE_VERSION . ' SDK-Version ' . self::ADYEN_SDK_VERSION;
     public const MODULE_PLATFORM_NAME = 'OXID';
     public const MODULE_PLATFORM_VERSION = '1.0';

diff --git a/src/Core/ViewConfig.php b/src/Core/ViewConfig.php
@@ -37,8 +37,8 @@ class ViewConfig extends ViewConfig_parent
     use ServiceContainer;
     use AdyenPayment;
 
-    protected ?ModuleSettings $moduleSettings;
-    protected ?Context $context;
+    protected ?ModuleSettings $adyenModuleSettings = null;
+    protected ?Context $adyenContext = null;
     protected ?PaymentMethods $adyenPaymentMethods;
 
     /**
@@ -323,10 +323,10 @@ public function getTemplatePayButtonContainerId(?Payment $payment): string
      */
     public function getModuleSettingsSrvc(): ModuleSettings
     {
-        if (is_null($this->moduleSettings)) {
-            $this->moduleSettings = $this->getServiceFromContainer(ModuleSettings::class);
+        if (is_null($this->adyenModuleSettings)) {
+            $this->adyenModuleSettings = $this->getServiceFromContainer(ModuleSettings::class);
         }
-        return $this->moduleSettings;
+        return $this->adyenModuleSettings;
     }
 
     /**
@@ -335,10 +335,10 @@ public function getModuleSettingsSrvc(): ModuleSettings
      */
     protected function getContextSrvc(): Context
     {
-        if (is_null($this->context)) {
-            $this->context = $this->getServiceFromContainer(Context::class);
+        if (is_null($this->adyenContext)) {
+            $this->adyenContext = $this->getServiceFromContainer(Context::class);
         }
-        return $this->context;
+        return $this->adyenContext;
     }
 
     /**