From e4041e210522aeab644a694df4d2b709ab73dc60 Mon Sep 17 00:00:00 2001
From: Daniil Tkachev <daniil.tkachev@oxid-esales.com>
Date: Fri, 8 Nov 2024 15:53:57 +0100
Subject: [PATCH 01/16] UNZER-513 Reposition of the cardholder name field

---
 views/frontend/tpl/order/unzer_card.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/frontend/tpl/order/unzer_card.tpl b/views/frontend/tpl/order/unzer_card.tpl
index 70065019..d2cc4523 100644
--- a/views/frontend/tpl/order/unzer_card.tpl
+++ b/views/frontend/tpl/order/unzer_card.tpl
@@ -45,12 +45,12 @@
 <div id="newcc" style="display:none;">
     <form id="payment-form-card" class="unzerUI form" novalidate>
         <div class="field">
-            <div id="card-element-id-number" class="unzerInput">
+            <div id="card-element-id-cardholder" class="unzerInput">
                 <!-- Card number UI Element will be inserted here. -->
             </div>
         </div>
         <div class="field">
-            <div id="card-element-id-cardholder" class="unzerInput">
+            <div id="card-element-id-number" class="unzerInput">
                 <!-- Card number UI Element will be inserted here. -->
             </div>
         </div>

From 105a05d7538a65e7cf12b068775f5a4a5875d7f7 Mon Sep 17 00:00:00 2001
From: Daniil Tkachev <daniil.tkachev@oxid-esales.com>
Date: Fri, 8 Nov 2024 17:15:29 +0100
Subject: [PATCH 02/16] UNZER-514 Add a descriptor to the prepayment thankyou
 page

---
 src/Controller/ThankYouController.php               | 13 +++++++++++++
 src/Service/PrePaymentBankAccountService.php        |  7 +++++++
 translations/de/oscunzer_lang.php                   |  1 +
 translations/en/oscunzer_lang.php                   |  1 +
 .../blocks/page/checkout/thank_you_info.tpl         |  3 +++
 5 files changed, 25 insertions(+)

diff --git a/src/Controller/ThankYouController.php b/src/Controller/ThankYouController.php
index 48b502e4..2eed51fc 100644
--- a/src/Controller/ThankYouController.php
+++ b/src/Controller/ThankYouController.php
@@ -69,6 +69,19 @@ public function getUnzerPrePaymentHolder(): ?string
         return $result;
     }
 
+    /** Template variable getter. Returns Unzer PrePayment Holder */
+    public function getUnzerPrePaymentDescriptor(): ?string
+    {
+        $result = null;
+        $unzerOrderNumber = $this->getUnzerOrderNumberForPrePayments();
+        if ($unzerOrderNumber) {
+            $result = $this->getPrePaymentBankAccountService()->getDescriptor(
+                $unzerOrderNumber
+            );
+        }
+        return $result;
+    }
+
     private function getPrePaymentBankAccountService(): PrePaymentBankAccountService
     {
         return $this->getServiceFromContainer(PrePaymentBankAccountService::class);
diff --git a/src/Service/PrePaymentBankAccountService.php b/src/Service/PrePaymentBankAccountService.php
index 7bf55d83..ef947061 100644
--- a/src/Service/PrePaymentBankAccountService.php
+++ b/src/Service/PrePaymentBankAccountService.php
@@ -61,6 +61,13 @@ public function getHolder(string $unzerOrderNumber): ?string
         );
     }
 
+    public function getDescriptor(string $unzerOrderNumber): ?string
+    {
+        return $this->getStringVarFromSession(
+            $this->getSessionVariableName($unzerOrderNumber, 'getDescriptor')
+        );
+    }
+
     private function getStringVarFromSession(string $varName): string
     {
         $result = $this->session->getVariable($varName);
diff --git a/translations/de/oscunzer_lang.php b/translations/de/oscunzer_lang.php
index 45780451..eb4f79c2 100644
--- a/translations/de/oscunzer_lang.php
+++ b/translations/de/oscunzer_lang.php
@@ -134,4 +134,5 @@
     'OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BANK_HOLDER' => 'Kontoinhaber',
     'OSCUNZER_FIX_ROUNDING' => 'Korrektur Rundung',
     'OSCUNZER_NOT_SERIALIZABLE' => 'NOT SERIALIZABLE: ',
+    'OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BANK_DESCRIPTOR' => 'Descriptor',
 ];
diff --git a/translations/en/oscunzer_lang.php b/translations/en/oscunzer_lang.php
index 89ea1c45..7d7d0e8e 100644
--- a/translations/en/oscunzer_lang.php
+++ b/translations/en/oscunzer_lang.php
@@ -134,4 +134,5 @@
     'OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BANK_HOLDER' => 'Account Holder',
     'OSCUNZER_FIX_ROUNDING' => 'Fix rounding item',
     'OSCUNZER_NOT_SERIALIZABLE' => 'NOT SERIALIZABLE: ',
+    'OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BANK_DESCRIPTOR' => 'Descriptor',
 ];
diff --git a/views/frontend/blocks/page/checkout/thank_you_info.tpl b/views/frontend/blocks/page/checkout/thank_you_info.tpl
index 4e5c3cc0..e673a161 100644
--- a/views/frontend/blocks/page/checkout/thank_you_info.tpl
+++ b/views/frontend/blocks/page/checkout/thank_you_info.tpl
@@ -9,6 +9,9 @@
 [{if $oView->getUnzerPrePaymentHolder()}]
     [{oxmultilang ident="OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BANK_HOLDER"}]: [{$oView->getUnzerPrePaymentHolder()}]<br/>
 [{/if}]
+[{if $oView->getUnzerPrePaymentDescriptor()}]
+    [{oxmultilang ident="OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_DESCRIPTOR"}]: [{$oView->getUnzerPrePaymentDescriptor()}]<br/>
+    [{/if}]
 [{if $oView->getUnzerPrePaymentIban()}]
     <br/>
 [{/if}]

From fd3e025f5f5c521d86c99307ebd0bdfa5751612c Mon Sep 17 00:00:00 2001
From: Daniil Tkachev <daniil.tkachev@oxid-esales.com>
Date: Mon, 11 Nov 2024 14:09:14 +0100
Subject: [PATCH 03/16] UNZER-516 [Oxid 6] Remove auth/charge switch for
 ApplePay

---
 metadata.php                                   | 2 +-
 views/admin/blocks/admin_module_config_var.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata.php b/metadata.php
index 137c2bcf..16c5fe98 100644
--- a/metadata.php
+++ b/metadata.php
@@ -227,7 +227,7 @@
             'name' => 'UnzerOption_oscunzer_applepay',
             'type' => 'select',
             'value' => '0',
