fix tests

OXID-eSales · Feb 17, 2025 · b3611ac · b3611ac
1 parent b05c61c
commit b3611ac
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 38 deletions.
diff --git a/src/Controller/OrderController.php b/src/Controller/OrderController.php
@@ -492,8 +492,8 @@ private function isPaymentCancelledAfterFirstTransaction(PaymentService $payment
         $oTmpOrder = oxNew(TmpOrder::class);
         $tmpOrderArray = $oTmpOrder->getTmpOrderByUnzerId($orderId);
 
-        if (!empty($tmpOrderArray)) {
-            return true;
+        if (count($tmpOrderArray) > 0) {
+            return false;
         }
 
         return true;

diff --git a/src/Service/Payment.php b/src/Service/Payment.php
@@ -21,6 +21,7 @@
 use OxidSolutionCatalysts\Unzer\Exception\RedirectWithMessage;
 use OxidSolutionCatalysts\Unzer\PaymentExtensions\UnzerPayment as AbstractUnzerPayment;
 use OxidSolutionCatalysts\Unzer\Service\Transaction as TransactionService;
+use OxidSolutionCatalysts\Unzer\Traits\Request;
 use stdClass;
 use UnzerSDK\Exceptions\UnzerApiException;
 use UnzerSDK\Resources\Payment as UnzerPayment;
@@ -42,6 +43,8 @@
  */
 class Payment
 {
+    use Request;
+
     public const STATUS_OK = "OK";
     public const STATUS_CANCELED = "CANCELED";
     public const STATUS_NOT_FINISHED = "NOT_FINISHED";
@@ -65,28 +68,24 @@ class Payment
 
     protected TransactionService $transactionService;
 
-    /**
-     * @param Session $session
-     * @param PaymentExtensionLoader $paymentExtLoader
-     * @param Translator $translator
-     * @param Unzer $unzerService
-     * @param UnzerSDKLoader $unzerSDKLoader
-     * @param TransactionService $transactionService
-     */
+    private TmpOrderServiceInterface $tmpOrderService;
+
     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;
         $this->translator = $translator;
         $this->unzerService = $unzerService;
         $this->unzerSDKLoader = $unzerSDKLoader;
         $this->transactionService = $transactionService;
+        $this->tmpOrderService = $tmpOrderService;
     }
 
     /**
@@ -99,8 +98,7 @@ public function __construct(
     public function executeUnzerPayment(PaymentModel $paymentModel): bool
     {
         $paymentExtension = null;
-        /** @var string $customerType */
-        $customerType = Registry::getRequest()->getRequestParameter('unzer_customer_type', 'B2C');
+        $customerType = $this->getUnzerStringRequestParameter('unzer_customer_type');
         $user = $this->session->getUser();
         $basket = $this->session->getBasket();
         $currency = $basket->getBasketCurrency()->name;
@@ -113,7 +111,7 @@ public function executeUnzerPayment(PaymentModel $paymentModel): bool
             );
 
             $oOrder = oxNew(Order::class);
-            /** @var UnzerOrderModel $oOrder */
+            /** @var Order $oOrder */
             $oOrder->createTmpOrder($basket, $user, $paymentExtension->getUnzerOrderId());
 
             $paymentExtension->execute(
@@ -141,9 +139,7 @@ public function executeUnzerPayment(PaymentModel $paymentModel): bool
             );
         } catch (Exception $e) {
             throw new RedirectWithMessage(
-                $this->unzerService->prepareOrderRedirectUrl(
-                    $paymentExtension instanceof AbstractUnzerPayment && $paymentExtension->redirectUrlNeedPending()
-                ),
+                $this->unzerService->prepareOrderRedirectUrl(false),
                 $e->getMessage()
             );
         }
@@ -228,12 +224,6 @@ public function getUnzerOrderId(): string
         return $result;
     }
 
