Merge pull request #325 from OXID-eSales/b-6.3.x-fix-apple2-UNZER-529

B 6.3.x fix apple2 unzer 529
OXID-eSales · Dec 13, 2024 · 9e0f946 · 9e0f946
2 parents a86e0a5 + f9ad1f2
commit 9e0f946
Show file tree

Hide file tree

Showing 17 changed files with 237 additions and 138 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - 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
+- Fix email notification sending for payments with auth only mode
 
 ## [1.2.0] - 2024-09-26
 

diff --git a/Tests/Unit/Service/FlexibleSerializerTest.php b/Tests/Unit/Service/FlexibleSerializerTest.php
@@ -28,11 +28,10 @@ public function testSafeUnserializeWithAllowedClasses(): void
 
         $serialized = $this->flexibleSerializer->safeSerialize($order);
         $unserialized = $this->flexibleSerializer->safeUnserialize(
-            $serialized,
-            ['OxidEsales\Eshop\Application\Model\Order']
+            $serialized
         );
 
-        $this->assertInstanceOf('OxidEsales\Eshop\Application\Model\Order', $unserialized);
+        $this->assertInstanceOf(\stdClass::class, $unserialized);
         $this->assertEquals(1, $unserialized->id);
         $this->assertEquals('John Doe', $unserialized->customerName);
     }
@@ -50,7 +49,6 @@ public function testSafeSerializeAndUnserializeCustomObject(): void
             ['OxidEsales\Eshop\Application\Model\Order']
         );
 
-        $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);
@@ -132,7 +130,6 @@ public function testSafeSerializeAndUnserializeExtendedObject(): void
             [\OxidEsales\Eshop\Application\Model\Order::class]
         );
 
-        $this->assertInstanceOf(Order::class, $unserialized);
         $this->assertEquals(1, $unserialized->id);
         $this->assertEquals('John Doe', $unserialized->customerName);
         $this->assertEquals('Extra Info', $unserialized->extraField);

diff --git a/Tests/Unit/Service/TransactionTest.php b/Tests/Unit/Service/TransactionTest.php
@@ -5,6 +5,8 @@
  * See LICENSE file for license details.
  */
 
+declare(strict_types=1);
+
 namespace OxidSolutionCatalysts\Unzer\Tests\Unit\Service;
 
 use OxidEsales\Eshop\Core\UtilsDate;