-            'constraints' => '0|1'
+            'constraints' => '0'
         ],
         [
             'group' => 'unzerapplepay',
diff --git a/views/admin/blocks/admin_module_config_var.tpl b/views/admin/blocks/admin_module_config_var.tpl
index ea04f078..a8e6cecd 100644
--- a/views/admin/blocks/admin_module_config_var.tpl
+++ b/views/admin/blocks/admin_module_config_var.tpl
@@ -39,7 +39,7 @@
     </dl>
     [{elseif $var_group eq "unzerapplepay"}]
         [{if $module_var eq "UnzerOption_oscunzer_applepay"}]
-            [{$smarty.block.parent}]
+            &nbsp;
         [{elseif $module_var eq "applepay_merchant_capabilities" or $module_var eq "applepay_networks"}]
             <dl>
                 <dd>

From e56800080b6b7117ae6072ffd9b47bea12b77889 Mon Sep 17 00:00:00 2001
From: Daniil Tkachev <daniil.tkachev@oxid-esales.com>
Date: Wed, 13 Nov 2024 16:39:28 +0100
Subject: [PATCH 04/16] UNZER-522 Refactor error handling by ApplePay
 credentials

---
 src/Controller/Admin/AdminOrderController.php |  19 +-
 src/Controller/Admin/ModuleConfiguration.php  | 212 +++++++++++++-----
 .../AppleMerchantCertificate.php              |  37 +++
 src/Service/ModuleSettings.php                |  60 +++--
 .../admin/blocks/admin_module_config_var.tpl  |   8 +-
 views/admin/de/oscunzer_lang.php              |  24 +-
 views/admin/en/oscunzer_lang.php              |  27 ++-
 7 files changed, 276 insertions(+), 111 deletions(-)
 create mode 100644 src/Service/ModuleConfiguration/AppleMerchantCertificate.php

diff --git a/src/Controller/Admin/AdminOrderController.php b/src/Controller/Admin/AdminOrderController.php
index ef48da6f..0edf1cb2 100644
--- a/src/Controller/Admin/AdminOrderController.php
+++ b/src/Controller/Admin/AdminOrderController.php
@@ -43,17 +43,8 @@ class AdminOrderController extends AdminDetailsController
     use ServiceContainer;
     use Request;
 
-    /**
-     * Active order object
-     *
-     * @var Order $editObject
-     */
-    protected $editObject = null;
-
-    /** @var Payment $oPayment */
-    protected $oPayment = null;
-
-    /** @var string $sTypeId */
+    protected ?Order $editObject = null;
+    protected Payment $oPayment;
     protected string $sTypeId;
 
     /**
@@ -512,11 +503,7 @@ public function isCancelReasonRequired(): bool
 
         return $this->oPayment->isUnzerSecuredPayment();
     }
-    /**
-     * Returns editable order object
-     *
-     * @return Order|null
-     */
+
     public function getEditObject(): ?object
     {
         $soxId = $this->getEditObjectId();
diff --git a/src/Controller/Admin/ModuleConfiguration.php b/src/Controller/Admin/ModuleConfiguration.php
index 04f17e22..58df68ed 100644
--- a/src/Controller/Admin/ModuleConfiguration.php
+++ b/src/Controller/Admin/ModuleConfiguration.php
@@ -6,6 +6,7 @@
 use JsonException;
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\EshopCommunity\Core\Exception\FileException;
+use OxidSolutionCatalysts\Unzer\Service\ModuleConfiguration\AppleMerchantCertificate;
 use OxidSolutionCatalysts\Unzer\Traits\Request;
 use OxidSolutionCatalysts\Unzer\Service\ModuleConfiguration\ApplePaymentProcessingCertificate;
 use OxidSolutionCatalysts\Unzer\Exception\UnzerException;
@@ -23,20 +24,22 @@
  * TODO: Fix all the suppressed warnings
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ModuleConfiguration extends ModuleConfiguration_parent
 {
     use ServiceContainer;
     use Request;
 
-    /** @var Translator $translator */
-    protected $translator = null;
-    /** @var ModuleSettings $moduleSettings */
-    protected $moduleSettings = null;
-    /** @var UnzerWebhooks $unzerWebhooks */
-    protected $unzerWebhooks = null;
+    protected Translator $translator;
+    protected ModuleSettings $moduleSettings;
+    protected UnzerWebhooks $unzerWebhooks;
+
     protected string $_sModuleId; // phpcs:ignore PSR2.Classes.PropertyDeclaration.Underscore
 
+    private string $errorPaymentMissing = 'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_MISSING';
+    private bool $isUpdate;
+
     /**
      * @inheritDoc
      */
@@ -122,26 +125,20 @@ public function unregisterWebhooks(): void
     public function transferApplePayPaymentProcessingData(): void
     {
         $systemMode = $this->moduleSettings->getSystemMode();
-        $keyReqName = $systemMode . '-' . 'applePayPaymentProcessingCertKey';
-        $key = $this->getUnzerStringRequestParameter($keyReqName);
-        $certReqName = $systemMode . '-' . 'applePayPaymentProcessingCert';
-        $cert = $this->getUnzerStringRequestParameter($certReqName);
-        $errorMessage = !$key || !$cert ? 'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_SET_CERT' : null;
+
+        $key = $this->getUnzerStringRequestParameter($systemMode . '-' . 'applePayPaymentProcessingCertKey');
+        $cert = $this->getUnzerStringRequestParameter($systemMode . '-' . 'applePayPaymentProcessingCert');
+        $errorMessage = $key && $cert ? null : $this->errorPaymentMissing;
+
+        $this->saveMerchantCert($systemMode);
+        $this->saveMerchantKey($systemMode);
+        $this->savePaymentCert($systemMode);
+        $this->savePaymentKey($systemMode);
 
         $apiClient = $this->getServiceFromContainer(ApiClient::class);
         $applePayKeyId = null;
         $applePayCertId = null;
 
-        // save Apple Pay processing cert and key
-        if (is_null($errorMessage)) {
-            $applePaymentProcessingCertificateService = $this->getServiceFromContainer(
-                ApplePaymentProcessingCertificate::class
-            );
-            $applePaymentProcessingCertificateService->saveCertificate($cert);
-            $applePaymentProcessingCertificateService->saveCertificateKey($key);
-        }
-
-        // Upload Key
         if (is_null($errorMessage)) {
             try {
                 $response = $apiClient->uploadApplePayPaymentKey($key);
@@ -216,7 +213,7 @@ public function getApplePayPaymentProcessingKeyExists(): bool
                 }
                 return $response->getStatusCode() === 200;
             } catch (GuzzleException | JsonException $guzzleException) {
-                $this->addErrorTransmittingKey();
+                $this->addErrorToDisplay('OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_KEY');
             }
         }
         return false;
@@ -233,14 +230,16 @@ public function getApplePayPaymentProcessingCertExists(): bool
             try {
                 $response = $this->getServiceFromContainer(ApiClient::class)
                     ->requestApplePayPaymentCert($certId);
+
                 if (!$response) {
-                    $this->addErrorTransmittingCertificate();
+                    $this->addErrorToDisplay('OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_CERT');
                     return false;
                 }
 
                 return $response->getStatusCode() === 200;
             } catch (GuzzleException | JsonException $guzzleException) {
-                $this->addErrorTransmittingCertificate();
+                $this->addErrorToDisplay('OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_CERT');
+                return false;
             }
         }
         return false;
@@ -255,37 +254,18 @@ public function saveConfVars()
     {
         $moduleId = $this->getUnzerStringRequestEscapedParameter('oxid');
         if ($moduleId === Module::MODULE_ID) {
-            // get translated systemmode
             $systemMode = $this->moduleSettings->getSystemMode();
 
             $applePayMC = $this->getUnzerArrayRequestParameter('applePayMC');
             $this->moduleSettings->saveApplePayMerchantCapabilities($applePayMC);
             $applePayNetworks = $this->getUnzerArrayRequestParameter('applePayNetworks');
-            $this->moduleSettings->saveApplePayNetworks($applePayNetworks);
-            $certConfigKey = $systemMode . '-' . 'applePayMerchantCert';
-            $applePayMerchantCert = $this->getUnzerStringRequestEscapedParameter($certConfigKey);
-            file_put_contents(
-                $this->moduleSettings->getApplePayMerchantCertFilePath(),
-                $applePayMerchantCert
-            );
 
-            $keyConfigKey = $systemMode . '-' . 'applePayMerchantCertKey';
-            $applePayMerchCertKey = $this->getUnzerStringRequestEscapedParameter($keyConfigKey);
-            file_put_contents(
-                $this->moduleSettings->getApplePayMerchantCertKeyFilePath(),
-                $applePayMerchCertKey
-            );
-
-            $applePaymentProcessingCertificateService = $this->getServiceFromContainer(
-                ApplePaymentProcessingCertificate::class
-            );
-            $applePaymentProcessingCertificateService->saveCertificate(
-                $this->getUnzerStringRequestEscapedParameter($systemMode . '-' . 'applePayPaymentProcessingCert')
-            );
+            $this->moduleSettings->saveApplePayNetworks($applePayNetworks);
 
-            $applePaymentProcessingCertificateService->saveCertificateKey(
-                $this->getUnzerStringRequestEscapedParameter($systemMode . '-' . 'applePayPaymentProcessingCertKey')
-            );
+            $this->saveMerchantCert($systemMode);
+            $this->saveMerchantKey($systemMode);
+            $this->savePaymentCert($systemMode);
+            $this->savePaymentKey($systemMode);
 
             $this->moduleSettings->saveWebhookConfiguration([]);
             $this->registerWebhooks();
@@ -293,27 +273,143 @@ public function saveConfVars()
         parent::saveConfVars();
     }
 
-    private function addErrorTransmittingCertificate(): void
+    /**
+     * @throws \OxidEsales\EshopCommunity\Core\Exception\FileException
+     */
+    private function saveMerchantKey(string $systemMode): void
     {
-        Registry::getUtilsView()->addErrorToDisplay(
-            oxNew(
-                UnzerException::class,
-                $this->translator->translate(
-                    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_CERT'
-                )
-            )
+        $errorIds = [
+            'onEmpty' => 'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_KEY_EMPTY',
+            'onShort' => 'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_KEY_TOO_SHORT'
+        ];
+
+        $newValue = $this->getUnzerStringRequestEscapedParameter(
+            $systemMode . '-' . 'applePayMerchantCertKey'
         );
+
+        $oldValue = $this->moduleSettings->getApplePayMerchantCertKey();
+
+        $this->setIsUpdate($oldValue, $newValue);
+
+        $isValidMerchantKey = $this->validateCredentialsForSaving($newValue, $errorIds);
+
+        if ($isValidMerchantKey) {
+            $service = $this->getServiceFromContainer(AppleMerchantCertificate::class);
+            $service->saveCertificateKey($newValue);
+        }
     }
 
-    private function addErrorTransmittingKey(): void
+    private function saveMerchantCert(string $systemMode): void
+    {
+        $errorIds = [
+            'onEmpty' => 'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_CERT_EMPTY',
+            'onShort' => 'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_CERT_TOO_SHORT'
+        ];
+
+        $newValue = $this->getUnzerStringRequestEscapedParameter(
+            $systemMode . '-' . 'applePayMerchantCert'
+        );
+
+        $oldValue = $this->moduleSettings->getApplePayMerchantCert();
+
+        $this->setIsUpdate($oldValue, $newValue);
+
+        $isValidMerchantCert = $this->validateCredentialsForSaving($newValue, $errorIds);
+
+        if ($isValidMerchantCert) {
+            $service = $this->getServiceFromContainer(AppleMerchantCertificate::class);
+            $service->saveCertificate($newValue);
+        }
+    }
+
+    /**
+     * @throws \OxidEsales\EshopCommunity\Core\Exception\FileException
+     */
+    private function savePaymentKey(string $systemMode): void
+    {
+        $errorIds = [
+            'onEmpty' => 'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_KEY_EMPTY',
+            'onShort' => 'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_KEY_TOO_SHORT'
+        ];
+
+        $newValue = $this->getUnzerStringRequestEscapedParameter(
+            $systemMode . '-' . 'applePayPaymentProcessingCertKey'
+        );
+
+        $oldValue = $this->moduleSettings->getApplePayPaymentPrivateKey();
+
+        $this->setIsUpdate($oldValue, $newValue);
+        $isValidPaymentKey = $this->validateCredentialsForSaving($newValue, $errorIds);
+
+        if ($isValidPaymentKey) {
+            $service = $this->getServiceFromContainer(ApplePaymentProcessingCertificate::class);
+            $service->saveCertificateKey($newValue);
+        }
+    }
+
+    /**
+     * @throws \OxidEsales\EshopCommunity\Core\Exception\FileException
+     */
+    private function savePaymentCert(string $systemMode): void
+    {
+        $errorIds = [
+            'onEmpty' => 'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_CERT_EMPTY',
+            'onShort' => 'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_CERT_TOO_SHORT'
+        ];
+
+        $newValue = $this->getUnzerStringRequestEscapedParameter(
+            $systemMode . '-' . 'applePayPaymentProcessingCert'
+        );
+
+        $oldValue = $this->moduleSettings->getApplePayPaymentCert();
+
+        $this->setIsUpdate($oldValue, $newValue);
+
+        $isValidPaymentKey = $this->validateCredentialsForSaving($newValue, $errorIds);
+
+        if ($isValidPaymentKey) {
+            $service = $this->getServiceFromContainer(ApplePaymentProcessingCertificate::class);
+            $service->saveCertificate($newValue);
+        }
+    }
+
+    private function validateCredentialsForSaving(?string $string, array $errors): bool
+    {
+        if ($string === null || strlen($string) === 0) {
+            if ($this->getIsUpdate()) {
+                $this->addErrorToDisplay($errors['onEmpty']);
+            }
+            return true;
+        }
+
+        if (strlen($string) > 1 && strlen($string) < 32) {
+            $this->addErrorToDisplay($errors['onShort']);
+            return false;
+        }
+
+        return true;
+    }
+
+    private function addErrorToDisplay(string $translateId): void
     {
         Registry::getUtilsView()->addErrorToDisplay(
             oxNew(
                 UnzerException::class,
                 $this->translator->translate(
-                    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_KEY'
+                    $translateId
                 )
             )
         );
     }
+
+    private function setIsUpdate(?string $oldValue, ?string $newValue): bool
+    {
+        $this->isUpdate = $oldValue !== $newValue;
+        return $this->isUpdate;
+    }
+
+    private function getIsUpdate(): bool
+    {
+        return $this->isUpdate;
+    }
 }
diff --git a/src/Service/ModuleConfiguration/AppleMerchantCertificate.php b/src/Service/ModuleConfiguration/AppleMerchantCertificate.php
new file mode 100644
index 00000000..c405114e
--- /dev/null
+++ b/src/Service/ModuleConfiguration/AppleMerchantCertificate.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace OxidSolutionCatalysts\Unzer\Service\ModuleConfiguration;
+
+use OxidSolutionCatalysts\Unzer\Service\ModuleSettings;
+
+class AppleMerchantCertificate
+{
+    private ModuleSettings $moduleSettings;
+
+    public function __construct(ModuleSettings $moduleSettings)
+    {
+        $this->moduleSettings = $moduleSettings;
+    }
+    public function saveCertificate(?string $certificate): bool
+    {
+        if (is_null($certificate)) {
+            return false;
+        }
+
+        return (bool) file_put_contents(
+            $this->moduleSettings->getApplePayMerchantCertFilePath(),
+            $certificate
+        );
+    }
+    public function saveCertificateKey(?string $certificateKey): bool
+    {
+        if (is_null($certificateKey)) {
+            return false;
+        }
+
+        return (bool) file_put_contents(
+            $this->moduleSettings->getApplePayMerchantCertKeyFilePath(),
+            $certificateKey
+        );
+    }
+}
diff --git a/src/Service/ModuleSettings.php b/src/Service/ModuleSettings.php
index 865dafb9..799e6c7b 100644
--- a/src/Service/ModuleSettings.php
+++ b/src/Service/ModuleSettings.php
@@ -254,15 +254,19 @@ public function getApplePayMerchantIdentifier(): string
 
     /**
      * @return string
-     * @throws FileException
      */
     public function getApplePayMerchantCert(): string
     {
-        $path = $this->getApplePayMerchantCertFilePath();
-        if (file_exists($path)) {
-            /** @var string $fileContest */
-            $fileContest = file_get_contents($path);
-            return $fileContest;
+        try {
+            $path = $this->getApplePayMerchantCertFilePath();
+
+            if (file_exists($path)) {
+                /** @var string $fileContest */
+                $fileContest = file_get_contents($path);
+                return $fileContest;
+            }
+        } catch (FileException $e) {
+            return '';
         }
 
         return '';
@@ -274,11 +278,15 @@ public function getApplePayMerchantCert(): string
      */
     public function getApplePayPaymentCert(): string
     {
-        $path = $this->getApplePayPaymentCertFilePath();
-        if (file_exists($path)) {
-            /** @var string $fileContest */
-            $fileContest = file_get_contents($path);
-            return $fileContest;
+        try {
+            $path = $this->getApplePayPaymentCertFilePath();
+            if (file_exists($path)) {
+                /** @var string $fileContest */
+                $fileContest = file_get_contents($path);
+                return $fileContest;
+            }
+        } catch (FileException $e) {
+            return '';
         }
 
         return '';
@@ -286,15 +294,18 @@ public function getApplePayPaymentCert(): string
 
     /**
      * @return string
-     * @throws FileException
      */
     public function getApplePayPaymentPrivateKey(): string
     {
-        $path = $this->getApplePayPaymentPrivateKeyFilePath();
-        if (file_exists($path)) {
-            /** @var string $fileContest */
-            $fileContest = file_get_contents($path);
-            return $fileContest;
+        try {
+            $path = $this->getApplePayPaymentPrivateKeyFilePath();
+            if (file_exists($path)) {
+                /** @var string $fileContest */
+                $fileContest = file_get_contents($path);
+                return $fileContest;
+            }
+        } catch (FileException $e) {
+            return '';
         }
 
         return '';
@@ -302,15 +313,18 @@ public function getApplePayPaymentPrivateKey(): string
 
     /**
      * @return string
-     * @throws FileException
      */
     public function getApplePayMerchantCertKey(): string
     {
-        $path = $this->getApplePayMerchantCertKeyFilePath();
-        if (file_exists($path)) {
-            /** @var string $fileContest */
-            $fileContest = file_get_contents($path);
-            return $fileContest;
+        try {
+            $path = $this->getApplePayMerchantCertKeyFilePath();
+            if (file_exists($path)) {
+                /** @var string $fileContest */
+                $fileContest = file_get_contents($path);
+                return $fileContest;
+            }
+        } catch (FileException $e) {
+            return '';
         }
 
         return '';
diff --git a/views/admin/blocks/admin_module_config_var.tpl b/views/admin/blocks/admin_module_config_var.tpl
index a8e6cecd..d27ec383 100644
--- a/views/admin/blocks/admin_module_config_var.tpl
+++ b/views/admin/blocks/admin_module_config_var.tpl
@@ -79,11 +79,11 @@
                 <dt>
                     [{if $module_var eq $systemMode|cat:"-applepay_merchant_cert_key"}]
                         <textarea class="txt"
-                                  style="width: 250px; height: 200px;"
+                                  style="width: 550px; height: 200px;"
                                   name="[{$systemMode}]-applePayMerchantCertKey" [{$readonly}]>[{$applePayMerchantCertKey}]</textarea>
                     [{else}]
                         <textarea class="txt"
-                                  style="width: 250px; height: 200px;"
+                                  style="width: 550px; height: 200px;"
                                   name="[{$systemMode}]-applePayMerchantCert" [{$readonly}]>[{$applePayMerchantCert}]</textarea>
                     [{/if}]
                     [{oxinputhelp ident="HELP_SHOP_MODULE_`$module_var`" args=$systemModeTrans}]
@@ -102,7 +102,7 @@
             <dl class="js-payment-cert-list">
                 <dt>
                         <textarea class="txt"
-                                  style="width: 250px; height: 200px;"
+                                  style="width: 550px; height: 200px;"
                                   name="[{$systemMode}]-applePayPaymentProcessingCert">[{$applePayPaymentProcessingCert}]</textarea>
                 </dt>
                 <dd>
@@ -113,7 +113,7 @@
             <dl class="js-payment-cert-list" [{if $hidePaymentProcessingTextareas}]style="display: none"[{/if}]>
                 <dt>
                         <textarea class="txt"
-                                  style="width: 250px; height: 200px;"
+                                  style="width: 550px; height: 200px;"
                                   name="[{$systemMode}]-applePayPaymentProcessingCertKey">[{$applePayPaymentProcessingCertKey}]</textarea>
                 </dt>
                 <dd>
diff --git a/views/admin/de/oscunzer_lang.php b/views/admin/de/oscunzer_lang.php
index 3cac2b41..b4460215 100644
--- a/views/admin/de/oscunzer_lang.php
+++ b/views/admin/de/oscunzer_lang.php
@@ -70,12 +70,26 @@
     'OSCUNZER_REASON_RETURN' => 'Kunde sendet Ware zurück',
     'OSCUNZER_REASON_CREDIT' => 'Kunde bekommt Geld zurück, Ware kann er behalten',
     'OSCUNZER_PAYOUT' => 'Rückzahlung',
-    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_SET_KEY' => 'Konnte privaten Schlüssel zur Zahlungsabwicklung nicht übertragen',
-    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_SET_CERT' => 'Konnte Zertifikat zur Zahlungsabwicklung nicht übertragen',
-    'OSCUNZER_ERROR_ACTIVATE_APPLEPAY_PAYMENT_CERT' => 'Konnte Zertifikat zur Zahlungsabwicklung nicht aktivieren',
-    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_KEY' => 'Konnte privaten Schlüssel zur Zahlungsabwicklung nicht abgleichen',
-    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_CERT' => 'Konnte Zertifikat zur Zahlungsabwicklung nicht abgleichen',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_SET_KEY' => 'ApplePay: Konnte privaten Schlüssel zur Zahlungsabwicklung nicht übertragen',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_SET_CERT' => 'ApplePay: Konnte Zertifikat zur Zahlungsabwicklung nicht übertragen',
+    'OSCUNZER_ERROR_ACTIVATE_APPLEPAY_PAYMENT_CERT' => 'ApplePay: Konnte Zertifikat zur Zahlungsabwicklung nicht aktivieren',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_KEY' => 'ApplePay: Konnte privaten Schlüssel zur Zahlungsabwicklung nicht abgleichen',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_CERT' => 'ApplePay: Konnte Zertifikat zur Zahlungsabwicklung nicht abgleichen',
     'OSCUNZER_sandbox' => 'Sandbox',
     'OSCUNZER_production' => 'Livebetrieb',
     'OSCUNZER_CHARGEBACK' => 'Chargeback erfolgt!',
+
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_SET_CERT' => 'ApplePay: Übertragung des Händlerzertifikats fehlgeschlagen',
+
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_KEY_TOO_SHORT' => 'ApplePay: Händlerschlüssel ist zu kurz',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_KEY_EMPTY' => 'ApplePay: Händlerschlüssel ist leer',
+
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_CERT_TOO_SHORT' => 'ApplePay: Händlerzertifikat ist zu kurz',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_CERT_EMPTY' => 'ApplePay: Händlerzertifikat ist leer',
+
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_KEY_TOO_SHORT' => 'ApplePay: Zahlungsschlüssel ist zu kurz',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_KEY_EMPTY' => 'ApplePay: Zahlungsschlüssel ist leer',
+
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_CERT_TOO_SHORT' => 'ApplePay: Zahlungszertifikat ist zu kurz',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_CERT_EMPTY' => 'ApplePay: Zahlungszertifikat ist leer',
 ];
diff --git a/views/admin/en/oscunzer_lang.php b/views/admin/en/oscunzer_lang.php
index 9558975d..823fb7f8 100644
--- a/views/admin/en/oscunzer_lang.php
+++ b/views/admin/en/oscunzer_lang.php
@@ -70,11 +70,28 @@
     'OSCUNZER_REASON_RETURN' => 'Customer sends articles back',
     'OSCUNZER_REASON_CREDIT' => 'Customer gets money back, he can keep articles',
     'OSCUNZER_PAYOUT' => 'Payout',
-    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_SET_KEY' => 'Transmitting key failed',
-    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_SET_CERT' => 'Transmitting certificate failed',
-    'OSCUNZER_ERROR_ACTIVATE_APPLEPAY_PAYMENT_CERT' => 'Activating certificate failed',
-    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_KEY' => 'Getting key failed',
-    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_CERT' => 'Getting certificate failed',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_SET_KEY' => 'ApplePay: Transmitting key failed',
+
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_SET_CERT' => 'ApplePay: Transmitting payment certificate failed',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_SET_CERT' => 'ApplePay: Transmitting merchant certificate failed',
+
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_KEY_TOO_SHORT' => 'ApplePay: Merchant key is too short',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_KEY_EMPTY' => 'ApplePay: Merchant key is empty',
+
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_CERT_TOO_SHORT' => 'ApplePay: Merchant certificate is too short',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_CERT_EMPTY' => 'ApplePay: Merchant certificate is empty',
+
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_KEY_TOO_SHORT' => 'ApplePay: Payment key is too short',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_KEY_EMPTY' => 'ApplePay: Payment key is empty',
+
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_CERT_TOO_SHORT' => 'ApplePay: Payment certificate is too short',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_CERT_EMPTY' => 'ApplePay: Payment certificate is empty',
+
+    'OSCUNZER_ERROR_ACTIVATE_APPLEPAY_PAYMENT_CERT' => 'ApplePay: Activating certificate failed',
+
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_KEY' => 'ApplePay: Getting key failed',
+    'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_PAYMENT_GET_CERT' => 'ApplePay: Getting certificate failed',
+
     'OSCUNZER_sandbox' => 'Sandbox',
     'OSCUNZER_production' => 'Production',
     'OSCUNZER_CHARGEBACK' => 'Chargeback occurred!',

From 5fb9a17d015fb44c7ff086807d7d0e1db7ec32ce Mon Sep 17 00:00:00 2001
From: Daniil Tkachev <daniil.tkachev@oxid-esales.com>
Date: Mon, 18 Nov 2024 15:48:47 +0100
Subject: [PATCH 05/16] UNZER-523 Fix issue with orders on return from auth

---
 Tests/PhpStan/phpstan.neon              |  4 ++++
 src/Controller/Admin/OrderMain.php      |  2 +-
 src/Controller/DispatcherController.php |  2 +-
 src/Model/Order.php                     |  2 ++
 src/PaymentExtensions/UnzerPayment.php  |  2 +-
 src/Service/Payment.php                 |  2 +-
 src/Service/Transaction.php             | 10 ++++------
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Tests/PhpStan/phpstan.neon b/Tests/PhpStan/phpstan.neon
index 14688a94..b642bc35 100644
--- a/Tests/PhpStan/phpstan.neon
+++ b/Tests/PhpStan/phpstan.neon
@@ -8,3 +8,7 @@ parameters:
         - ../../vendor/oxid-esales/oxideshop-ce/source/overridablefunctions.php
     ignoreErrors:
         - identifier: missingType.iterableValue
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::createTmpOrder\(\)#'
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::markUnzerOrderAsPaid\(\)#'
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::getUnzerInvoiceNr\(\)#'
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::setUnzerTransId\(\)#'
diff --git a/src/Controller/Admin/OrderMain.php b/src/Controller/Admin/OrderMain.php
index 722e62f0..357f853d 100644
--- a/src/Controller/Admin/OrderMain.php
+++ b/src/Controller/Admin/OrderMain.php
@@ -6,7 +6,7 @@
 use OxidEsales\Eshop\Core\Registry;
 use OxidSolutionCatalysts\Unzer\Model\Payment;
 use OxidSolutionCatalysts\Unzer\Service\Payment as PaymentService;
-use OxidSolutionCatalysts\Unzer\Model\Order;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidSolutionCatalysts\Unzer\Traits\ServiceContainer;
 use UnzerSDK\Exceptions\UnzerApiException;
 
diff --git a/src/Controller/DispatcherController.php b/src/Controller/DispatcherController.php
index 0618a5a7..10232c17 100644
--- a/src/Controller/DispatcherController.php
+++ b/src/Controller/DispatcherController.php
@@ -9,8 +9,8 @@
 
 use JsonException;
 use OxidEsales\Eshop\Application\Controller\FrontendController;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidEsales\Eshop\Core\Registry;
-use OxidSolutionCatalysts\Unzer\Model\Order;
 use OxidSolutionCatalysts\Unzer\Traits\Request;
 use OxidSolutionCatalysts\Unzer\Model\TmpOrder;
 use OxidSolutionCatalysts\Unzer\Service\Transaction;
diff --git a/src/Model/Order.php b/src/Model/Order.php
index f4cee96b..ae0ad1c0 100644
--- a/src/Model/Order.php
+++ b/src/Model/Order.php
@@ -26,6 +26,8 @@
 /**
  * TODO: Decrease count of dependencies to 13
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
+ * @mixin \OxidEsales\Eshop\Application\Model\Order
  */
 class Order extends Order_parent
 {
diff --git a/src/PaymentExtensions/UnzerPayment.php b/src/PaymentExtensions/UnzerPayment.php
index eabf9210..f6222e14 100644
--- a/src/PaymentExtensions/UnzerPayment.php
+++ b/src/PaymentExtensions/UnzerPayment.php
@@ -429,7 +429,7 @@ private function performTransactionForSavedPayment(
                 false,
                 null,
                 null,
-                \UnzerSDK\Constants\RecurrenceTypes::ONE_CLICK
+                RecurrenceTypes::ONE_CLICK
             );
         }
 
diff --git a/src/Service/Payment.php b/src/Service/Payment.php
index 87c020da..e8054cca 100644
--- a/src/Service/Payment.php
+++ b/src/Service/Payment.php
@@ -8,6 +8,7 @@
 namespace OxidSolutionCatalysts\Unzer\Service;
 
 use Exception;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidEsales\Eshop\Application\Model\Payment as PaymentModel;
 use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
 use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
@@ -19,7 +20,6 @@
 use OxidSolutionCatalysts\Unzer\Exception\RedirectWithMessage;
 use OxidSolutionCatalysts\Unzer\Exception\UnzerException;
 use OxidSolutionCatalysts\Unzer\Model\TmpOrder;
-use OxidSolutionCatalysts\Unzer\Model\Order;
 use OxidSolutionCatalysts\Unzer\PaymentExtensions\UnzerPayment as AbstractUnzerPayment;
 use OxidSolutionCatalysts\Unzer\Service\Transaction as TransactionService;
 use stdClass;
diff --git a/src/Service/Transaction.php b/src/Service/Transaction.php
index 9050a543..7a032cee 100644
--- a/src/Service/Transaction.php
+++ b/src/Service/Transaction.php
@@ -11,7 +11,7 @@
 use JsonException;
 use OxidEsales\Eshop\Application\Model\User;
 use OxidSolutionCatalysts\Unzer\Exception\UnzerException;
-use OxidSolutionCatalysts\Unzer\Model\Order;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidSolutionCatalysts\Unzer\Traits\Request;
 use OxidSolutionCatalysts\Unzer\Traits\ServiceContainer;
 use OxidEsales\Eshop\Core\DatabaseProvider;
@@ -228,22 +228,20 @@ protected function prepareTransactionOxid(array $params): string
     protected function saveTransaction(array $params): bool
     {
         $result = false;
-
         $transaction = $this->getNewTransactionObject();
 
-        //check if metadata exists
         $params['metadata'] = $params['metadata'] ?? json_encode('', JSON_THROW_ON_ERROR);
 
-        // building oxid from unique index columns
-        // only write to DB if oxid doesn't exist to prevent multiple entries of the same transaction
         $oxid = $this->prepareTransactionOxid($params);
+
+//        if (!$transaction->load($oxid) && $this->canSaveTransaction($transaction, $params)) {
         if (!$transaction->load($oxid)) {
             $transaction->assign($params);
             $transaction->setId($oxid);
             $transaction->save();
-
             $result = true;
         }
+
         return $result;
     }
 

From fd0bd8c35417021b0897ee9904f2e449ad28b57b Mon Sep 17 00:00:00 2001
From: Daniil Tkachev <daniil.tkachev@oxid-esales.com>
Date: Thu, 21 Nov 2024 15:28:48 +0100
Subject: [PATCH 06/16] UNZER-523 Add tests for DispatcherController

---
 Tests/Codeception/acceptance.suite.yml        |   2 +
 Tests/PhpMd/standard.xml                      |   2 +-
 Tests/PhpStan/phpstan-bootstrap.php           |   5 +
 Tests/PhpStan/phpstan.neon                    |   1 +
 .../Controller/DispatcherControllerTest.php   |  92 +++++++++++++
 .../Service/FlexibleSerializerOrderTest.php   | 101 +++++++++++++++
 src/Controller/DispatcherController.php       | 122 +++++++++++++-----
 src/Model/Order.php                           |   2 -
 src/Service/FlexibleSerializer.php            |  32 ++++-
 src/Service/PrePaymentBankAccountService.php  |   9 +-
 src/Service/Transaction.php                   |   3 +-
 src/Service/Unzer.php                         |   3 +-
 .../blocks/page/checkout/thank_you_info.tpl   |   6 +-
 13 files changed, 334 insertions(+), 46 deletions(-)
 create mode 100644 Tests/Unit/Controller/DispatcherControllerTest.php
 create mode 100644 Tests/Unit/Service/FlexibleSerializerOrderTest.php

diff --git a/Tests/Codeception/acceptance.suite.yml b/Tests/Codeception/acceptance.suite.yml
index 1f895ff2..8d4c3cb0 100644
--- a/Tests/Codeception/acceptance.suite.yml
+++ b/Tests/Codeception/acceptance.suite.yml
@@ -30,6 +30,8 @@ modules:
             %PHP_BIN% %VENDOR_PATH%/bin/reset-shop
             && mysql --defaults-file=$mysql_config --default-character-set=utf8 $dbname < $dump
             && mysql --defaults-file=$mysql_config --default-character-set=utf8 $dbname < $module_dump
+            && %PHP_BIN% /var/www/bin/oe-console oe:module:activate osc_paypal
+            && %PHP_BIN% /var/www/bin/oe-console oe:module:activate osc_amazonpay
     - \OxidEsales\Codeception\Module\Oxideshop:
         screen_shot_url: '%SCREEN_SHOT_URL%'
         depends:
diff --git a/Tests/PhpMd/standard.xml b/Tests/PhpMd/standard.xml
index 1d8b5c70..fe584097 100644
--- a/Tests/PhpMd/standard.xml
+++ b/Tests/PhpMd/standard.xml
@@ -27,5 +27,5 @@
         </properties>
     </rule>
 
-    <exclude-pattern>*OrderController.php</exclude-pattern>
+    <exclude-pattern>*Controller.php</exclude-pattern>
 </ruleset>
diff --git a/Tests/PhpStan/phpstan-bootstrap.php b/Tests/PhpStan/phpstan-bootstrap.php
index 2642b5b7..30a903dc 100644
--- a/Tests/PhpStan/phpstan-bootstrap.php
+++ b/Tests/PhpStan/phpstan-bootstrap.php
@@ -61,6 +61,11 @@ class_alias(
     \OxidSolutionCatalysts\Unzer\Model\Order_parent::class,
 );
 
+class_alias(
+    \OxidSolutionCatalysts\Unzer\Model\Order::class,
+    \OxidEsales\Eshop\Application\Model\Order::class,
+);
+
 class_alias(
     \OxidEsales\Eshop\Application\Model\Payment::class,
     \OxidSolutionCatalysts\Unzer\Model\Payment_parent::class
diff --git a/Tests/PhpStan/phpstan.neon b/Tests/PhpStan/phpstan.neon
index b642bc35..e02e6763 100644
--- a/Tests/PhpStan/phpstan.neon
+++ b/Tests/PhpStan/phpstan.neon
@@ -12,3 +12,4 @@ parameters:
         - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::markUnzerOrderAsPaid\(\)#'
         - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::getUnzerInvoiceNr\(\)#'
         - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::setUnzerTransId\(\)#'
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::finalizeTmpOrder\(\)#'
diff --git a/Tests/Unit/Controller/DispatcherControllerTest.php b/Tests/Unit/Controller/DispatcherControllerTest.php
new file mode 100644
index 00000000..0a8b742e
--- /dev/null
+++ b/Tests/Unit/Controller/DispatcherControllerTest.php
@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OxidSolutionCatalysts\Unzer\Tests\Unit\Controller;
+
+use OxidSolutionCatalysts\Unzer\Model\Order;
+use OxidSolutionCatalysts\Unzer\Service\FlexibleSerializer;
+use OxidSolutionCatalysts\Unzer\Service\UnzerWebhooks;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use OxidSolutionCatalysts\Unzer\Controller\DispatcherController;
+use OxidSolutionCatalysts\Unzer\Model\TmpOrder;
+use OxidSolutionCatalysts\Unzer\Service\UnzerSDKLoader;
+use UnzerSDK\Resources\Payment as UnzerResourcePayment;
+
+class DispatcherControllerTest extends TestCase
+{
+    public function testFinalizeTmpOrderExecutesCorrectly()
+    {
+        $tmpOrderMock = $this->createMock(TmpOrder::class);
+        $tmpOrderMock->method('load')->willReturn(true);
+
+        $paymentMock = $this->createMock(UnzerResourcePayment::class);
+
+        $order = oxNew(Order::class);
+        $orderId = 'testOrderId';
+        $order->assign(['OXID' => $orderId]);
+
+        $tmpData = [
+            'OXID' => 'testTmpOrderId',
+            'TMPORDER' => base64_encode(serialize(['order' => $order]))
+        ];
+
+        $controller = $this->getDispatcherControllerPartialMock();
+
+        $result = $controller->finalizeTmpOrder($paymentMock, $tmpOrderMock, $tmpData, false);
+
+        $this->assertEquals('success', $result);
+    }
+
+    public function testFinalizeTmpOrderReturnsErrorOnInvalidData()
+    {
+        $tmpOrderMock = $this->createMock(TmpOrder::class);
+        $tmpOrderMock->method('load')->willReturn(false);
+
+        $paymentMock = $this->createMock(UnzerResourcePayment::class);
+
+        $tmpData = [
+            'OXID' => 'testTmpOrderId',
+            'TMPORDER' => base64_encode(serialize(['invalid_data' => 'value']))
+        ];
+
+        $controller = $this->getDispatcherControllerPartialMock();
+
+        $result = $controller->finalizeTmpOrder($paymentMock, $tmpOrderMock, $tmpData, false);
+
+        $this->assertEquals('error', $result);
+    }
+
+    private function getDispatcherControllerPartialMock(): MockObject
+    {
+        $controller = $this->getMockBuilder(DispatcherController::class)
+            ->onlyMethods([
+                'getUnzerWebhooks',
+                'getUnzerSdkLoader',
+                'getFlexibleSerializer',
+                'returnError',
+                'returnSuccess'
+            ])
+            ->getMock();
+
+        $unzerWebhooksMock = $this->createMock(UnzerWebhooks::class);
+        $controller->method('getUnzerWebhooks')
+            ->willReturn($unzerWebhooksMock);
+
+        $controller->method('getUnzerSdkLoader')
+            ->willReturn($this->createMock(UnzerSDKLoader::class));
+
+        $controller->method('returnError')
+            ->willReturn('error');
+
+        $controller->method('returnSuccess')
+            ->willReturn('success');
+
+        $flexibleSerializer = new FlexibleSerializer();
+        $controller->method('getFlexibleSerializer')
+            ->willReturn($flexibleSerializer);
+
+        return $controller;
+    }
+}
diff --git a/Tests/Unit/Service/FlexibleSerializerOrderTest.php b/Tests/Unit/Service/FlexibleSerializerOrderTest.php
new file mode 100644
index 00000000..61c68281
--- /dev/null
+++ b/Tests/Unit/Service/FlexibleSerializerOrderTest.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace OxidSolutionCatalysts\Unzer\Tests\Unit\Service;
+
+use OxidSolutionCatalysts\Unzer\Model\Order;
+use OxidEsales\Eshop\Core\Field;
+use OxidSolutionCatalysts\Unzer\Service\FlexibleSerializer;
+use PHPUnit\Framework\TestCase;
+use stdClass;
+
+class FlexibleSerializerOrderTest extends TestCase
+{
+    private $flexibleSerializer;
+
+    protected function setUp(): void
+    {
+        $this->flexibleSerializer = new FlexibleSerializer();
+    }
+
+    private function createSerializedData(array $data): string
+    {
+        $testData = new stdClass();
+        foreach ($data as $key => $value) {
+            $testData->$key = $value;
+        }
+        return serialize($testData);
+    }
+
+    public function testRestoreOrderFromStrClass(): void
+    {
+        // Prepare test data
+        $testData = $this->createSerializedData([
+            'oxid' => 'testOrderId',
+            'oxordernr' => '12345',
+            'oxtotalordersum' => '99.99',
+            'oxorderdate' => '2024-01-01 12:00:00',
+            'oxbillfname' => 'John',
+            'oxbilllname' => 'Doe'
+        ]);
+
+        // Execute method
+        $result = $this->flexibleSerializer->restoreOrderFromStrClass($testData);
+
+        // Verify result is Order instance with finalizeTmpOrder method
+        $this->assertInstanceOf(Order::class, $result);
+        $this->assertTrue(method_exists($result, 'finalizeTmpOrder'), 'Result should have finalizeTmpOrder method');
+
+        // Verify fields were set correctly using getFieldData
+        $this->assertEquals('testOrderId', $result->getFieldData('oxid'));
+        $this->assertEquals('12345', $result->getFieldData('oxordernr'));
+        $this->assertEquals('99.99', $result->getFieldData('oxtotalordersum'));
+        $this->assertEquals('2024-01-01 12:00:00', $result->getFieldData('oxorderdate'));
+        $this->assertEquals('John', $result->getFieldData('oxbillfname'));
+        $this->assertEquals('Doe', $result->getFieldData('oxbilllname'));
+    }
+
+    public function testRestoreOrderFromStrClassWithEmptyData(): void
+    {
+        $testData = $this->createSerializedData([]);
+
+        $result = $this->flexibleSerializer->restoreOrderFromStrClass($testData);
+
+        $this->assertInstanceOf(Order::class, $result);
+        $this->assertNull($result->getFieldData('oxid'));
+        $this->assertNull($result->getFieldData('oxordernr'));
+    }
+
+    public function testRestoreOrderFromStrClassWithNullValues(): void
+    {
+        $testData = $this->createSerializedData([
+            'oxid' => null,
+            'oxordernr' => null,
+            'oxtotalordersum' => null
+        ]);
+
+        $result = $this->flexibleSerializer->restoreOrderFromStrClass($testData);
+
+        $this->assertNull($result->getFieldData('oxid'));
+        $this->assertNull($result->getFieldData('oxordernr'));
+        $this->assertNull($result->getFieldData('oxtotalordersum'));
+    }
+
+    public function testRestoreOrderFromStrClassWithMixedTypes(): void
+    {
+        $testData = $this->createSerializedData([
+            'oxid' => 'testOrderId',
+            'oxtotalordersum' => 99.99,
+            'oxordernr' => 12345,
+            'oxdelcost' => '10.00',
+            'oxpaid' => true
+        ]);
+
+        $result = $this->flexibleSerializer->restoreOrderFromStrClass($testData);
+
+        $this->assertEquals('testOrderId', $result->getFieldData('oxid'));
+        $this->assertEquals(99.99, $result->getFieldData('oxtotalordersum'));
+        $this->assertEquals(12345, $result->getFieldData('oxordernr'));
+        $this->assertEquals('10.00', $result->getFieldData('oxdelcost'));
+        $this->assertEquals(true, $result->getFieldData('oxpaid'));
+    }
+}
diff --git a/src/Controller/DispatcherController.php b/src/Controller/DispatcherController.php
index 10232c17..2c952af4 100644
--- a/src/Controller/DispatcherController.php
+++ b/src/Controller/DispatcherController.php
@@ -11,6 +11,7 @@
 use OxidEsales\Eshop\Application\Controller\FrontendController;
 use OxidEsales\Eshop\Application\Model\Order;
 use OxidEsales\Eshop\Core\Registry;
+use OxidSolutionCatalysts\Unzer\Service\FlexibleSerializer;
 use OxidSolutionCatalysts\Unzer\Traits\Request;
 use OxidSolutionCatalysts\Unzer\Model\TmpOrder;
 use OxidSolutionCatalysts\Unzer\Service\Transaction;
@@ -18,6 +19,7 @@
 use OxidSolutionCatalysts\Unzer\Service\UnzerSDKLoader;
 use OxidSolutionCatalysts\Unzer\Service\UnzerWebhooks;
 use OxidSolutionCatalysts\Unzer\Traits\ServiceContainer;
+use stdClass;
 use UnzerSDK\Constants\PaymentState;
 use UnzerSDK\Resources\Payment;
 
@@ -41,10 +43,10 @@ class DispatcherController extends FrontendController
     public function __construct()
     {
         parent::__construct();
-        $this->transaction = $this->getServiceFromContainer(Transaction::class);
-        $this->unzerWebhooks = $this->getServiceFromContainer(UnzerWebhooks::class);
-        $this->unzerSDKLoader = $this->getServiceFromContainer(UnzerSDKLoader::class);
-        $this->translator = $this->getServiceFromContainer(Translator::class);
+        $this->transaction = $this->getTransactionService();
+        $this->unzerWebhooks = $this->getUnzerWebhooks();
+        $this->unzerSDKLoader = $this->getUnzerSdkLoader();
+        $this->translator = $this->getTranslator();
     }
 
     public function updatePaymentTransStatus(): void
@@ -55,7 +57,7 @@ public function updatePaymentTransStatus(): void
             return;
         }
 
-        $aJson = $this->decodeJson((string)$jsonRequest);
+        $aJson = $this->decodeJson($jsonRequest);
         if (!is_array($aJson) || !isset($aJson['retrieveUrl'])) {
             $this->exitWithMessage("Invalid Json");
             return;
@@ -93,21 +95,94 @@ public function updatePaymentTransStatus(): void
         }
     }
 
+    /**
+     * @throws \Exception
+     */
+    public function finalizeTmpOrder(
+        Payment $unzerPayment,
+        TmpOrder $tmpOrder,
+        array $tmpData,
+        bool $bError
+    ): string {
+        $return = $this->returnError();
+        if ($tmpOrder->load($tmpData['OXID'])) {
+            $flexibleSerializer = $this->getFlexibleSerializer();
+            $oOrder = $flexibleSerializer->safeUnserialize($tmpData['TMPORDER'], [Order::class]);
+
+            if ($oOrder instanceof \stdClass || $oOrder === false) {
+                $oOrder = $flexibleSerializer->restoreOrderFromStrClass($tmpData['TMPORDER']);
+            }
+
+            if ($oOrder instanceof Order) {
+                $oOrder->finalizeTmpOrder($unzerPayment, $bError);
+                $tmpOrder->assign(['status' => 'FINISHED']);
+                $tmpOrder->save();
+
+                $return = $this->returnSuccess();
+            }
+        }
+
+        return $return;
+    }
+
+    protected function getUnzerKeyFromContext(): string
+    {
+        $context = $this->getContext();
+        return $this->unzerWebhooks->getUnzerKeyFromWebhookContext($context);
+    }
+
+    protected function isInvalidRequest(array $url, string $typeid): bool
+    {
+        return $url['scheme'] !== "https" ||
+            ($url['host'] !== "api.unzer.com" && $url['host'] !== "sbx-api.heidelpay.com") ||
+            !$this->transaction->isValidTransactionTypeId($typeid);
+    }
+
+    protected function getUnzerSdkLoader(): UnzerSDKLoader
+    {
+        return $this->getServiceFromContainer(UnzerSDKLoader::class);
+    }
+
+    protected function returnError(): string
+    {
+        return $this->translator->translate('oscunzer_ERROR_HANDLE_TMP_ORDER');
+    }
+
+    protected function returnSuccess(): string
+    {
+        return $this->translator->translate('oscunzer_SUCCESS_HANDLE_TMP_ORDER');
+    }
+
     private function exitWithMessage(string $message): void
     {
         Registry::getUtils()->showMessageAndExit($message);
     }
 
-    private function getUnzerKeyFromContext(): string
+
+    protected function getOrderObject(): Order
     {
-        $context = $this->getContext();
-        return $this->unzerWebhooks->getUnzerKeyFromWebhookContext($context);
+        return oxNew(Order::class);
+    }
+
+    protected function getTranslator(): Translator
+    {
+        return $this->getServiceFromContainer(Translator::class);
+    }
+
+    protected function getUnzerWebhooks(): UnzerWebhooks
+    {
+        return $this->getServiceFromContainer(UnzerWebhooks::class);
+    }
+
+    protected function getTransactionService(): Transaction
+    {
+        return $this->getServiceFromContainer(Transaction::class);
     }
 
     private function processPayment(\UnzerSDK\Unzer $unzer, string $paymentId): string
     {
-        $order = oxNew(Order::class);
-        $data = $this->transaction::getTransactionDataByPaymentId($paymentId);
+        $order = $this->getOrderObject();
+        $data = $this->transaction->getTransactionDataByPaymentId($paymentId);
 
         if (!is_array($data) || !isset($data[0]['OXORDERID'])) {
             return "Invalid Order Data";
@@ -137,13 +212,6 @@ private function getTypeId(array $url): string
         return end($pathSegments);
     }
 
-    private function isInvalidRequest(array $url, string $typeid): bool
-    {
-        return $url['scheme'] !== "https" ||
-            ($url['host'] !== "api.unzer.com" && $url['host'] !== "sbx-api.heidelpay.com") ||
-            !$this->transaction->isValidTransactionTypeId($typeid);
-    }
-
     private function getContext(): string
     {
         return $this->getUnzerStringRequestParameter('context', 'shop');
@@ -200,25 +268,11 @@ private function handleTmpOrder(Payment $unzerPayment): string
         return $this->translator->translate('oscunzer_ERROR_HANDLE_TMP_ORDER');
     }
 
-    private function finalizeTmpOrder(
-        Payment $unzerPayment,
-        TmpOrder $tmpOrder,
-        array $tmpData,
-        bool $bError
-    ): string {
-        if ($tmpOrder->load($tmpData['OXID'])) {
-            $aOrderData = unserialize(base64_decode($tmpData['TMPORDER']), ['allowed_classes' => [Order::class]]);
-            $oOrder = is_array($aOrderData) && isset($aOrderData['order']) ? $aOrderData['order'] : null;
 
-            if ($oOrder) {
-                $oOrder->finalizeTmpOrder($unzerPayment, $bError);
-                $tmpOrder->assign(['status' => 'FINISHED']);
-                $tmpOrder->save();
-                return $this->translator->translate('oscunzer_SUCCESS_HANDLE_TMP_ORDER');
-            }
-        }
 
-        return $this->translator->translate('oscunzer_ERROR_HANDLE_TMP_ORDER');
+    protected function getFlexibleSerializer(): FlexibleSerializer
+    {
+        return $this->getServiceFromContainer(FlexibleSerializer::class);
     }
 
     private function hasExceededTimeLimit(TmpOrder $tmpOrder): bool
diff --git a/src/Model/Order.php b/src/Model/Order.php
index ae0ad1c0..f4cee96b 100644
--- a/src/Model/Order.php
+++ b/src/Model/Order.php
@@ -26,8 +26,6 @@
 /**
  * TODO: Decrease count of dependencies to 13
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- *
- * @mixin \OxidEsales\Eshop\Application\Model\Order
  */
 class Order extends Order_parent
 {
diff --git a/src/Service/FlexibleSerializer.php b/src/Service/FlexibleSerializer.php
index 4ebc74b2..729ebe45 100644
--- a/src/Service/FlexibleSerializer.php
+++ b/src/Service/FlexibleSerializer.php
@@ -8,6 +8,7 @@
 namespace OxidSolutionCatalysts\Unzer\Service;
 
 use Exception;
+use OxidEsales\Eshop\Application\Model\Order;
 use ReflectionClass;
 use ReflectionException;
 use stdClass;
@@ -33,7 +34,7 @@ public function safeSerialize($object): string
      * @param array $allowedClasses An array of fully qualified class names that are allowed to be unserialized.
      * @return mixed The unserialized data.
      */
-    public function safeUnserialize(string $serialized, array $allowedClasses = [])
+    public function safeUnserialize($serialized, array $allowedClasses = [])
     {
         $unserializedData = unserialize(
             $serialized,
@@ -47,6 +48,35 @@ public function safeUnserialize(string $serialized, array $allowedClasses = [])
         return $this->restoreUnserializable($unserializedData, $allowedClasses);
     }
 
+    public function restoreOrderFromStrClass(string $serialized): ?Order
+    {
+        /** @var object $unserializedData */
+        $unserializedData = unserialize(
+            $serialized,
+            [
+                'allowed_classes' => [stdClass::class, Order::class]
+            ]
+        );
+
+        $order = $this->getOrderModel();
+
+        foreach (get_object_vars($unserializedData) as $property => $value) {
+            if (property_exists($order, $property) || method_exists($order, 'setFieldData')) {
+                if (method_exists($order, 'setFieldData')) {
+                    $order->setFieldData($property, $value);
+                }
+                $order->$property = $value;
+            }
+        }
+
+        return $order;
+    }
+
+    protected function getOrderModel(): Order
+    {
+        return oxNew(Order::class);
+    }
+
     /**
      * Convert data into a serializable format, handling objects and resources.
      *
diff --git a/src/Service/PrePaymentBankAccountService.php b/src/Service/PrePaymentBankAccountService.php
index ef947061..f9ee3afb 100644
--- a/src/Service/PrePaymentBankAccountService.php
+++ b/src/Service/PrePaymentBankAccountService.php
@@ -38,6 +38,13 @@ public function persistBankAccountInfo(Charge $charge): void
                 $charge->getHolder()
             );
         }
+
+        if ($charge->getDescriptor()) {
+            $this->session->setVariable(
+                $this->getSessionVariableName((string) $charge->getOrderId(), 'descriptor'),
+                $charge->getDescriptor()
+            );
+        }
     }
 
     public function getIban(string $unzerOrderNumber): ?string
@@ -64,7 +71,7 @@ public function getHolder(string $unzerOrderNumber): ?string
     public function getDescriptor(string $unzerOrderNumber): ?string
     {
         return $this->getStringVarFromSession(
-            $this->getSessionVariableName($unzerOrderNumber, 'getDescriptor')
+            $this->getSessionVariableName($unzerOrderNumber, 'descriptor')
         );
     }
 
diff --git a/src/Service/Transaction.php b/src/Service/Transaction.php
index 7a032cee..6eda9a2e 100644
--- a/src/Service/Transaction.php
+++ b/src/Service/Transaction.php
@@ -416,12 +416,11 @@ protected function getNewTransactionObject(): TransactionModel
     }
 
     /**
-     * @param $paymentid
      * @return array|false
      * @throws DatabaseConnectionException
      * @throws DatabaseErrorException
      */
-    public static function getTransactionDataByPaymentId(string $paymentid)
+    public function getTransactionDataByPaymentId(string $paymentid)
     {
         if ($paymentid) {
             return DatabaseProvider::getDb(DatabaseProvider::FETCH_MODE_ASSOC)->getAll(
diff --git a/src/Service/Unzer.php b/src/Service/Unzer.php
index 3b0edeb5..b0fe0025 100644
--- a/src/Service/Unzer.php
+++ b/src/Service/Unzer.php
@@ -25,7 +25,6 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Database\QueryBuilderFactoryInterface;
 use OxidEsales\Facts\Facts;
 use OxidSolutionCatalysts\Unzer\Exception\UnzerException;
-use OxidSolutionCatalysts\Unzer\Model\Order as UnzerModelOrder;
 use OxidSolutionCatalysts\Unzer\Model\UnzerPaymentData;
 use OxidSolutionCatalysts\Unzer\Traits\ServiceContainer;
 use UnzerSDK\Constants\BasketItemTypes;
@@ -438,7 +437,7 @@ public function getUnzerRiskData(Customer $unzerCustomer, User $oUser): RiskData
         $orderedAmount = 0.;
         /** @var ListModel $orderList */
         $orderList = $oUser->getOrders();
-        /** @var UnzerModelOrder $order */
+        /** @var \OxidSolutionCatalysts\Unzer\Model\Order $order */
         foreach ($orderList as $order) {
             $orderedAmount += $order->getTotalOrderSum();
         }
diff --git a/views/frontend/blocks/page/checkout/thank_you_info.tpl b/views/frontend/blocks/page/checkout/thank_you_info.tpl
index e673a161..768567ca 100644
--- a/views/frontend/blocks/page/checkout/thank_you_info.tpl
+++ b/views/frontend/blocks/page/checkout/thank_you_info.tpl
@@ -7,11 +7,11 @@
     [{oxmultilang ident="OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BIC"}]: [{$oView->getUnzerPrePaymentBic()}]<br/>
 [{/if}]
 [{if $oView->getUnzerPrePaymentHolder()}]
-    [{oxmultilang ident="OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BANK_HOLDER"}]: [{$oView->getUnzerPrePaymentHolder()}]<br/>
+    [{oxmultilang ident="OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_HOLDER"}]: [{$oView->getUnzerPrePaymentHolder()}]<br/>
 [{/if}]
 [{if $oView->getUnzerPrePaymentDescriptor()}]
-    [{oxmultilang ident="OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_DESCRIPTOR"}]: [{$oView->getUnzerPrePaymentDescriptor()}]<br/>
-    [{/if}]
+    [{oxmultilang ident="OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BANK_DESCRIPTOR"}]: [{$oView->getUnzerPrePaymentDescriptor()}]<br/>
+[{/if}]
 [{if $oView->getUnzerPrePaymentIban()}]
     <br/>
 [{/if}]

From dbd24757ac95f3d1c612391f9002209ae43973a6 Mon Sep 17 00:00:00 2001
From: Daniil Tkachev <daniil.tkachev@oxid-esales.com>
Date: Fri, 22 Nov 2024 16:02:40 +0100
Subject: [PATCH 07/16] cleanup tests

---
 Tests/Codeception/acceptance.suite.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Tests/Codeception/acceptance.suite.yml b/Tests/Codeception/acceptance.suite.yml
index 8d4c3cb0..1f895ff2 100644
--- a/Tests/Codeception/acceptance.suite.yml
+++ b/Tests/Codeception/acceptance.suite.yml
@@ -30,8 +30,6 @@ modules:
             %PHP_BIN% %VENDOR_PATH%/bin/reset-shop
             && mysql --defaults-file=$mysql_config --default-character-set=utf8 $dbname < $dump
             && mysql --defaults-file=$mysql_config --default-character-set=utf8 $dbname < $module_dump
-            && %PHP_BIN% /var/www/bin/oe-console oe:module:activate osc_paypal
-            && %PHP_BIN% /var/www/bin/oe-console oe:module:activate osc_amazonpay
     - \OxidEsales\Codeception\Module\Oxideshop:
         screen_shot_url: '%SCREEN_SHOT_URL%'
         depends:

From 1082fffb114ba49471ca528111b0de5f910e2b96 Mon Sep 17 00:00:00 2001
From: Daniil Tkachev <daniil.tkachev@oxid-esales.com>
Date: Wed, 27 Nov 2024 14:29:52 +0100
Subject: [PATCH 08/16] codestyle refinement

---
 .../Service/PaymentExtensionLoaderTest.php    |   6 +-
 Tests/Integration/Service/PaymentTest.php     |   4 +-
 Tests/PhpStan/phpstan-bootstrap.php           |  22 +--
 .../Controller/DispatcherControllerTest.php   |   2 +-
 .../PaymentExtensions/UnzerPaymentTest.php    |   8 +-
 .../UnzerPaymentTypeObjectTest.php            |  10 +-
 Tests/Unit/Service/PaymentTest.php            |  10 +-
 Tests/Unit/Service/TmpOrderServiceTest.php    | 142 ++++++++++++++++++
 Tests/Unit/Service/UnzerSDKLoaderTest.php     |   3 +-
 Tests/Unit/Service/UnzerTest.php              |  47 +-----
 composer.json                                 |   3 +-
 src/Controller/Admin/OrderList.php            |   9 +-
 src/Controller/Admin/OrderMain.php            |  13 +-
 src/Controller/PaymentController.php          |  20 ++-
 src/PaymentExtensions/AliPay.php              |   4 +-
 src/PaymentExtensions/ApplePay.php            |   6 +-
 src/PaymentExtensions/Bancontact.php          |   4 +-
 src/PaymentExtensions/Card.php                |   4 +-
 src/PaymentExtensions/EPS.php                 |   4 +-
 src/PaymentExtensions/GiroPay.php             |   4 +-
 src/PaymentExtensions/Ideal.php               |   4 +-
 src/PaymentExtensions/Installment.php         |   4 +-
 src/PaymentExtensions/InstallmentPaylater.php |   4 +-
 src/PaymentExtensions/Invoice.php             |   5 +-
 src/PaymentExtensions/InvoiceOld.php          |   4 +-
 src/PaymentExtensions/PIS.php                 |   4 +-
 src/PaymentExtensions/PayPal.php              |   4 +-
 src/PaymentExtensions/PrePayment.php          |   4 +-
 src/PaymentExtensions/Przelewy24.php          |   4 +-
 src/PaymentExtensions/Sepa.php                |   4 +-
 src/PaymentExtensions/SepaSecured.php         |   4 +-
 src/PaymentExtensions/Sofort.php              |   6 +-
 src/PaymentExtensions/UnzerPayment.php        |  51 +++----
 src/PaymentExtensions/WeChatPay.php           |   6 +-
 src/Service/ModuleSettings.php                |   2 +
 src/Service/Payment.php                       | 109 +++-----------
 src/Service/PaymentExtensionLoader.php        |  36 ++---
 src/Service/TmpOrderService.php               | 114 ++++++++++++++
 src/Service/TmpOrderServiceInterface.php      |  16 ++
 src/Service/Unzer.php                         |  40 -----
 src/Service/UnzerSDKLoader.php                |   3 +
 .../blocks/page/checkout/thank_you_info.tpl   |   2 +-
 42 files changed, 454 insertions(+), 301 deletions(-)
 create mode 100644 Tests/Unit/Service/TmpOrderServiceTest.php
 create mode 100644 src/Service/TmpOrderService.php
 create mode 100644 src/Service/TmpOrderServiceInterface.php

diff --git a/Tests/Integration/Service/PaymentExtensionLoaderTest.php b/Tests/Integration/Service/PaymentExtensionLoaderTest.php
index f745918b..7935f10e 100644
--- a/Tests/Integration/Service/PaymentExtensionLoaderTest.php
+++ b/Tests/Integration/Service/PaymentExtensionLoaderTest.php
@@ -10,6 +10,8 @@
 use OxidEsales\Eshop\Application\Model\Payment as PaymentModel;
 use OxidSolutionCatalysts\Unzer\Service\DebugHandler;
 use OxidSolutionCatalysts\Unzer\Service\PaymentExtensionLoader;
+use OxidSolutionCatalysts\Unzer\Service\SavedPayment\SavedPaymentSessionService;
+use OxidSolutionCatalysts\Unzer\Service\TmpOrderService;
 use OxidSolutionCatalysts\Unzer\Service\Unzer;
 use OxidSolutionCatalysts\Unzer\Service\UnzerSDKLoader;
 use PHPUnit\Framework\TestCase;
@@ -39,7 +41,9 @@ public function testPaymentTypeCanBeLoaded($paymentId, $paymentClass): void
             $this->getMockBuilder(Unzer::class)
                 ->disableOriginalConstructor()
                 ->getMock(),
-            $this->logger
+            $this->logger,
+            $this->createMock(SavedPaymentSessionService::class),
+            $this->createMock(TmpOrderService::class)
         );
 
         $loadedPaymentType = $sut->getPaymentExtension($paymentStub);
diff --git a/Tests/Integration/Service/PaymentTest.php b/Tests/Integration/Service/PaymentTest.php
index 75001510..28fc9df1 100644
--- a/Tests/Integration/Service/PaymentTest.php
+++ b/Tests/Integration/Service/PaymentTest.php
@@ -12,6 +12,7 @@
 use OxidEsales\TestingLibrary\UnitTestCase;
 use OxidSolutionCatalysts\Unzer\Service\Payment as PaymentService;
 use OxidSolutionCatalysts\Unzer\Service\PaymentExtensionLoader;
+use OxidSolutionCatalysts\Unzer\Service\TmpOrderService;
 use OxidSolutionCatalysts\Unzer\Service\Transaction as TransactionService;
 use OxidSolutionCatalysts\Unzer\Service\Translator;
 use OxidSolutionCatalysts\Unzer\Service\Unzer as UnzerService;
@@ -40,7 +41,8 @@ public function testRemoveTemporaryOrder($sessionValue, $expectedResult): void
             $this->createPartialMock(Translator::class, []),
             $this->createPartialMock(UnzerService::class, []),
             $this->createPartialMock(UnzerSDKLoader::class, []),
-            $this->createPartialMock(TransactionService::class, [])
+            $this->createPartialMock(TransactionService::class, []),
+            $this->createPartialMock(TmpOrderService::class, [])
         );
 
         $this->assertSame($expectedResult, $sut->removeTemporaryOrder());
diff --git a/Tests/PhpStan/phpstan-bootstrap.php b/Tests/PhpStan/phpstan-bootstrap.php
index 30a903dc..32e9480f 100644
--- a/Tests/PhpStan/phpstan-bootstrap.php
+++ b/Tests/PhpStan/phpstan-bootstrap.php
@@ -7,11 +7,18 @@ class_alias(
     \OxidSolutionCatalysts\Unzer\Controller\Admin\ModuleConfiguration_parent::class
 );
 
+
 class_alias(
     \OxidEsales\Eshop\Application\Controller\Admin\OrderMain::class,
     \OxidSolutionCatalysts\Unzer\Controller\Admin\OrderMain_parent::class
 );
 
+
+class_alias(
+    \OxidEsales\Eshop\Application\Controller\PaymentController::class,
+    \OxidSolutionCatalysts\Unzer\Controller\PaymentController_parent::class
+);
+
 class_alias(
     \OxidEsales\Eshop\Application\Controller\Admin\OrderList::class,
     \OxidSolutionCatalysts\Unzer\Controller\Admin\OrderList_parent::class
@@ -31,10 +38,6 @@ class_alias(
     \OxidEsales\Eshop\Application\Controller\Admin\AdminDetailsController::class,
     \OxidSolutionCatalysts\Unzer\Controller\Admin\AdminDetailsController_parent::class
 );
-class_alias(
-    \OxidEsales\Eshop\Application\Controller\PaymentController::class,
-    \OxidSolutionCatalysts\Unzer\Controller\PaymentController_parent::class
-);
 
 class_alias(
     \OxidEsales\Eshop\Core\Config::class,
@@ -57,19 +60,16 @@ class_alias(
 );
 
 class_alias(
-    \OxidEsales\Eshop\Application\Model\Order::class,
-    \OxidSolutionCatalysts\Unzer\Model\Order_parent::class,
+    \OxidEsales\Eshop\Application\Model\Payment::class,
+    \OxidSolutionCatalysts\Unzer\Model\Payment_parent::class
 );
 
+
 class_alias(
-    \OxidSolutionCatalysts\Unzer\Model\Order::class,
     \OxidEsales\Eshop\Application\Model\Order::class,
+    \OxidSolutionCatalysts\Unzer\Model\Order_parent::class
 );
 
-class_alias(
-    \OxidEsales\Eshop\Application\Model\Payment::class,
-    \OxidSolutionCatalysts\Unzer\Model\Payment_parent::class
-);
 
 class_alias(
     \OxidEsales\Eshop\Application\Model\DiscountList::class,
diff --git a/Tests/Unit/Controller/DispatcherControllerTest.php b/Tests/Unit/Controller/DispatcherControllerTest.php
index 0a8b742e..736cc557 100644
--- a/Tests/Unit/Controller/DispatcherControllerTest.php
+++ b/Tests/Unit/Controller/DispatcherControllerTest.php
@@ -4,7 +4,7 @@
 
 namespace OxidSolutionCatalysts\Unzer\Tests\Unit\Controller;
 
-use OxidSolutionCatalysts\Unzer\Model\Order;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidSolutionCatalysts\Unzer\Service\FlexibleSerializer;
 use OxidSolutionCatalysts\Unzer\Service\UnzerWebhooks;
 use PHPUnit\Framework\MockObject\MockObject;
diff --git a/Tests/Unit/PaymentExtensions/UnzerPaymentTest.php b/Tests/Unit/PaymentExtensions/UnzerPaymentTest.php
index a648876c..4ae35716 100644
--- a/Tests/Unit/PaymentExtensions/UnzerPaymentTest.php
+++ b/Tests/Unit/PaymentExtensions/UnzerPaymentTest.php
@@ -5,11 +5,15 @@
  * See LICENSE file for license details.
  */
 
+declare(strict_types=1);
+
 namespace OxidSolutionCatalysts\Unzer\Tests\Unit\Exception;
 
 use OxidEsales\Eshop\Application\Model\Basket as BasketModel;
 use OxidEsales\Eshop\Application\Model\User as UserModel;
 use OxidSolutionCatalysts\Unzer\PaymentExtensions\UnzerPayment;
+use OxidSolutionCatalysts\Unzer\Service\SavedPayment\SavedPaymentSessionService;
+use OxidSolutionCatalysts\Unzer\Service\TmpOrderService;
 use OxidSolutionCatalysts\Unzer\Service\Unzer as UnzerService;
 use PHPUnit\Framework\TestCase;
 use UnzerSDK\Resources\Basket;
@@ -58,7 +62,9 @@ public function testDefaultExecute(): void
                 $unzerServiceMock,
                 new \OxidSolutionCatalysts\Unzer\Service\DebugHandler(
                     $this->createMock(\Monolog\Logger::class)
-                )
+                ),
+                $this->createMock(SavedPaymentSessionService::class),
+                $this->createMock(TmpOrderService::class)
             ],
             '',
             true,
diff --git a/Tests/Unit/PaymentExtensions/UnzerPaymentTypeObjectTest.php b/Tests/Unit/PaymentExtensions/UnzerPaymentTypeObjectTest.php
index 07e9b351..6ce713fe 100644
--- a/Tests/Unit/PaymentExtensions/UnzerPaymentTypeObjectTest.php
+++ b/Tests/Unit/PaymentExtensions/UnzerPaymentTypeObjectTest.php
@@ -8,6 +8,8 @@
 namespace OxidSolutionCatalysts\Unzer\Tests\Unit\Exception;
 
 use OxidSolutionCatalysts\Unzer\Service\DebugHandler;
+use OxidSolutionCatalysts\Unzer\Service\SavedPayment\SavedPaymentSessionService;
+use OxidSolutionCatalysts\Unzer\Service\TmpOrderService;
 use OxidSolutionCatalysts\Unzer\Service\Unzer as UnzerService;
 use PHPUnit\Framework\TestCase;
 use UnzerSDK\Unzer;
@@ -29,7 +31,9 @@ public function testCreatePaymentTypePaymentTypeObject($extensionClass, $resourc
             $this->getMockBuilder(UnzerService::class)->disableOriginalConstructor()->getMock(),
             new DebugHandler(
                 $this->createMock(\Monolog\Logger::class)
-            )
+            ),
+            $this->createMock(SavedPaymentSessionService::class),
+            $this->createMock(TmpOrderService::class)
         );
 
         $result = $sut->getUnzerPaymentTypeObject();
@@ -100,7 +104,9 @@ public function testFetchPaymentTypeObject($extensionClass, $resourceClass)
             ]),
             new DebugHandler(
                 $this->createMock(\Monolog\Logger::class)
-            )
+            ),
+            $this->createMock(SavedPaymentSessionService::class),
+            $this->createMock(TmpOrderService::class)
         );
 
         $result = $sut->getUnzerPaymentTypeObject();
diff --git a/Tests/Unit/Service/PaymentTest.php b/Tests/Unit/Service/PaymentTest.php
index f3a6b23d..9bab6e18 100644
--- a/Tests/Unit/Service/PaymentTest.php
+++ b/Tests/Unit/Service/PaymentTest.php
@@ -15,6 +15,9 @@
 use OxidSolutionCatalysts\Unzer\Exception\RedirectWithMessage;
 use OxidSolutionCatalysts\Unzer\PaymentExtensions\UnzerPayment;
 use OxidSolutionCatalysts\Unzer\Service\Payment as PaymentService;
+use OxidSolutionCatalysts\Unzer\Service\SavedPayment\SavedPaymentSessionService;
+use OxidSolutionCatalysts\Unzer\Service\TmpOrderService;
+use OxidSolutionCatalysts\Unzer\Service\TmpOrderServiceInterface;
 use OxidSolutionCatalysts\Unzer\Service\Unzer as UnzerService;
 use OxidSolutionCatalysts\Unzer\Service\PaymentExtensionLoader;
 use OxidSolutionCatalysts\Unzer\Service\Transaction as TransactionService;
@@ -179,7 +182,8 @@ protected function getPaymentServiceMock(
                 $translatorMock,
                 $this->getUnzerServiceMock(),
                 $this->getUnzerSDKLoaderMock(),
-                $this->getTransactionServiceMock()
+                $this->getTransactionServiceMock(),
+                $this->createMock(TmpOrderServiceInterface::class)
             ])
             ->onlyMethods($methodsToMock)
             ->getMock();
@@ -212,7 +216,9 @@ protected function getExtensionLoaderMock(
             ->setConstructorArgs([
                 $this->getUnzerSDKLoaderMock(),
                 $this->getUnzerServiceMock(),
-                $this->getLoggerMock()
+                $this->getLoggerMock(),
+                $this->createMock(SavedPaymentSessionService::class),
+                $this->createMock(TmpOrderService::class)
             ])->onlyMethods(['getPaymentExtension', 'getPaymentExtensionByCustomerTypeAndCurrency'])
             ->getMock();
 
diff --git a/Tests/Unit/Service/TmpOrderServiceTest.php b/Tests/Unit/Service/TmpOrderServiceTest.php
new file mode 100644
index 00000000..0852e50c
--- /dev/null
+++ b/Tests/Unit/Service/TmpOrderServiceTest.php
@@ -0,0 +1,142 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OxidSolutionCatalysts\Unzer\Tests\Integration\Service;
+
+use OxidSolutionCatalysts\Unzer\Service\TmpOrderService;
+use OxidSolutionCatalysts\Unzer\Model\TmpOrder;
+use OxidEsales\Eshop\Application\Model\Order;
+use PHPUnit\Framework\TestCase;
+
+class TmpOrderServiceTest extends TestCase
+{
+    private TmpOrderService $tmpOrderService;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->tmpOrderService = new TmpOrderService();
+    }
+
+    public function testGetOrderBySessionOrderIdReturnsOrderIfLoaded(): void
+    {
+        $orderMock = $this->createMock(Order::class);
+        $orderMock->method('load')->with('sessionOrderId')->willReturn(true);
+
+        $tmpOrderMock = $this->createMock(TmpOrder::class);
+        $tmpOrderMock->expects($this->never())->method('getTmpOrderByOxOrderId');
+
+        $this->tmpOrderService = $this->getMockBuilder(TmpOrderService::class)
+            ->setMethods(['getTmpOrder'])
+            ->getMock();
+
+        $this->tmpOrderService
+            ->expects($this->any())
+            ->method('getTmpOrder')
+            ->willReturn($tmpOrderMock);
+
+        $result = $this->tmpOrderService->getOrderBySessionOrderId('sessionOrderId');
+
+        $this->assertInstanceOf(Order::class, $result);
+    }
+
+    public function testGetOrderBySessionOrderIdFallsBackToTmpOrder(): void
+    {
+        $orderMock = $this->createMock(Order::class);
+        $orderMock->method('load')->with('sessionOrderId')->willReturn(false);
+
+        $tmpOrderMock = $this->createMock(TmpOrder::class);
+        $tmpOrderMock->expects($this->any())
+            ->method('getTmpOrderByOxOrderId')
+            ->with('sessionOrderId')
+            ->willReturn($orderMock);
+
+        $this->tmpOrderService = $this->getMockBuilder(TmpOrderService::class)
+            ->setMethods(['getTmpOrder'])
+            ->getMock();
+
+        $this->tmpOrderService
+            ->expects($this->any())
+            ->method('getTmpOrder')
+            ->willReturn($tmpOrderMock);
+
+        $result = $this->tmpOrderService->getOrderBySessionOrderId('sessionOrderId');
+
+        $this->assertInstanceOf(Order::class, $result);
+    }
+
+    public function testGetPaymentTypeReturnsOrderPaymentType(): void
+    {
+        $orderMock = $this->createMock(Order::class);
+        $orderMock->method('getFieldData')
+            ->with('oxpaymenttype')
+            ->willReturn('PAYMENT_TYPE');
+
+        $result = $this->tmpOrderService->getPaymentType('sessionOrderId', $orderMock);
+
+        $this->assertSame('PAYMENT_TYPE', $result);
+    }
+
+    public function testGetPaymentTypeFallsBackToTmpOrder(): void
+    {
+        $orderMock = $this->createMock(Order::class);
+        $orderMock->method('getFieldData')->with('oxpaymenttype')->willReturn('');
+
+        $tmpOrderMock = $this->createMock(TmpOrder::class);
+        $tmpOrderMock->expects($this->any())
+            ->method('getTmpOrderByOxOrderId')
+            ->with('sessionOrderId')
+            ->willReturn($orderMock);
+
+        $this->tmpOrderService = $this->getMockBuilder(TmpOrderService::class)
+            ->setMethods(['getTmpOrder'])
+            ->getMock();
+
+        $this->tmpOrderService
+            ->expects($this->any())
+            ->method('getTmpOrder')
+            ->willReturn($tmpOrderMock);
+
+        $result = $this->tmpOrderService->getPaymentType('sessionOrderId', $orderMock);
+
+        $this->assertSame('', $result);
+    }
+
+    public function testGetOrderCurrencyReturnsOrderCurrency(): void
+    {
+        $orderMock = $this->createMock(Order::class);
+        $orderMock->method('getFieldData')->with('oxcurrency')->willReturn('EUR');
+
+        $result = $this->tmpOrderService
+            ->getOrderCurrency('sessionOrderId', $orderMock, 'paymentType');
+
+        $this->assertSame('EUR', $result);
+    }
+
+    public function testGetOrderCurrencyFallsBackToTmpOrder(): void
+    {
+        $orderMock = $this->createMock(Order::class);
+        $orderMock->method('getFieldData')->with('oxcurrency')->willReturn(null);
+
+        $tmpOrderMock = $this->createMock(TmpOrder::class);
+        $tmpOrderMock->expects($this->any())
+            ->method('getTmpOrderByOxOrderId')
+            ->with('sessionOrderId')
+            ->willReturn($orderMock);
+
+        $this->tmpOrderService = $this->getMockBuilder(TmpOrderService::class)
+            ->setMethods(['getTmpOrder'])
+            ->getMock();
+
+        $this->tmpOrderService
+            ->expects($this->any())
+            ->method('getTmpOrder')
+            ->willReturn($tmpOrderMock);
+
+        $result = $this->tmpOrderService
+            ->getOrderCurrency('sessionOrderId', $orderMock, 'paymentType');
+
+        $this->assertEquals('', $result);
+    }
+}
diff --git a/Tests/Unit/Service/UnzerSDKLoaderTest.php b/Tests/Unit/Service/UnzerSDKLoaderTest.php
index 4d9a4324..9abfc1e3 100644
--- a/Tests/Unit/Service/UnzerSDKLoaderTest.php
+++ b/Tests/Unit/Service/UnzerSDKLoaderTest.php
@@ -60,8 +60,7 @@ protected function getSut($moduleSettingValues): UnzerSDKLoader
         $debugHandler = $this->getMockBuilder(DebugHandler::class)
             ->setConstructorArgs([$this->createMock(Logger::class)])
             ->getMock();
-        $session = $this->createConfiguredMock(Session::class, []);
 
-        return new UnzerSDKLoader($moduleSettings, $debugHandler, $session);
+        return new UnzerSDKLoader($moduleSettings, $debugHandler);
     }
 }
diff --git a/Tests/Unit/Service/UnzerTest.php b/Tests/Unit/Service/UnzerTest.php
index 2321a291..d9372da6 100644
--- a/Tests/Unit/Service/UnzerTest.php
+++ b/Tests/Unit/Service/UnzerTest.php
@@ -20,6 +20,7 @@
 use OxidSolutionCatalysts\Unzer\Service\ModuleSettings;
 use OxidSolutionCatalysts\Unzer\Service\Payment;
 use OxidSolutionCatalysts\Unzer\Service\PaymentExtensionLoader;
+use OxidSolutionCatalysts\Unzer\Service\TmpOrderServiceInterface;
 use OxidSolutionCatalysts\Unzer\Service\Transaction;
 use OxidSolutionCatalysts\Unzer\Service\Translator;
 use OxidSolutionCatalysts\Unzer\Service\Unzer;
@@ -106,52 +107,6 @@ public function getPaymentProcedureDataProvider(): array
         ];
     }
 
-    public function testIfImmediatePostAuthCollectTrue(): void
-    {
-        $moduleSettings = $this->createPartialMock(ModuleSettings::class, ['getPaymentProcedureSetting']);
-        $moduleSettings->method('getPaymentProcedureSetting')
-            ->willReturn(ModuleSettings::PAYMENT_CHARGE);
-        $sut = $this->getSut([ModuleSettings::class => $moduleSettings]);
-        $paymentService = $this->getPaymentServiceMock($sut);
-
-        $this->assertTrue($sut->ifImmediatePostAuthCollect($paymentService));
-    }
-
-    public function testIfImmediatePostAuthCollectFalse(): void
-    {
-        $moduleSettings = $this->createPartialMock(ModuleSettings::class, ['getPaymentProcedureSetting']);
-        $moduleSettings->method('getPaymentProcedureSetting')
-            ->willReturn(ModuleSettings::PAYMENT_AUTHORIZE);
-        $sut = $this->getSut([ModuleSettings::class => $moduleSettings]);
-        $paymentService = $this->getPaymentServiceMock($sut);
-
-        $paymentService->method('getUnzerOrderId')
-            ->willReturn('666');
-
-        $sql = "INSERT INTO oxorder SET OXID=9999, OXPAYMENTTYPE='oscunzer_paypal', OXUNZERORDERNR=666";
-        DatabaseProvider::getDb()->execute($sql);
-
-        $this->assertFalse($sut->ifImmediatePostAuthCollect($paymentService));
-    }
-
-    private function getPaymentServiceMock($sut)
-    {
-        return $this->getMockBuilder(Payment::class)
-            ->setConstructorArgs(
-                [
-                    $this->createMock(Session::class),
-                    $this->createMock(PaymentExtensionLoader::class),
-                    $this->createMock(Translator::class),
-                    $sut,
-                    $this->createMock(UnzerSDKLoader::class),
-                    $this->createMock(Transaction::class),
-                    $this->createMock(TransactionService::class)
-                ]
-            )
-            ->getMock();
-    }
-
-
     public function testGetPaymentProcedureAuthorizeForListedPayment(): void
     {
         $paymentType = 'paypal';
diff --git a/composer.json b/composer.json
index b354b026..38946802 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,8 @@
     "squizlabs/php_codesniffer": "3.*",
     "phpstan/phpstan": "^1.9.2",
     "phpmd/phpmd": "^2.11",
-    "oxid-esales/oxideshop-ce": "dev-b-6.3.x"
+    "oxid-esales/oxideshop-ce": "dev-b-6.3.x",
+    "phpunit/php-code-coverage": "*"
   },
   "conflicts": {
     "oxid-esales/oxideshop-ce": "<6.8 | ^7.0"
diff --git a/src/Controller/Admin/OrderList.php b/src/Controller/Admin/OrderList.php
index 4df58248..bbb72a15 100644
--- a/src/Controller/Admin/OrderList.php
+++ b/src/Controller/Admin/OrderList.php
@@ -12,14 +12,13 @@ class OrderList extends OrderList_parent
     use Request;
 
     /**
-     * Adding folder check
-    * bi *
-     * @param array  $whereQuery SQL condition array
-     * @param string $fullQuery  SQL query string
+     * @param array $whereQuery SQL condition array
+     * @param string $fullQuery SQL query string
      *
+     * @return string
+     * @throws \OxidEsales\Eshop\Core\Exception\DatabaseConnectionException
      * @SuppressWarnings(PHPMD.StaticAccess)
      *
-     * @return string
      */
     protected function _prepareWhereQuery($whereQuery, $fullQuery)
     {
diff --git a/src/Controller/Admin/OrderMain.php b/src/Controller/Admin/OrderMain.php
index 357f853d..ab591778 100644
--- a/src/Controller/Admin/OrderMain.php
+++ b/src/Controller/Admin/OrderMain.php
@@ -15,11 +15,11 @@ class OrderMain extends OrderMain_parent
     use ServiceContainer;
 
     /**
-     * Method is used for overriding.
-     *
-     * @return void
+     * @throws \OxidEsales\Eshop\Core\Exception\DatabaseErrorException
+     * @throws \UnzerSDK\Exceptions\UnzerApiException
+     * @throws \OxidEsales\Eshop\Core\Exception\DatabaseConnectionException
      */
-    protected function onOrderSend()
+    protected function onOrderSend(): void
     {
         $sOxid = $this->getEditObjectId();
         $oOrder = oxNew(Order::class);
@@ -38,8 +38,9 @@ protected function onOrderSend()
     }
 
     /**
-     * @param Order $oOrder
-     * @return void
+     * @throws \OxidEsales\Eshop\Core\Exception\DatabaseErrorException
+     * @throws \UnzerSDK\Exceptions\UnzerApiException
+     * @throws \OxidEsales\Eshop\Core\Exception\DatabaseConnectionException
      */
     public function sendShipmentNotification(Order $oOrder): void
     {
diff --git a/src/Controller/PaymentController.php b/src/Controller/PaymentController.php
index 0ccffbb6..1b6fcada 100644
--- a/src/Controller/PaymentController.php
+++ b/src/Controller/PaymentController.php
@@ -172,10 +172,8 @@ private function getUnzerSDKFromTmpOrder(string $oxSessionOrderId): ?Unzer
             $paymentId = is_string($paymentId) ? $paymentId : '';
             $currency = $tmpOrder->getFieldData('oxcurrency');
             $currency = is_string($currency) ? $currency : '';
-            $customerType = !empty($tmpOrder->getFieldData('oxdelcompany'))
-            || !empty($tmpOrder->getFieldData('oxbillcompany')) ?
-                'B2B' :
-                'B2C';
+
+            $customerType = $this->getCustomerTypeFromTmpOrder($tmpOrder);
 
             $result = $unzerSDK->getUnzerSDK(
                 $paymentId,
@@ -185,4 +183,18 @@ private function getUnzerSDKFromTmpOrder(string $oxSessionOrderId): ?Unzer
         }
         return $result;
     }
+
+    private function getCustomerTypeFromTmpOrder(Order $tmpOrder): string
+    {
+        if (
+            empty($tmpOrder->getFieldData('oxdelcompany'))
+            && empty($tmpOrder->getFieldData('oxbillcompany'))
+            && empty($tmpOrder->oxorder__oxbillcompany->value)
+            && empty($tmpOrder->oxorder__oxdelcompany->value)
+        ) {
+            return 'B2C';
+        }
+
+        return 'B2B';
+    }
 }
diff --git a/src/PaymentExtensions/AliPay.php b/src/PaymentExtensions/AliPay.php
index 147e164b..86be31b5 100644
--- a/src/PaymentExtensions/AliPay.php
+++ b/src/PaymentExtensions/AliPay.php
@@ -13,9 +13,9 @@
 
 class AliPay extends UnzerPayment
 {
-    protected $paymentMethod = 'alipay';
+    protected string $paymentMethod = 'alipay';
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/ApplePay.php b/src/PaymentExtensions/ApplePay.php
index d6fa272d..cfc877e3 100644
--- a/src/PaymentExtensions/ApplePay.php
+++ b/src/PaymentExtensions/ApplePay.php
@@ -11,11 +11,11 @@
 
 class ApplePay extends UnzerPayment
 {
-    protected $paymentMethod = 'applepay';
+    protected string $paymentMethod = 'applepay';
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
-    protected $ajaxResponse = true;
+    protected bool $ajaxResponse = false;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/Bancontact.php b/src/PaymentExtensions/Bancontact.php
index a6c0a0d7..855d7a39 100644
--- a/src/PaymentExtensions/Bancontact.php
+++ b/src/PaymentExtensions/Bancontact.php
@@ -13,9 +13,9 @@
 
 class Bancontact extends UnzerPayment
 {
-    protected $paymentMethod = 'bancontact';
+    protected string $paymentMethod = 'bancontact';
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/Card.php b/src/PaymentExtensions/Card.php
index bfdd4672..7c64df7f 100644
--- a/src/PaymentExtensions/Card.php
+++ b/src/PaymentExtensions/Card.php
@@ -12,9 +12,9 @@
 
 class Card extends UnzerPayment
 {
-    protected $paymentMethod = 'card';
+    protected string $paymentMethod = 'card';
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/EPS.php b/src/PaymentExtensions/EPS.php
index 7a549b85..3b544b12 100644
--- a/src/PaymentExtensions/EPS.php
+++ b/src/PaymentExtensions/EPS.php
@@ -12,9 +12,9 @@
 
 class EPS extends UnzerPayment
 {
-    protected $paymentMethod = 'eps';
+    protected string $paymentMethod = 'eps';
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/GiroPay.php b/src/PaymentExtensions/GiroPay.php
index 55110078..6d08cd82 100644
--- a/src/PaymentExtensions/GiroPay.php
+++ b/src/PaymentExtensions/GiroPay.php
@@ -13,9 +13,9 @@
 
 class GiroPay extends UnzerPayment
 {
-    protected $paymentMethod = 'giropay';
+    protected string $paymentMethod = 'giropay';
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/Ideal.php b/src/PaymentExtensions/Ideal.php
index d49250c7..2ec78933 100644
--- a/src/PaymentExtensions/Ideal.php
+++ b/src/PaymentExtensions/Ideal.php
@@ -12,9 +12,9 @@
 
 class Ideal extends UnzerPayment
 {
-    protected $paymentMethod = 'ideal';
+    protected string $paymentMethod = 'ideal';
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/Installment.php b/src/PaymentExtensions/Installment.php
index 19fd458b..63bd7b26 100644
--- a/src/PaymentExtensions/Installment.php
+++ b/src/PaymentExtensions/Installment.php
@@ -11,9 +11,9 @@
 
 class Installment extends UnzerPayment
 {
-    protected $paymentMethod = 'installment-secured';
+    protected string $paymentMethod = 'installment-secured';
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/InstallmentPaylater.php b/src/PaymentExtensions/InstallmentPaylater.php
index c6da8c5d..6793ecdb 100644
--- a/src/PaymentExtensions/InstallmentPaylater.php
+++ b/src/PaymentExtensions/InstallmentPaylater.php
@@ -11,8 +11,8 @@
 
 class InstallmentPaylater extends UnzerPayment
 {
-    protected $paymentMethod = 'paylater-installment';
-    protected $needPending = true;
+    protected string $paymentMethod = 'paylater-installment';
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/Invoice.php b/src/PaymentExtensions/Invoice.php
index 714463e9..9fb98b77 100644
--- a/src/PaymentExtensions/Invoice.php
+++ b/src/PaymentExtensions/Invoice.php
@@ -14,15 +14,14 @@
 use UnzerSDK\Resources\TransactionTypes\Authorization;
 use OxidEsales\Eshop\Application\Model\Basket;
 use OxidEsales\Eshop\Application\Model\User;
-use OxidEsales\Eshop\Core\Registry;
 
 class Invoice extends UnzerPayment
 {
     use Request;
 
-    protected $paymentMethod = 'paylater-invoice';
+    protected string $paymentMethod = 'paylater-invoice';
 
-    protected $allowedCurrencies = ['EUR', 'CHF'];
+    protected array $allowedCurrencies = ['EUR', 'CHF'];
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/InvoiceOld.php b/src/PaymentExtensions/InvoiceOld.php
index d2a4e7b4..3e65bdb2 100644
--- a/src/PaymentExtensions/InvoiceOld.php
+++ b/src/PaymentExtensions/InvoiceOld.php
@@ -13,9 +13,9 @@
 
 class InvoiceOld extends UnzerPayment
 {
-    protected $paymentMethod = 'invoice';
+    protected string $paymentMethod = 'invoice';
 
-    protected $allowedCurrencies = ['EUR', 'CHF'];
+    protected array $allowedCurrencies = ['EUR', 'CHF'];
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/PIS.php b/src/PaymentExtensions/PIS.php
index 63150b2c..9fc60016 100644
--- a/src/PaymentExtensions/PIS.php
+++ b/src/PaymentExtensions/PIS.php
@@ -13,9 +13,9 @@
 
 class PIS extends UnzerPayment
 {
-    protected $paymentMethod = 'pis';
+    protected string $paymentMethod = 'pis';
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/PayPal.php b/src/PaymentExtensions/PayPal.php
index 5f5470ce..7b7796f1 100644
--- a/src/PaymentExtensions/PayPal.php
+++ b/src/PaymentExtensions/PayPal.php
@@ -13,9 +13,9 @@
 
 class PayPal extends UnzerPayment
 {
-    protected $paymentMethod = 'paypal';
+    protected string $paymentMethod = 'paypal';
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/PrePayment.php b/src/PaymentExtensions/PrePayment.php
index 01fb9c0e..40cd2240 100644
--- a/src/PaymentExtensions/PrePayment.php
+++ b/src/PaymentExtensions/PrePayment.php
@@ -13,9 +13,9 @@
 
 class PrePayment extends UnzerPayment
 {
-    protected $paymentMethod = 'prepayment';
+    protected string $paymentMethod = 'prepayment';
 
-    protected $allowedCurrencies = ['EUR'];
+    protected array $allowedCurrencies = ['EUR'];
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/Przelewy24.php b/src/PaymentExtensions/Przelewy24.php
index 6e1454f3..ae39990a 100644
--- a/src/PaymentExtensions/Przelewy24.php
+++ b/src/PaymentExtensions/Przelewy24.php
@@ -13,9 +13,9 @@
 
 class Przelewy24 extends UnzerPayment
 {
-    protected $paymentMethod = 'przelewy24';
+    protected string $paymentMethod = 'przelewy24';
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/Sepa.php b/src/PaymentExtensions/Sepa.php
index 34e92343..3cbaa5c8 100644
--- a/src/PaymentExtensions/Sepa.php
+++ b/src/PaymentExtensions/Sepa.php
@@ -12,9 +12,9 @@
 
 class Sepa extends UnzerPayment
 {
-    protected $paymentMethod = 'sepa-direct-debit';
+    protected string $paymentMethod = 'sepa-direct-debit';
 
-    protected $allowedCurrencies = ['EUR'];
+    protected array $allowedCurrencies = ['EUR'];
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/SepaSecured.php b/src/PaymentExtensions/SepaSecured.php
index 381dc772..988707de 100644
--- a/src/PaymentExtensions/SepaSecured.php
+++ b/src/PaymentExtensions/SepaSecured.php
@@ -12,9 +12,9 @@
 
 class SepaSecured extends UnzerPayment
 {
-    protected $paymentMethod = 'sepa-direct-debit-secured';
+    protected string $paymentMethod = 'sepa-direct-debit-secured';
 
-    protected $allowedCurrencies = ['EUR'];
+    protected array $allowedCurrencies = ['EUR'];
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/Sofort.php b/src/PaymentExtensions/Sofort.php
index 6a3076b9..cf657a9d 100644
--- a/src/PaymentExtensions/Sofort.php
+++ b/src/PaymentExtensions/Sofort.php
@@ -13,11 +13,11 @@
 
 class Sofort extends UnzerPayment
 {
-    protected $paymentMethod = 'sofort';
+    protected string $paymentMethod = 'sofort';
 
-    protected $allowedCurrencies = ['EUR'];
+    protected array $allowedCurrencies = ['EUR'];
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/PaymentExtensions/UnzerPayment.php b/src/PaymentExtensions/UnzerPayment.php
index f6222e14..e2d7959b 100644
--- a/src/PaymentExtensions/UnzerPayment.php
+++ b/src/PaymentExtensions/UnzerPayment.php
@@ -16,6 +16,7 @@
 use OxidSolutionCatalysts\Unzer\Core\UnzerDefinitions;
 use OxidSolutionCatalysts\Unzer\Service\DebugHandler;
 use OxidSolutionCatalysts\Unzer\Service\SavedPayment\SavedPaymentSessionService;
+use OxidSolutionCatalysts\Unzer\Service\TmpOrderService;
 use OxidSolutionCatalysts\Unzer\Service\Transaction as TransactionService;
 use OxidSolutionCatalysts\Unzer\Service\Payment as PaymentService;
 use OxidSolutionCatalysts\Unzer\Service\Translator;
@@ -50,32 +51,25 @@ abstract class UnzerPayment
     use ServiceContainer;
     use Request;
 
-    /** @var Unzer */
-    protected $unzerSDK;
+    protected Unzer $unzerSDK;
 
-    /** @var UnzerService */
-    protected $unzerService;
+    protected UnzerService $unzerService;
 
-    /** @var string */
-    protected $unzerOrderId = '';
+    protected string $unzerOrderId = '';
 
-    /** @var string */
-    protected $paymentMethod = '';
+    protected string $paymentMethod = '';
 
-    /** @var bool */
-    protected $needPending = false;
+    protected bool $needPending = false;
 
-    /** @var bool */
-    protected $ajaxResponse = false;
+    protected bool $ajaxResponse = false;
 
-    /** @var array */
-    protected $allowedCurrencies = [];
+    protected array $allowedCurrencies = [];
 
-    /** @var DebugHandler $logger */
-    private $logger;
+    private DebugHandler $logger;
 
-    /** @var SavedPaymentSessionService $savedPaymentSessionService */
-    private $savedPaymentSessionService;
+    private SavedPaymentSessionService $savedPaymentSessionService;
+
+    private TmpOrderService $tmpOrderService;
 
     /**
      * @throws Exception
@@ -83,7 +77,9 @@ abstract class UnzerPayment
     public function __construct(
         Unzer $unzerSDK,
         UnzerService $unzerService,
-        DebugHandler $logger
+        DebugHandler $logger,
+        SavedPaymentSessionService $savedPaymentSessionService,
+        TmpOrderService $tmpOrderService
     ) {
         $this->unzerSDK = $unzerSDK;
         $this->unzerService = $unzerService;
@@ -92,28 +88,20 @@ public function __construct(
 
         $this->unzerService->setIsAjaxPayment($this->ajaxResponse);
         $this->logger = $logger;
-        $this->savedPaymentSessionService = $this->getServiceFromContainer(SavedPaymentSessionService::class);
+        $this->savedPaymentSessionService = $savedPaymentSessionService;
+        $this->tmpOrderService = $tmpOrderService;
     }
 
-    /**
-     * @return array
-     */
     public function getPaymentCurrencies(): array
     {
         return $this->allowedCurrencies;
     }
 
-    /**
-     * @return bool
-     */
     public function redirectUrlNeedPending(): bool
     {
         return $this->needPending;
     }
 
-    /**
-     * @return BasePaymentType
-     */
     abstract public function getUnzerPaymentTypeObject(): BasePaymentType;
 
     /**
@@ -208,11 +196,14 @@ protected function doTransactions(
             );
             $auth->setRiskData($uzrRiskData);
             $sdkPaymentID = UnzerDefinitions::INSTALLMENT_UNZER_PAYLATER_PAYMENT_ID;
+            $customerType = $this->tmpOrderService
+                ->getCustomerType($currency->name, $sdkPaymentID);
             try {
                 $loader = $this->getServiceFromContainer(UnzerSDKLoader::class);
                 $UnzerSdk = $loader->getUnzerSDK(
                     $sdkPaymentID,
-                    $currency->name
+                    $currency->name,
+                    $customerType
                 );
                 $transaction = $UnzerSdk->performAuthorization(
                     $auth,
diff --git a/src/PaymentExtensions/WeChatPay.php b/src/PaymentExtensions/WeChatPay.php
index b2cc5d1f..83e577f8 100644
--- a/src/PaymentExtensions/WeChatPay.php
+++ b/src/PaymentExtensions/WeChatPay.php
@@ -5,6 +5,8 @@
  * See LICENSE file for license details.
  */
 
+declare(strict_types=1);
+
 namespace OxidSolutionCatalysts\Unzer\PaymentExtensions;
 
 use UnzerSDK\Exceptions\UnzerApiException;
@@ -13,9 +15,9 @@
 
 class WeChatPay extends UnzerPayment
 {
-    protected $paymentMethod = 'wechatpay';
+    protected string $paymentMethod = 'wechatpay';
 
-    protected $needPending = true;
+    protected bool $needPending = true;
 
     /**
      * @return BasePaymentType
diff --git a/src/Service/ModuleSettings.php b/src/Service/ModuleSettings.php
index 799e6c7b..5a20b0ca 100644
--- a/src/Service/ModuleSettings.php
+++ b/src/Service/ModuleSettings.php
@@ -20,6 +20,7 @@
 /**
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
  */
 class ModuleSettings
 {
@@ -818,6 +819,7 @@ public function getInvoicePrivateKeyByCustomerTypeAndCurrency(
         string $currency
     ): string {
         $key = '';
+        $customerType = $customerType === 'B2B' ? 'B2B' : 'B2C';
         if ($customerType === 'B2C' && $currency === 'EUR') {
             $key = $this->getInvoiceB2CEURPrivateKey();
         } elseif ($customerType === 'B2C' && $currency === 'CHF') {
diff --git a/src/Service/Payment.php b/src/Service/Payment.php
index e8054cca..df6d8d22 100644
--- a/src/Service/Payment.php
+++ b/src/Service/Payment.php
@@ -29,6 +29,7 @@
 use UnzerSDK\Resources\AbstractUnzerResource;
 use UnzerSDK\Resources\PaymentTypes\BasePaymentType;
 use UnzerSDK\Resources\PaymentTypes\InstallmentSecured;
+use UnzerSDK\Resources\PaymentTypes\PaylaterInvoice;
 use UnzerSDK\Resources\PaymentTypes\Prepayment as UnzerSDKPrepayment;
 use UnzerSDK\Resources\PaymentTypes\Invoice as UnzerSDKInvoice;
 use UnzerSDK\Resources\TransactionTypes\Authorization;
@@ -52,39 +53,24 @@ class Payment
     public const STATUS_ERROR = "ERROR";
 
     protected Session $session;
-
     protected PaymentExtensionLoader $paymentExtLoader;
-
     protected Translator $translator;
-
     protected Unzer $unzerService;
-
     protected UnzerSDKLoader $unzerSDKLoader;
-
     protected ?UnzerPayment $sessionUnzerPayment = null;
-
-
     protected string $redirectUrl = '';
-
     protected string $pdfLink = '';
-
     protected Transaction $transactionService;
+    private TmpOrderServiceInterface $tmpOrderService;
 
-    /**
-     * @param Session $session
-     * @param PaymentExtensionLoader $paymentExtLoader
-     * @param Translator $translator
-     * @param Unzer $unzerService
-     * @param UnzerSDKLoader $unzerSDKLoader
-     * @param TransactionService $transactionService
-     */
     public function __construct(
         Session $session,
         PaymentExtensionLoader $paymentExtLoader,
         Translator $translator,
         Unzer $unzerService,
         UnzerSDKLoader $unzerSDKLoader,
-        TransactionService $transactionService
+        TransactionService $transactionService,
+        TmpOrderServiceInterface $tmpOrderService
     ) {
         $this->session = $session;
         $this->paymentExtLoader = $paymentExtLoader;
@@ -92,6 +78,7 @@ public function __construct(
         $this->unzerService = $unzerService;
         $this->unzerSDKLoader = $unzerSDKLoader;
         $this->transactionService = $transactionService;
+        $this->tmpOrderService = $tmpOrderService;
     }
 
     /**
@@ -212,7 +199,6 @@ public function getUnzerPaymentStatus(): string
     }
 
     /**
-     * @return string
      * @throws UnzerApiException
      */
     public function getUnzerOrderId(): string
@@ -229,11 +215,8 @@ public function getUnzerOrderId(): string
     }
 
     /**
-     * @param string $paymentId
-     * @param string $currency
-     * @param string $customerType
-     * @return \UnzerSDK\Unzer
-    */
+     * @throws \OxidSolutionCatalysts\Unzer\Exception\UnzerException
+     */
     protected function getUnzerSDK(
         string $paymentId = '',
         string $currency = '',
@@ -243,8 +226,6 @@ protected function getUnzerSDK(
     }
 
     /**
-     * @param bool $noCache
-     * @return UnzerPayment|null
      * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
      */
     public function getSessionUnzerPayment(bool $noCache = false): ?UnzerPayment
@@ -265,13 +246,18 @@ public function getSessionUnzerPayment(bool $noCache = false): ?UnzerPayment
             if ($sessionOrderId == null) {
                 return null;
             }
-            /** @var Order $order */
-            $order = oxNew(Order::class);
-            $order->load($sessionOrderId);
 
-            $paymentType = $this->getPaymentType($sessionOrderId, $order);
-            $currency = $this->getOrderCurrency($sessionOrderId, $order, $paymentType);
-            $customerType = $this->getCustomerType($currency, $paymentType);
+            $order = $this->tmpOrderService->getOrderBySessionOrderId($sessionOrderId);
+
+            $paymentType = '';
+            $currency = '';
+            $customerType = '';
+
+            if ($order !== null) {
+                $paymentType = $this->tmpOrderService->getPaymentType($sessionOrderId, $order);
+                $currency = $this->tmpOrderService->getOrderCurrency($sessionOrderId, $order, $paymentType);
+                $customerType = $this->tmpOrderService->getCustomerType($currency, $paymentType);
+            }
 
             try {
                 $result = $this->unzerSDKLoader->getUnzerSDK(
@@ -290,62 +276,6 @@ public function getSessionUnzerPayment(bool $noCache = false): ?UnzerPayment
         return $result;
     }
 
-    private function getCustomerType(?string $currency, string $paymentType): string
-    {
-        $customerType = 'B2C';
-
-        if (($currency !== null) && $this->isPaylaterInvoice($paymentType)) {
-            $customerInRequest = $this->getUnzerStringRequestParameter('unzer_customer_type');
-            if ($customerInRequest !== 'B2C') {
-                $customerType = 'B2B';
-            }
-        }
-        return $customerType;
-    }
-
-    private function isPaylaterInvoice(string $paymentType): bool
-    {
-        return in_array($paymentType, [
-            UnzerDefinitions::INVOICE_UNZER_PAYMENT_ID,
-            UnzerDefinitions::INSTALLMENT_UNZER_PAYLATER_PAYMENT_ID,
-            UnzerDefinitions::INSTALLMENT_UNZER_PAYMENT_ID,
-        ], true);
-    }
-
-    private function getOrderCurrency(string $sessionOrderId, Order $order, string $paymentType): string
-    {
-        /** @var string $currency */
-        $currency = $order->getFieldData('oxcurrency') ?? '';
-
-        if ($this->isPaylaterInvoice($paymentType)) {
-            $tmpOrder = oxNew(TmpOrder::class)->getTmpOrderByOxOrderId($sessionOrderId);
-            if ($tmpOrder !== null) {
-                /** @var stdClass{name: string} $orderCurrency */
-                $orderCurencyStdCls = $tmpOrder->getOrderCurrency();
-                $currency = $orderCurencyStdCls->name;
-            }
-        }
-        return $currency;
-    }
-
-    private function getPaymentType(string $sessionOrderId, Order $order): string
-    {
-        $paymentType = $order->getFieldData('oxpaymenttype');
-
-        if (empty($paymentType)) {
-            $tmpOrder = oxNew(TmpOrder::class)->getTmpOrderByOxOrderId($sessionOrderId);
-            if ($tmpOrder !== null) {
-                $paymentType = $tmpOrder->getFieldData('oxpaymenttype');
-            }
-        }
-
-        if (is_string($paymentType)) {
-            return $paymentType;
-        }
-
-        return '';
-    }
-
     /**
      * @param Order $oOrder
      * @param string $unzerid
@@ -581,7 +511,8 @@ public function isInvoice(): bool
             return false;
         }
 
-        return $sessionPayment->getPaymentType() instanceof UnzerSDKInvoice;
+        return $sessionPayment->getPaymentType() instanceof UnzerSDKInvoice
+            || $sessionPayment->getPaymentType() instanceof PaylaterInvoice;
     }
 
     public function isPrepayment(): bool
diff --git a/src/Service/PaymentExtensionLoader.php b/src/Service/PaymentExtensionLoader.php
index b1ead6c1..f0d210b4 100644
--- a/src/Service/PaymentExtensionLoader.php
+++ b/src/Service/PaymentExtensionLoader.php
@@ -29,6 +29,7 @@
 use OxidSolutionCatalysts\Unzer\PaymentExtensions\Sofort;
 use OxidSolutionCatalysts\Unzer\PaymentExtensions\UnzerPayment as AbstractUnzerPayment;
 use OxidSolutionCatalysts\Unzer\PaymentExtensions\WeChatPay;
+use OxidSolutionCatalysts\Unzer\Service\SavedPayment\SavedPaymentSessionService;
 
 class PaymentExtensionLoader
 {
@@ -54,30 +55,29 @@ class PaymentExtensionLoader
         UnzerDefinitions::WECHATPAY_UNZER_PAYMENT_ID => WeChatPay::class,
     ];
 
-    /**
-     * @var UnzerSDKLoader
-     */
-    private $unzerSdkLoader;
+    private UnzerSDKLoader $unzerSdkLoader;
 
-    /**
-     * @var Unzer
-     */
-    private $unzerService;
+    private Unzer $unzerService;
 
     private DebugHandler $logger;
 
-    /**
-     * @param UnzerSDKLoader $unzerSDKLoader
-     * @param Unzer $unzerService
-     */
+    private SavedPaymentSessionService $paymentSession;
+
+    private TmpOrderService $tmpOrderService;
+
+
     public function __construct(
         UnzerSDKLoader $unzerSDKLoader,
         Unzer $unzerService,
-        DebugHandler $logger
+        DebugHandler $logger,
+        SavedPaymentSessionService $paymentSession,
+        TmpOrderService $tmpOrderService
     ) {
         $this->unzerSdkLoader = $unzerSDKLoader;
         $this->unzerService = $unzerService;
         $this->logger = $logger;
+        $this->paymentSession = $paymentSession;
+        $this->tmpOrderService = $tmpOrderService;
     }
 
     /**
@@ -85,8 +85,6 @@ public function __construct(
      * need functions of the SDK. The SDK must always be loaded with the correct credentials. This is only
      * guaranteed if method getPaymentExtensionByCustomerTypeAndCurrency is used, as only this loads the SDK
      * with the correct credentials at all times
-     * @param PaymentModel $payment
-     * @return AbstractUnzerPayment
      */
     public function getPaymentExtension(PaymentModel $payment): AbstractUnzerPayment
     {
@@ -94,7 +92,9 @@ public function getPaymentExtension(PaymentModel $payment): AbstractUnzerPayment
             self::UNZERCLASSNAMEMAPPING[$payment->getId()],
             $this->unzerSdkLoader->getUnzerSDK(),
             $this->unzerService,
-            $this->logger
+            $this->logger,
+            $this->paymentSession,
+            $this->tmpOrderService
         );
     }
 
@@ -120,7 +120,9 @@ public function getPaymentExtensionByCustomerTypeAndCurrency(
                 $customerType
             ),
             $this->unzerService,
-            $this->logger
+            $this->logger,
+            $this->paymentSession,
+            $this->tmpOrderService
         );
     }
 }
diff --git a/src/Service/TmpOrderService.php b/src/Service/TmpOrderService.php
new file mode 100644
index 00000000..9fc41667
--- /dev/null
+++ b/src/Service/TmpOrderService.php
@@ -0,0 +1,114 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OxidSolutionCatalysts\Unzer\Service;
+
+use OxidEsales\Eshop\Application\Model\Order;
+use OxidSolutionCatalysts\Unzer\Model\TmpOrder;
+use OxidSolutionCatalysts\Unzer\Traits\Request;
+
+class TmpOrderService implements TmpOrderServiceInterface
+{
+    use Request;
+
+    private TmpOrder $tmpOrder;
+    private ?Order $order;
+
+    public function __construct()
+    {
+        $this->tmpOrder = oxNew(TmpOrder::class);
+    }
+
+    /**
+     * @throws \Doctrine\DBAL\Driver\Exception
+     * @throws \Doctrine\DBAL\Exception
+     */
+    public function getOrderBySessionOrderId(string $sessionOrderId): Order
+    {
+        $order = oxNew(Order::class);
+        if ($order->load($sessionOrderId)) {
+            $this->order = $order;
+            return $order;
+        }
+
+        $order = $this->tmpOrder->getTmpOrderByOxOrderId($sessionOrderId);
+        if ($order !== null) {
+            $this->order = $order;
+            return $order;
+        }
+
+        return oxNew(Order::class);
+    }
+
+    public function getPaymentType(string $sessionOrderId, Order $order): string
+    {
+        $paymentType = $order->getFieldData('oxpaymenttype');
+
+        if (empty($paymentType)) {
+            $paymentType = $order->oxorder__oxpaymenttype->value ?? '';
+        }
+
+        if (is_string($paymentType) && !empty($paymentType)) {
+            return $paymentType;
+        }
+
+        return  '';
+    }
+
+    /**
+     * @throws \Doctrine\DBAL\Driver\Exception
+     * @throws \Doctrine\DBAL\Exception
+     */
+    public function getOrderCurrency(string $sessionOrderId, Order $order, string $paymentType): string
+    {
+        /** @var string $currency */
+        $currency = $order->getFieldData('oxcurrency') ?? '';
+
+        if ($this->isPaylaterInvoice($paymentType)) {
+            $order = $this->tmpOrder->getTmpOrderByOxOrderId($sessionOrderId);
+            if ($order !== null) {
+                /** @var \stdClass {name: string} $orderCurrency */
+                $orderCurencyStdCls = $order->getOrderCurrency();
+                $currency = $orderCurencyStdCls->name;
+            }
+        }
+
+        return $currency;
+    }
+
+    public function getCustomerType(?string $currency, string $paymentType): string
+    {
+        $customerType = 'B2C';
+
+        if (($currency !== null) && $this->isPaylaterInvoice($paymentType)) {
+            $customerInRequest = $this->getUnzerStringRequestParameter('unzer_customer_type');
+            if ($customerInRequest !== 'B2C' && !empty($customerInRequest)) {
+                return 'B2B';
+            }
+
+            if (!empty($this->order->oxorder__oxbillcompany)) {
+                $billingCompany = $this->order->oxorder__oxbillcompany->value;
+            }
+
+            if (!empty($this->order->oxorder__oxdelcompany)) {
+                $shippingCompany = $this->order->oxorder__oxdelcompany->value;
+            }
+
+            if (!empty($billingCompany) || !empty($shippingCompany)) {
+                $customerType = 'B2B';
+            }
+        }
+
+        return $customerType;
+    }
+
+    public function isPaylaterInvoice(string $paymentType): bool
+    {
+        return in_array($paymentType, [
+            \OxidSolutionCatalysts\Unzer\Core\UnzerDefinitions::INVOICE_UNZER_PAYMENT_ID,
+            \OxidSolutionCatalysts\Unzer\Core\UnzerDefinitions::INSTALLMENT_UNZER_PAYLATER_PAYMENT_ID,
+            \OxidSolutionCatalysts\Unzer\Core\UnzerDefinitions::INSTALLMENT_UNZER_PAYMENT_ID,
+        ], true);
+    }
+}
diff --git a/src/Service/TmpOrderServiceInterface.php b/src/Service/TmpOrderServiceInterface.php
new file mode 100644
index 00000000..db0210dd
--- /dev/null
+++ b/src/Service/TmpOrderServiceInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OxidSolutionCatalysts\Unzer\Service;
+
+use OxidEsales\Eshop\Application\Model\Order;
+
+interface TmpOrderServiceInterface
+{
+    public function getOrderBySessionOrderId(string $sessionOrderId): ?Order;
+    public function getPaymentType(string $sessionOrderId, Order $order): string;
+    public function getOrderCurrency(string $sessionOrderId, Order $order, string $paymentType): string;
+    public function getCustomerType(?string $currency, string $paymentType): string;
+    public function isPaylaterInvoice(string $paymentType): bool;
+}
diff --git a/src/Service/Unzer.php b/src/Service/Unzer.php
index b0fe0025..d1360604 100644
--- a/src/Service/Unzer.php
+++ b/src/Service/Unzer.php
@@ -646,46 +646,6 @@ public function isAjaxPayment(): bool
         return (bool)$this->session->getVariable('UzrAjaxRedirect');
     }
 
-    /**
-     * @throws UnzerApiException
-     */
-    public function ifImmediatePostAuthCollect(Payment $paymentService): bool
-    {
-        $paymentMethod = $this->getPaymentMethodFromOrder($paymentService->getUnzerOrderId());
-        $paymentProcedure = $this->getPaymentProcedure(str_replace('oscunzer_', '', $paymentMethod));
-        return $paymentProcedure === ModuleSettings::PAYMENT_CHARGE;
-    }
-
-    private function getPaymentMethodFromOrder(string $oxUnzerOrderNr): string
-    {
-        /** @var QueryBuilderFactoryInterface $queryBuilderFactory */
-        $queryBuilderFactory = $this->getServiceFromContainer(QueryBuilderFactoryInterface::class);
-
-        $queryBuilder = $queryBuilderFactory->create();
-
-        $query = $queryBuilder
-            ->select('OXPAYMENTTYPE')
-            ->from('oxorder')
-            ->where("OXUNZERORDERNR = :oxunzerordernr");
-
-        $parameters = [
-            ':oxunzerordernr' => $oxUnzerOrderNr,
-        ];
-
-        $result = $query->setParameters($parameters)->execute();
-
-        if ($result instanceof ResultStatement) {
-            /** @var string $value */
-            $value = $result->fetchColumn();
-            if (empty($value)) {
-                $value = '';
-            }
-            return $value;
-        }
-
-        return '';
-    }
-
     /**
      * @throws JsonException
      */
diff --git a/src/Service/UnzerSDKLoader.php b/src/Service/UnzerSDKLoader.php
index d472629d..876c76d1 100644
--- a/src/Service/UnzerSDKLoader.php
+++ b/src/Service/UnzerSDKLoader.php
@@ -54,6 +54,9 @@ public function __construct(
     public function getUnzerSDK(string $paymentId = '', string $currency = '', string $customerType = ''): Unzer
     {
         if (UnzerDefinitions::INVOICE_UNZER_PAYMENT_ID === $paymentId) {
+            if (empty($customerType) || empty($currency)) {
+                throw new UnzerException('Customer type and currency must be set for invoice payment');
+            }
             $key = $this->moduleSettings->getInvoicePrivateKeyByCustomerTypeAndCurrency(
                 $customerType,
                 $currency
diff --git a/views/frontend/blocks/page/checkout/thank_you_info.tpl b/views/frontend/blocks/page/checkout/thank_you_info.tpl
index 768567ca..72e51f8f 100644
--- a/views/frontend/blocks/page/checkout/thank_you_info.tpl
+++ b/views/frontend/blocks/page/checkout/thank_you_info.tpl
@@ -7,7 +7,7 @@
     [{oxmultilang ident="OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BIC"}]: [{$oView->getUnzerPrePaymentBic()}]<br/>
 [{/if}]
 [{if $oView->getUnzerPrePaymentHolder()}]
-    [{oxmultilang ident="OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_HOLDER"}]: [{$oView->getUnzerPrePaymentHolder()}]<br/>
+    [{oxmultilang ident="OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BANK_HOLDER"}]: [{$oView->getUnzerPrePaymentHolder()}]<br/>
 [{/if}]
 [{if $oView->getUnzerPrePaymentDescriptor()}]
     [{oxmultilang ident="OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BANK_DESCRIPTOR"}]: [{$oView->getUnzerPrePaymentDescriptor()}]<br/>

From 5c8f693b54fe57f8c86af74ad497b284127d5a19 Mon Sep 17 00:00:00 2001
From: Daniil Tkachev <daniil.tkachev@oxid-esales.com>
Date: Mon, 2 Dec 2024 13:25:40 +0100
Subject: [PATCH 09/16] add php8.1 to gha

---
 .github/workflows/default.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
index 0ca61698..db179a24 100644
--- a/.github/workflows/default.yml
+++ b/.github/workflows/default.yml
@@ -12,7 +12,7 @@ jobs:
   install_shop_with_module:
     strategy:
       matrix:
-        php: [ '7.4' ]
+        php: [ '7.4', '8.1' ]
     runs-on: ubuntu-latest
     steps:
       - name: Cleanup workspace
@@ -170,7 +170,7 @@ jobs:
   unit_tests:
     strategy:
       matrix:
-        php: [ '7.4' ]
+        php: [ '7.4', '8.1' ]
     needs: [ install_shop_with_module ]
     runs-on: ubuntu-latest
     steps:
@@ -228,7 +228,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4' ]
+        php: [ '7.4', '8.1' ]
         group:
           [
             'PaymentAvailableTest',

From bc158cdd9070b19c7e14581f01b9db6a0501705c Mon Sep 17 00:00:00 2001
From: Daniil Tkachev <daniil.tkachev@oxid-esales.com>
Date: Mon, 2 Dec 2024 14:07:00 +0100
Subject: [PATCH 10/16] update tests for php8.1

---
 Tests/Codeception/Acceptance/SofortCest.php   |  1 -
 Tests/Integration/Model/PaymentTest.php       |  3 ++-
 .../Controller/DispatcherControllerTest.php   |  2 +-
 .../Unit/Service/BasketPayableServiceTest.php | 19 ++++++++++++++-----
 .../Service/FlexibleSerializerOrderTest.php   |  7 ++++---
 Tests/Unit/Service/FlexibleSerializerTest.php |  4 ++--
 src/Controller/Admin/AdminOrderController.php |  2 +-
 src/Service/BasketPayableService.php          |  2 +-
 src/Service/FlexibleSerializer.php            |  4 ++++
 9 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/Tests/Codeception/Acceptance/SofortCest.php b/Tests/Codeception/Acceptance/SofortCest.php
index 847f09e6..989b1f65 100644
--- a/Tests/Codeception/Acceptance/SofortCest.php
+++ b/Tests/Codeception/Acceptance/SofortCest.php
@@ -38,7 +38,6 @@ protected function getOXID(): array
     public function _before(AcceptanceTester $I): void
     {
         parent::_before($I);
-        $I->resetCookie([]);
     }
 
     /**
diff --git a/Tests/Integration/Model/PaymentTest.php b/Tests/Integration/Model/PaymentTest.php
index cb206909..4f508abb 100644
--- a/Tests/Integration/Model/PaymentTest.php
+++ b/Tests/Integration/Model/PaymentTest.php
@@ -7,7 +7,8 @@
 
 namespace OxidSolutionCatalysts\Unzer\Tests\Integration\Model;
 
-use OxidSolutionCatalysts\Unzer\Model\Payment;
+
+use OxidEsales\Eshop\Application\Model\Payment;
 use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleSettingBridgeInterface;
 use OxidEsales\TestingLibrary\UnitTestCase;
diff --git a/Tests/Unit/Controller/DispatcherControllerTest.php b/Tests/Unit/Controller/DispatcherControllerTest.php
index 736cc557..83d227c4 100644
--- a/Tests/Unit/Controller/DispatcherControllerTest.php
+++ b/Tests/Unit/Controller/DispatcherControllerTest.php
@@ -31,7 +31,7 @@ public function testFinalizeTmpOrderExecutesCorrectly()
             'OXID' => 'testTmpOrderId',
             'TMPORDER' => base64_encode(serialize(['order' => $order]))
         ];
-
+        /** @var DispatcherController $controller */
         $controller = $this->getDispatcherControllerPartialMock();
 
         $result = $controller->finalizeTmpOrder($paymentMock, $tmpOrderMock, $tmpData, false);
diff --git a/Tests/Unit/Service/BasketPayableServiceTest.php b/Tests/Unit/Service/BasketPayableServiceTest.php
index b31f36e3..b8ded6a2 100644
--- a/Tests/Unit/Service/BasketPayableServiceTest.php
+++ b/Tests/Unit/Service/BasketPayableServiceTest.php
@@ -2,9 +2,10 @@
 
 namespace OxidSolutionCatalysts\Unzer\Tests\Unit\Service;
 
+use OxidEsales\Eshop\Application\Model\Payment;
 use OxidEsales\Eshop\Core\Registry;
 use OxidSolutionCatalysts\Unzer\Core\UnzerDefinitions as CoreUnzerDefinitions;
-use OxidSolutionCatalysts\Unzer\Model\Payment;
+
 use OxidEsales\Eshop\Application\Model\Basket;
 use OxidSolutionCatalysts\Unzer\Service\BasketPayableService;
 use PHPUnit\Framework\TestCase;
@@ -37,7 +38,9 @@ public function testBasketIsPayableWhenBruttoIsGreaterThanMinimalPaymentAndMinim
         $minimalPayment = 50;
 
         $this->basketMock->method('getBruttoSum')->willReturn($bruttoSum);
-        $this->paymentMock->method('getFieldData')->with('oxpayments__oxfromamount')->willReturn($minimalPayment);
+        $this->paymentMock->method('getFieldData')
+            ->with('oxpayments__oxfromamount')
+            ->willReturn($minimalPayment);
 
         $this->sessionMock->method('getBasket')->willReturn($this->basketMock);
 
@@ -55,7 +58,9 @@ public function testBasketIsNotPayableWhenBruttoIsLessThanMinimalPayment()
         $minimalPayment = 50;
 
         $this->basketMock->method('getBruttoSum')->willReturn($bruttoSum);
-        $this->paymentMock->method('getFieldData')->with('oxpayments__oxfromamount')->willReturn($minimalPayment);
+        $this->paymentMock->method('getFieldData')
+            ->with('oxpayments__oxfromamount')
+            ->willReturn($minimalPayment);
 
         $this->sessionMock->method('getBasket')->willReturn($this->basketMock);
 
@@ -73,7 +78,9 @@ public function testBasketIsNotPayableWhenBruttoIsLessThanMinimalPayableAmount()
         $minimalPayment = 1;
 
         $this->basketMock->method('getBruttoSum')->willReturn($bruttoSum);
-        $this->paymentMock->method('getFieldData')->with('oxpayments__oxfromamount')->willReturn($minimalPayment);
+        $this->paymentMock->method('getFieldData')
+            ->with('oxpayments__oxfromamount')
+            ->willReturn($minimalPayment);
 
         $this->sessionMock->method('getBasket')->willReturn($this->basketMock);
 
@@ -91,7 +98,9 @@ public function testBasketIsPayableWhenBruttoIsEqualToMinimalPaymentAndMinimalPa
         $minimalPayment = CoreUnzerDefinitions::MINIMAL_PAYABLE_AMOUNT;
 
         $this->basketMock->method('getBruttoSum')->willReturn($bruttoSum);
-        $this->paymentMock->method('getFieldData')->with('oxpayments__oxfromamount')->willReturn($minimalPayment);
+        $this->paymentMock->method('getFieldData')
+            ->with('oxpayments__oxfromamount')
+            ->willReturn($minimalPayment);
 
         $this->sessionMock->method('getBasket')->willReturn($this->basketMock);
 
diff --git a/Tests/Unit/Service/FlexibleSerializerOrderTest.php b/Tests/Unit/Service/FlexibleSerializerOrderTest.php
index 61c68281..24a59d0b 100644
--- a/Tests/Unit/Service/FlexibleSerializerOrderTest.php
+++ b/Tests/Unit/Service/FlexibleSerializerOrderTest.php
@@ -1,16 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace OxidSolutionCatalysts\Unzer\Tests\Unit\Service;
 
-use OxidSolutionCatalysts\Unzer\Model\Order;
-use OxidEsales\Eshop\Core\Field;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidSolutionCatalysts\Unzer\Service\FlexibleSerializer;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
 class FlexibleSerializerOrderTest extends TestCase
 {
-    private $flexibleSerializer;
+    private ?FlexibleSerializer $flexibleSerializer;
 
     protected function setUp(): void
     {
diff --git a/Tests/Unit/Service/FlexibleSerializerTest.php b/Tests/Unit/Service/FlexibleSerializerTest.php
index d7bfe104..86dee8fe 100644
--- a/Tests/Unit/Service/FlexibleSerializerTest.php
+++ b/Tests/Unit/Service/FlexibleSerializerTest.php
@@ -9,7 +9,7 @@
 
 use OxidSolutionCatalysts\Unzer\Service\FlexibleSerializer;
 use PHPUnit\Framework\TestCase;
-use OxidSolutionCatalysts\Unzer\Model\Order;
+use OxidEsales\Eshop\Application\Model\Order;
 
 class FlexibleSerializerTest extends TestCase
 {
@@ -50,7 +50,7 @@ public function testSafeSerializeAndUnserializeCustomObject(): void
             ['OxidEsales\Eshop\Application\Model\Order']
         );
 
-        $this->assertInstanceOf('OxidSolutionCatalysts\Unzer\Model\Order', $unserialized);
+        $this->assertInstanceOf('OxidEsales\Eshop\Application\Model\Order', $unserialized);
         $this->assertEquals(1, $unserialized->id);
         $this->assertEquals('John Doe', $unserialized->customerName);
         $this->assertEquals('Extra Info', $unserialized->extraField);
diff --git a/src/Controller/Admin/AdminOrderController.php b/src/Controller/Admin/AdminOrderController.php
index 0edf1cb2..2cc2ff61 100644
--- a/src/Controller/Admin/AdminOrderController.php
+++ b/src/Controller/Admin/AdminOrderController.php
@@ -11,7 +11,7 @@
 use OxidEsales\Eshop\Application\Model\Order;
 use OxidEsales\Eshop\Core\Registry;
 use OxidSolutionCatalysts\Unzer\Traits\Request;
-use OxidSolutionCatalysts\Unzer\Model\Payment;
+use OxidEsales\Eshop\Application\Model\Payment;
 use OxidSolutionCatalysts\Unzer\Model\Order as UnzerOrder;
 use OxidSolutionCatalysts\Unzer\Model\TransactionList;
 use OxidSolutionCatalysts\Unzer\Service\Payment as UnzerPaymentService;
diff --git a/src/Service/BasketPayableService.php b/src/Service/BasketPayableService.php
index c63dae9a..b256996e 100644
--- a/src/Service/BasketPayableService.php
+++ b/src/Service/BasketPayableService.php
@@ -9,7 +9,7 @@
 
 use OxidEsales\Eshop\Core\Registry;
 use OxidSolutionCatalysts\Unzer\Core\UnzerDefinitions as CoreUnzerDefinitions;
-use OxidSolutionCatalysts\Unzer\Model\Payment;
+use OxidEsales\Eshop\Application\Model\Payment;
 
 class BasketPayableService
 {
diff --git a/src/Service/FlexibleSerializer.php b/src/Service/FlexibleSerializer.php
index 729ebe45..2eb32806 100644
--- a/src/Service/FlexibleSerializer.php
+++ b/src/Service/FlexibleSerializer.php
@@ -60,6 +60,10 @@ public function restoreOrderFromStrClass(string $serialized): ?Order
 
         $order = $this->getOrderModel();
 
+        if (!$unserializedData) {
+            return $order;
+        }
+
         foreach (get_object_vars($unserializedData) as $property => $value) {
             if (property_exists($order, $property) || method_exists($order, 'setFieldData')) {
                 if (method_exists($order, 'setFieldData')) {

From d2066b5b05c66751a9022cba9fe4753ae1fb5fbd Mon Sep 17 00:00:00 2001
From: Daniil Tkachev <daniil.tkachev@oxid-esales.com>
Date: Tue, 3 Dec 2024 12:18:58 +0100
Subject: [PATCH 11/16] update tests for php8.1 and code style

---
 .../Acceptance/AbortAndCancelPaymentCest.php  |  3 +-
 Tests/Integration/Model/PaymentTest.php       |  1 -
 Tests/PhpStan/phpstan.neon                    |  6 ++++
 .../Unit/Service/BasketPayableServiceTest.php |  1 -
 src/Controller/Admin/AdminOrderController.php | 29 +++++--------------
 5 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/Tests/Codeception/Acceptance/AbortAndCancelPaymentCest.php b/Tests/Codeception/Acceptance/AbortAndCancelPaymentCest.php
index 6c642cff..f57e3c18 100644
--- a/Tests/Codeception/Acceptance/AbortAndCancelPaymentCest.php
+++ b/Tests/Codeception/Acceptance/AbortAndCancelPaymentCest.php
@@ -61,7 +61,8 @@ public function testUserClicksBrowserBackOnPaypal(AcceptanceTester $I)
         // login page
         $I->makeScreenshot("before_back");
         $I->waitForElement($this->loginInput);
-        $I->amOnPage(Configuration::config()['modules']['config']['WebDriver']['url'] . $currentUrl);
+
+        $I->amOnPage($currentUrl);
         $templateString = Translator::translate('OSCUNZER_CANCEL_DURING_CHECKOUT');
         $I->wait(60);
         $I->makeScreenshot("after_back");
diff --git a/Tests/Integration/Model/PaymentTest.php b/Tests/Integration/Model/PaymentTest.php
index 4f508abb..081ee99e 100644
--- a/Tests/Integration/Model/PaymentTest.php
+++ b/Tests/Integration/Model/PaymentTest.php
@@ -7,7 +7,6 @@
 
 namespace OxidSolutionCatalysts\Unzer\Tests\Integration\Model;
 
-
 use OxidEsales\Eshop\Application\Model\Payment;
 use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleSettingBridgeInterface;
diff --git a/Tests/PhpStan/phpstan.neon b/Tests/PhpStan/phpstan.neon
index e02e6763..7029e01d 100644
--- a/Tests/PhpStan/phpstan.neon
+++ b/Tests/PhpStan/phpstan.neon
@@ -13,3 +13,9 @@ parameters:
         - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::getUnzerInvoiceNr\(\)#'
         - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::setUnzerTransId\(\)#'
         - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::finalizeTmpOrder\(\)#'
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Payment::canCollectFully\(\)#'
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Payment::canCollectPartially\(\)#'
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Payment::canRefundFully\(\)#'
+
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Payment::canRevertPartially\(\)#'
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Payment::isUnzerSecuredPayment\(\)#'
diff --git a/Tests/Unit/Service/BasketPayableServiceTest.php b/Tests/Unit/Service/BasketPayableServiceTest.php
index b8ded6a2..0568fcfe 100644
--- a/Tests/Unit/Service/BasketPayableServiceTest.php
+++ b/Tests/Unit/Service/BasketPayableServiceTest.php
@@ -5,7 +5,6 @@
 use OxidEsales\Eshop\Application\Model\Payment;
 use OxidEsales\Eshop\Core\Registry;
 use OxidSolutionCatalysts\Unzer\Core\UnzerDefinitions as CoreUnzerDefinitions;
-
 use OxidEsales\Eshop\Application\Model\Basket;
 use OxidSolutionCatalysts\Unzer\Service\BasketPayableService;
 use PHPUnit\Framework\TestCase;
diff --git a/src/Controller/Admin/AdminOrderController.php b/src/Controller/Admin/AdminOrderController.php
index 2cc2ff61..16e376b1 100644
--- a/src/Controller/Admin/AdminOrderController.php
+++ b/src/Controller/Admin/AdminOrderController.php
@@ -453,42 +453,29 @@ public function isUnzerOrder(): bool
 
     public function canCollectFully(): bool
     {
-        if (!($this->oPayment instanceof Payment)) {
-            return false;
-        }
-
         return $this->oPayment->canCollectFully();
     }
+
     public function canCollectPartially(): bool
     {
-        if (!($this->oPayment instanceof Payment)) {
-            return false;
-        }
-
         return $this->oPayment->canCollectPartially();
     }
+
     public function canRefundFully(): bool
     {
-        if (!($this->oPayment instanceof Payment)) {
-            return false;
-        }
-
         return $this->oPayment->canRefundFully();
     }
+
     public function canRefundPartially(): bool
     {
-        if (!($this->oPayment instanceof Payment)) {
-            return false;
-        }
-
-        return $this->oPayment->canRefundPartially();
+        /** This is fix for phpStan */
+        /** @var \OxidSolutionCatalysts\Unzer\Model\Payment $payment */
+        $payment = $this->oPayment;
+        return $payment->canRefundPartially();
     }
+
     public function canRevertPartially(): bool
     {
-        if (!($this->oPayment instanceof Payment)) {
-            return false;
-        }
-
         return $this->oPayment->canRevertPartially();
     }
 

From 196a493884abfeeaa5b6d66033e8c6db51ba8ffc Mon Sep 17 00:00:00 2001
From: Mario Lorenz <mario.lorenz@oxid-esales.com>
Date: Thu, 5 Dec 2024 11:32:42 +0100
Subject: [PATCH 12/16] UNZER-514 optimize Translations

---
 src/Controller/ThankYouController.php | 2 +-
 translations/de/oscunzer_lang.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Controller/ThankYouController.php b/src/Controller/ThankYouController.php
index 2eed51fc..280e03b7 100644
--- a/src/Controller/ThankYouController.php
+++ b/src/Controller/ThankYouController.php
@@ -69,7 +69,7 @@ public function getUnzerPrePaymentHolder(): ?string
         return $result;
     }
 
-    /** Template variable getter. Returns Unzer PrePayment Holder */
+    /** Template variable getter. Returns Unzer PrePayment Descriptor */
     public function getUnzerPrePaymentDescriptor(): ?string
     {
         $result = null;
diff --git a/translations/de/oscunzer_lang.php b/translations/de/oscunzer_lang.php
index eb4f79c2..ad6f2601 100644
--- a/translations/de/oscunzer_lang.php
+++ b/translations/de/oscunzer_lang.php
@@ -134,5 +134,5 @@
     'OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BANK_HOLDER' => 'Kontoinhaber',
     'OSCUNZER_FIX_ROUNDING' => 'Korrektur Rundung',
     'OSCUNZER_NOT_SERIALIZABLE' => 'NOT SERIALIZABLE: ',
-    'OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BANK_DESCRIPTOR' => 'Descriptor',
+    'OSCUNZER_PREPAYMENT_BANK_ACCOUNT_INFO_BANK_DESCRIPTOR' => 'Verwendungszweck',
 ];

From c24b4c6009581ae7e81cb4a201963cda1982ae28 Mon Sep 17 00:00:00 2001
From: Mario Lorenz <mario.lorenz@oxid-esales.com>
Date: Thu, 5 Dec 2024 11:33:26 +0100
Subject: [PATCH 13/16] UNZER-516 remove option UnzerOption_oscunzer_applepay
 completely

---
 metadata.php                                   | 7 -------
 views/admin/blocks/admin_module_config_var.tpl | 4 +---
 views/admin/de/module_options.php              | 3 ---
 views/admin/en/module_options.php              | 3 ---
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/metadata.php b/metadata.php
index 16c5fe98..340152b4 100644
--- a/metadata.php
+++ b/metadata.php
@@ -222,13 +222,6 @@
             'value' => '0',
             'constraints' => '0|1'
         ],
-        [
-            'group' => 'unzerapplepay',
-            'name' => 'UnzerOption_oscunzer_applepay',
-            'type' => 'select',
-            'value' => '0',
-            'constraints' => '0'
-        ],
         [
             'group' => 'unzerapplepay',
             'name' => 'applepay_merchant_capabilities',
diff --git a/views/admin/blocks/admin_module_config_var.tpl b/views/admin/blocks/admin_module_config_var.tpl
index d27ec383..1a1484d5 100644
--- a/views/admin/blocks/admin_module_config_var.tpl
+++ b/views/admin/blocks/admin_module_config_var.tpl
@@ -38,9 +38,7 @@
         [{/if}]
     </dl>
     [{elseif $var_group eq "unzerapplepay"}]
-        [{if $module_var eq "UnzerOption_oscunzer_applepay"}]
-            &nbsp;
-        [{elseif $module_var eq "applepay_merchant_capabilities" or $module_var eq "applepay_networks"}]
+        [{if $module_var eq "applepay_merchant_capabilities" or $module_var eq "applepay_networks"}]
             <dl>
                 <dd>
                     [{oxmultilang ident="SHOP_MODULE_`$module_var`"}]
diff --git a/views/admin/de/module_options.php b/views/admin/de/module_options.php
index 610b4e1f..0bf09e14 100644
--- a/views/admin/de/module_options.php
+++ b/views/admin/de/module_options.php
@@ -39,9 +39,6 @@
     'SHOP_MODULE_UnzerOption_oscunzer_paypal' => 'Paypal',
     'SHOP_MODULE_UnzerOption_oscunzer_paypal_0' => 'einziehen',
     'SHOP_MODULE_UnzerOption_oscunzer_paypal_1' => 'autorisieren und einziehen',
-    'SHOP_MODULE_UnzerOption_oscunzer_applepay' => 'Apple Pay',
-    'SHOP_MODULE_UnzerOption_oscunzer_applepay_0' => 'einziehen',
-    'SHOP_MODULE_UnzerOption_oscunzer_applepay_1' => 'autorisieren und einziehen',
     'SHOP_MODULE_UnzerOption_oscunzer_installment_rate' => 'Zinssatz für Ratenzahlung',
     'HELP_SHOP_MODULE_UnzerOption_oscunzer_installment_rate' => 'Zinssatz in %, Dezimaltrennzeichen "." z.B.: "4.5"',
     'SHOP_MODULE_UnzerjQuery' => 'Einbindung von jQuery über das Modul',
diff --git a/views/admin/en/module_options.php b/views/admin/en/module_options.php
index 275ce3a8..cf70d2e0 100644
--- a/views/admin/en/module_options.php
+++ b/views/admin/en/module_options.php
@@ -39,9 +39,6 @@
     'SHOP_MODULE_UnzerOption_oscunzer_paypal' => 'PayPal',
     'SHOP_MODULE_UnzerOption_oscunzer_paypal_0' => 'direct Capture',
     'SHOP_MODULE_UnzerOption_oscunzer_paypal_1' => 'Authorize & later Capture',
-    'SHOP_MODULE_UnzerOption_oscunzer_applepay' => 'Apple Pay',
-    'SHOP_MODULE_UnzerOption_oscunzer_applepay_0' => 'direct Capture',
-    'SHOP_MODULE_UnzerOption_oscunzer_applepay_1' => 'Authorize & later Capture',
     'SHOP_MODULE_UnzerOption_oscunzer_installment_rate' => 'Installment rate',
     'HELP_SHOP_MODULE_UnzerOption_oscunzer_installment_rate' => 'Installmentrate per 100 in %, i.e.: "4.5"',
     'SHOP_MODULE_UnzerjQuery' => 'Include jQuery via the module',

From 4a8db3334ea305774ae13813fa1c82c9c7b6aac3 Mon Sep 17 00:00:00 2001
From: Mario Lorenz <mario.lorenz@oxid-esales.com>
Date: Thu, 5 Dec 2024 11:33:46 +0100
Subject: [PATCH 14/16] CHANGELOG

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df42146c..98348e1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### FIXED
 - [0007730](https://bugs.oxid-esales.com/view.php?id=7730): even if the credit card payment was cancelled (when entering the secure code), an order confirmation is sent
+- Order of credit card data input fields optimized
+- Add Descriptor for PrePayment on ThankYou-Page
+- remove Option "Capture Later"-Option for ApplePay
 
 ## [1.2.0] - 2024-09-26
 

From d8ecbbce9ff1c2e4df169117e4fcd07388cd3462 Mon Sep 17 00:00:00 2001
From: Mario Lorenz <mario.lorenz@oxid-esales.com>
Date: Thu, 5 Dec 2024 13:33:59 +0100
Subject: [PATCH 15/16] CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98348e1a..f50ab40a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Order of credit card data input fields optimized
 - Add Descriptor for PrePayment on ThankYou-Page
 - remove Option "Capture Later"-Option for ApplePay
+- Save ApplePay-Certificates for Test- and Live-Mode. Fix an possible Maintenance when something was wrong before
+- Fixed a problem when multiple modules were in use. If Unzer was not last in some extended classes, this could lead to a maintenance.
 
 ## [1.2.0] - 2024-09-26
 

From cc3be8a576338318ecce44232451f1e795db969f Mon Sep 17 00:00:00 2001
From: Mario Lorenz <mario.lorenz@oxid-esales.com>
Date: Thu, 5 Dec 2024 14:16:12 +0100
Subject: [PATCH 16/16] CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f50ab40a..ab4850ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - remove Option "Capture Later"-Option for ApplePay
 - Save ApplePay-Certificates for Test- and Live-Mode. Fix an possible Maintenance when something was wrong before
 - Fixed a problem when multiple modules were in use. If Unzer was not last in some extended classes, this could lead to a maintenance.
+- [0007739](https://bugs.oxid-esales.com/view.php?id=7739): Fix that order with payment method Unzer bancontact is not created after successful payment
 
 ## [1.2.0] - 2024-09-26