-    /**
-     * @param string $paymentId
-     * @param string $currency
-     * @param string $customerType
-     * @return \UnzerSDK\Unzer
-     */
     protected function getUnzerSDK(
         string $paymentId = '',
         string $currency = '',
@@ -246,10 +236,10 @@ protected function getUnzerSDK(
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getSessionUnzerPayment(bool $cache): ?UnzerPayment
+    public function getSessionUnzerPayment(bool $noCache = false): ?UnzerPayment
     {
         $result = null;
-        if ($cache === true) {
+        if ($noCache === false) {
             if ($this->sessionUnzerPayment instanceof UnzerPayment) {
                 return $this->sessionUnzerPayment;
             }
@@ -265,13 +255,17 @@ public function getSessionUnzerPayment(bool $cache): ?UnzerPayment
                 return null;
             }
 
-            /** @var Order $order */
-            $order = oxNew(Order::class);
-            $order->load($sessionOrderId);
+            $order = $this->tmpOrderService->getOrderBySessionOrderId($sessionOrderId);
 
-            $paymentType = $this->getPaymentType($sessionOrderId, $order);
-            $currency = $this->getOrderCurrency($sessionOrderId, $order, $paymentType);
-            $customerType = $this->getCustomerType($currency, $paymentType);
+            $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(

diff --git a/src/Service/Transaction.php b/src/Service/Transaction.php
@@ -204,7 +204,6 @@ protected function prepareTransactionOxid(array $params): string
     {
         unset($params['oxactiondate']);
         unset($params['serialized_basket']);
-        unset($params['customertype']);
 
         /** @var string $jsonEncode */
         $jsonEncode = json_encode($params);
@@ -526,7 +525,7 @@ public function getCustomerTypeAndCurrencyByOrderId(string $orderId): array
         $transaction->load($transactionId);
 
         return [
-            'customertype' => $transaction->getFieldData('customertype') ?? '',
+            'customertype' => $transaction->getFieldData('customertype') ?? 'B2C',
             'currency' => $transaction->getFieldData('currency') ?? '',
         ];
     }
@@ -633,7 +632,7 @@ public function getSavedPaymentsForUser(?User $user, array $ids, bool $cache): a
                     $user,
                     $paymentTypeId,
                     $typeData['currency'] ?: '',
-                    $typeData['customertype'] ?: '',
+                    !empty($typeData['customertype']) ? $typeData['customertype'] : 'B2C',
                     $paymentTypeId
                 );
             }

diff --git a/src/Service/UnzerSDKLoader.php b/src/Service/UnzerSDKLoader.php
@@ -63,6 +63,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
@@ -79,8 +82,7 @@ public function getUnzerSDK(string $paymentId = '', string $currency = '', strin
             $sdk = $this->getUnzerSDKbyKey($key);
         } catch (UnzerException $e) {
             $logEntry = sprintf(
-                'Try to get the SDK with the Key "%s" defined by paymentId "%s", currency "%s", customerType "%s" '
-                . $e->getTraceAsString(),
+                'Try to get the SDK with the Key "%s" defined by paymentId "%s", currency "%s", customerType "%s"',
                 $key,
                 $paymentId,
                 $currency,

diff --git a/tests/Codeception/Config/params.php b/tests/Codeception/Config/params.php
@@ -34,6 +34,7 @@
     'MYSQL_CONFIG_PATH' => getMysqlConfigPath(),
     'SELENIUM_SERVER_PORT' => getenv('SELENIUM_SERVER_PORT') ?: '4444',
     'SELENIUM_SERVER_IP' => getenv('SELENIUM_SERVER_IP') ?: 'selenium',
+    'SELENIUM_SERVER_HOST' => getenv('SELENIUM_SERVER_HOST') ?: 'selenium',
     'BROWSER_NAME' => getenv('BROWSER_NAME') ?: 'chrome',
     'PHP_BIN' => $phpBinEnv,
     'SCREEN_SHOT_URL' => $screenShotPathEnv

diff --git a/tests/Codeception/acceptance.suite.yml b/tests/Codeception/acceptance.suite.yml
@@ -30,8 +30,8 @@ modules:
         populate: true # run populator before all tests
         cleanup: false # run populator before each test#
         populator: >
-            ./bin/oe-console oe:setup:demodata &&
-            ./bin/oe-console oe:module:activate osc-unzer &&
+            bin/oe-console oe:setup:demodata &&
+            bin/oe-console oe:module:activate osc-unzer &&
             mysql --defaults-file=$mysql_config --default-character-set=utf8 $dbname < $module_dump
     - \OxidEsales\Codeception\Module\Oxideshop:
         screen_shot_url: '%SCREEN_SHOT_URL%'