diff --git a/Tests/Unit/Service/TransactionWriteTest.php b/Tests/Unit/Service/TransactionWriteTest.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace OxidSolutionCatalysts\Unzer\Tests\Unit\Service;
+
+use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
+use OxidEsales\Eshop\Core\UtilsDate;
+use OxidSolutionCatalysts\Unzer\Model\Transaction;
+use OxidSolutionCatalysts\Unzer\Service\Context;
+use OxidSolutionCatalysts\Unzer\Service\DebugHandler;
+use OxidSolutionCatalysts\Unzer\Service\Transaction as TransactionService;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+use OxidSolutionCatalysts\Unzer\Model\Transaction as TransactionModel;
+
+class TransactionWriteTest extends TestCase
+{
+    /** @var TransactionService|MockObject */
+    private $transactionService;
+
+    /** @var TransactionModel|MockObject */
+    private $transactionMock;
+
+    /** @var MockObject */
+    private $debugHandlerMock;
+
+    protected function setUp(): void
+    {
+        $this->transactionMock = $this->createMock(Transaction::class);
+        $this->debugHandlerMock = $this->createMock(DebugHandler::class);
+
+        $this->transactionService = $this->getMockBuilder(TransactionService::class)
+            ->setConstructorArgs([
+                $this->createConfiguredMock(Context::class, ['getCurrentShopId' => 5]),
+                $this->createConfiguredMock(UtilsDate::class, ['getTime' => time()]),
+            ])
+            ->onlyMethods(['getNewTransactionObject', 'prepareTransactionOxid', 'getServiceFromContainer'])
+            ->getMock();
+
+        $this->transactionService->method('getNewTransactionObject')->willReturn($this->transactionMock);
+        $this->transactionService->method('getServiceFromContainer')->willReturn($this->debugHandlerMock);
+    }
+
+    public function testSaveTransactionWithDuplicateEntry(): void
+    {
+        $params = ['metadata' => '{}', 'otherParam' => 'value'];
+        $oxid = '12345';
+
+        $this->transactionService->method('prepareTransactionOxid')->willReturn($oxid);
+
+        $this->transactionMock->method('load')->with($oxid)->willReturn(false);
+
+        $exception = new DatabaseErrorException('duplicate', 1062, new \Doctrine\DBAL\Exception());
+        $this->transactionMock->method('save')
+            ->willThrowException($exception);
+
+        $this->debugHandlerMock->expects($this->once())
+            ->method('log')
+            ->with($this->stringContains('saveTransaction: duplicate'));
+
+        $result = $this->transactionService->saveTransaction($params);
+
+        $this->assertTrue(
+            $result,
+            'saveTransaction should return true even when a DatabaseErrorException occurs.'
+        );
+    }
+
+    public function testSaveTransactionWithOtherDatabaseError(): void
+    {
+        $params = ['metadata' => '{}', 'otherParam' => 'value'];
+        $oxid = '67890';
+
+        $this->transactionService->method('prepareTransactionOxid')->willReturn($oxid);
+
+        $this->transactionMock->method('load')->with($oxid)->willReturn(false);
+
+        $exception = new DatabaseErrorException('Other database error', 1062, new \Exception());
+        $this->transactionMock->method('save')->willThrowException($exception);
+
+        $this->debugHandlerMock->expects($this->once())
+            ->method('log')
+            ->with($this->stringContains('saveTransaction: Other database error'));
+
+        $result = $this->transactionService->saveTransaction($params);
+
+        $this->assertTrue(
+            $result,
+            'saveTransaction should return true even when other DatabaseErrorException occurs.'
+        );
+    }
+
+    public function testSaveTransactionSuccess(): void
+    {
+        $params = ['metadata' => '{}', 'otherParam' => 'value'];
+        $oxid = '11223';
+
+        $this->transactionService->method('prepareTransactionOxid')->willReturn($oxid);
+
+        $this->transactionMock->method('load')->with($oxid)->willReturn(false);
+        $this->transactionMock->expects($this->once())->method('assign')->with($params);
+        $this->transactionMock->expects($this->once())->method('setId')->with($oxid);
+        $this->transactionMock->expects($this->once())->method('save');
+
+        $result = $this->transactionService->saveTransaction($params);
+
+        $this->assertTrue($result, 'saveTransaction should return true when transaction is successfully saved.');
+    }
+
+    public function testGetNewTransactionObject(): void
+    {
+        $transactionService = new class (
+            $this->createPartialMock(Context::class, []),
+            $this->createConfiguredMock(UtilsDate::class, [])
+        ) extends TransactionService {
+            public function testGetNewTransactionObject()
+            {
+                return $this->getNewTransactionObject();
+            }
+        };
+
+        $item = $transactionService->testGetNewTransactionObject();
+        $this->assertInstanceOf(Transaction::class, $item);
+        $this->assertNull($item->getId());
+    }
+}
diff --git a/Tests/Unit/Service/UnzerTest.php b/Tests/Unit/Service/UnzerTest.php
@@ -99,7 +99,6 @@ public function getPaymentProcedureDataProvider(): array
         return [
             ['paypal', 'special'],
             ['card', 'special'],
-            ['applepay', 'special'],
             ['installment-secured', 'authorize'],
             ['paylater-installment', 'authorize'],
             ['paylater-invoice', 'authorize'],

diff --git a/metadata.php b/metadata.php
@@ -53,7 +53,7 @@
             </ul>',
     ],
     'thumbnail' => 'logo.svg',
-    'version' => '1.2.1-rc.2',
+    'version' => '1.2.1-rc.3',
     'author' => 'OXID eSales AG',
     'url' => 'https://www.oxid-esales.com',
     'email' => '[email protected]',

diff --git a/src/Controller/Admin/AdminOrderController.php b/src/Controller/Admin/AdminOrderController.php
@@ -12,7 +12,6 @@
 use OxidEsales\Eshop\Core\Registry;
 use OxidSolutionCatalysts\Unzer\Traits\Request;
 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;
 use OxidSolutionCatalysts\Unzer\Service\Transaction as TransactionService;
@@ -194,7 +193,7 @@ protected function getUnzerViewData(string $sPaymentId, string $sTypeId): void
                 $editObject->getFieldData('oxpaid') == '0000-00-00 00:00:00' &&
                 $fCharged == $unzerPayment->getAmount()->getTotal()
             ) {
-                /** @var UnzerOrder $editObject */
+                /** @var \OxidSolutionCatalysts\Unzer\Model\Order $editObject */
                 $editObject->markUnzerOrderAsPaid();
                 $this->forceReloadListFrame();
             }

diff --git a/src/Controller/Admin/ModuleConfiguration.php b/src/Controller/Admin/ModuleConfiguration.php
@@ -132,6 +132,7 @@ public function transferApplePayPaymentProcessingData(): void
 
         $this->saveMerchantCert($systemMode);
         $this->saveMerchantKey($systemMode);
+        $this->saveMerchantIdentifier($systemMode);
         $this->savePaymentCert($systemMode);
         $this->savePaymentKey($systemMode);
 
@@ -264,6 +265,7 @@ public function saveConfVars()
 
             $this->saveMerchantCert($systemMode);
             $this->saveMerchantKey($systemMode);
+            $this->saveMerchantIdentifier($systemMode);
             $this->savePaymentCert($systemMode);
             $this->savePaymentKey($systemMode);
 
@@ -299,6 +301,28 @@ private function saveMerchantKey(string $systemMode): void
         }
     }
 
+    private function saveMerchantIdentifier(string $systemMode): void
+    {
+        $errorIds = [
+            'onEmpty' => 'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_ID_EMPTY',
+            'onShort' => 'OSCUNZER_ERROR_TRANSMITTING_APPLEPAY_MERCHANT_ID_TOO_SHORT'
+        ];
+
+        $newValue = $this->getUnzerStringRequestEscapedParameter(
+            $systemMode . '-' . 'applepay_merchant_identifier'
+        );
+
+        $oldValue = $this->moduleSettings->getApplePayMerchantIdentifier();
+
+        $this->setIsUpdate($oldValue, $newValue);
+
+        $isValid = $this->validateCredentialsForSaving($newValue, $errorIds);
+
+        if ($isValid) {
+            $this->moduleSettings->setApplePayMerchantIdentifier($newValue);
+        }
+    }
+
     private function saveMerchantCert(string $systemMode): void
     {
         $errorIds = [

diff --git a/src/Controller/OrderController.php b/src/Controller/OrderController.php
@@ -495,7 +495,12 @@ private function cleanUpCancelledPayments(): void
 
             $isOrderAlreadyCancelled = Registry::getSession()->getVariable('orderCancellationProcessed');
             if (!$isOrderAlreadyCancelled) {
-                $iSuccess = (int)$oOrder->finalizeUnzerOrderAfterRedirect($oBasket, $oUser);
+                $iSuccess = (int)$oOrder->finalizeUnzerOrderAfterRedirect(
+                    $oBasket,
+                    $oUser,
+                    ['finalizeCancellation' => true]
+                );
+
                 $oUser->onOrderExecute($oBasket, $iSuccess);
             }
             Registry::getSession()->deleteVariable('orderCancellationProcessed');
@@ -506,7 +511,6 @@ private function cleanUpCancelledPayments(): void
 
             Registry::getSession()->setVariable('sess_challenge', $this->getUtilsObjectInstance()->generateUID());
             Registry::getSession()->setBasket($oBasket);
-            Registry::getSession()->deleteVariable('orderCancellationProcessed');
             $this->redirectUserToCheckout($unzerService, $oOrder);
         }
     }

diff --git a/src/Model/Order.php b/src/Model/Order.php
@@ -34,14 +34,16 @@ class Order extends Order_parent
     /**
      * @param Basket $oBasket
      * @param User $oUser
+     * @param array $params
      * @return int|bool
-     * @throws Exception
-     *
+     * @throws \UnzerSDK\Exceptions\UnzerApiException
      * @SuppressWarnings(PHPMD.ElseExpression)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function finalizeUnzerOrderAfterRedirect(
         Basket $oBasket,
-        User $oUser
+        User $oUser,
+        array $params = []
     ) {
         $orderId = Registry::getSession()->getVariable('sess_challenge');
         $orderId = is_string($orderId) ? $orderId : '';
@@ -97,10 +99,17 @@ public function finalizeUnzerOrderAfterRedirect(
             } else {
                 if ($unzerPaymentStatus !== PaymentService::STATUS_NOT_FINISHED) {
                     Registry::getSession()->setVariable('orderCancellationProcessed', true);
-                    $iRet = 1; //TODO: not sure if this is correct - this is hardcoded for the Paypal cancellaction
                 }
-                $this->_setOrderStatus($unzerPaymentStatus); //ERROR if paypal
+
+                $this->_setOrderStatus($unzerPaymentStatus);
                 $this->setTmpOrderStatus($unzerOrderId, $unzerPaymentStatus);
+
+                if (!isset($params['finalizeCancellation'])) {
+                    //  then we consider this is a payment with only auth mode and the order is completed
+                    $this->sendOrderConfirmationEmail($oUser, $oBasket, $oUserPayment);
+                }
+
+                $iRet = 1;
             }
         }
 

diff --git a/src/Service/FlexibleSerializer.php b/src/Service/FlexibleSerializer.php
@@ -7,10 +7,8 @@
 
 namespace OxidSolutionCatalysts\Unzer\Service;
 
-use Exception;
 use OxidEsales\Eshop\Application\Model\Order;
 use ReflectionClass;
-use ReflectionException;
 use stdClass;
 
 class FlexibleSerializer
@@ -112,11 +110,12 @@ private function makeSerializable($data)
     /**
      * Restore unserializable data, including objects of allowed classes.
      *
-     * @param mixed $data The data to be restored.
+     * @param mixed $data           The data to be restored.
      * @param array $allowedClasses An array of fully qualified class names that are allowed to be restored.
      * @return mixed The restored data.
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ElseExpression)
+     * @throws \ReflectionException
      */
     private function restoreUnserializable($data, array $allowedClasses)
     {
@@ -127,7 +126,10 @@ private function restoreUnserializable($data, array $allowedClasses)
         }
 
         if (is_object($data) && isset($data->__class)) {
-            $className = $data->__class;
+            $className = get_parent_class($data->__class);
+            if (!$className) {
+                $className = $data->__class;
+            }
             if ($this->isAllowedClass($className, $allowedClasses)) {
                 $reflection = new ReflectionClass($className);
                 $restored = $reflection->newInstanceWithoutConstructor();