Merge pull request #444 from mollie/release/2.1.1

Release/2.1.1
mollie · Oct 22, 2021 · 478ba58 · 478ba58
2 parents d4821ff + df3bab1
commit 478ba58
Show file tree

Hide file tree

Showing 9 changed files with 503 additions and 21 deletions.
diff --git a/Gateway/Handler/OrderHandler.php b/Gateway/Handler/OrderHandler.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Gateway\Handler;
+
+use Magento\Payment\Gateway\Data\PaymentDataObject;
+use Magento\Payment\Gateway\Response\HandlerInterface;
+
+class OrderHandler implements HandlerInterface
+{
+    public function handle(array $handlingSubject, array $response)
+    {
+        /** @var PaymentDataObject $paymentDataObject */
+        $paymentDataObject = $handlingSubject['payment'];
+        $payment = $paymentDataObject->getPayment();
+        $order = $payment->getOrder();
+
+        $order->setCanSendNewEmailFlag(false);
+    }
+}
diff --git a/Service/Magento/Vault/AddCardToVault.php b/Service/Magento/Vault/AddCardToVault.php
@@ -60,19 +60,23 @@ public function forPayment(OrderPaymentInterface $payment, Order $mollieOrder)
         $paymentToken = $this->getPaymentToken($mollieOrder);
         $extensionAttributes = $this->getExtensionAttributes($payment);
 
-        if ($extensionAttributes->getVaultPaymentToken() !== null) {
+        if ($paymentToken === null || $extensionAttributes->getVaultPaymentToken() !== null) {
             return;
         }
 
         $extensionAttributes->setVaultPaymentToken($paymentToken);
     }
 
-    private function getPaymentToken(Order $mollieOrder)
+    private function getPaymentToken(Order $mollieOrder): ?PaymentTokenInterface
     {
         /** @var Payment $molliePayment */
         $molliePayment = $mollieOrder->payments()->offsetGet(0);
         $details = $molliePayment->details;
 
+        if (!$details) {
+            return null;
+        }
+
         /** @var PaymentTokenInterface $paymentToken */
         $paymentToken = $this->paymentTokenFactory->create(PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD);
         $paymentToken->setGatewayToken($molliePayment->mandateId);

diff --git a/Service/Order/TransactionPart/SequenceType.php b/Service/Order/TransactionPart/SequenceType.php
@@ -17,6 +17,11 @@
 
 class SequenceType implements TransactionPartInterface
 {
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * @var OrderContainsSubscriptionProduct
      */
@@ -28,9 +33,11 @@ class SequenceType implements TransactionPartInterface
     private $customerSession;
 
     public function __construct(
+        Config $config,
         OrderContainsSubscriptionProduct $orderContainsSubscriptionProduct,
         Session $customerSession
     ) {
+        $this->config = $config;
         $this->orderContainsSubscriptionProduct = $orderContainsSubscriptionProduct;
         $this->customerSession = $customerSession;
     }
@@ -62,7 +69,8 @@ private function shouldAddSequenceType(OrderInterface $order): bool
             return false;
         }
 
-        if ($order->getPayment()->getAdditionalInformation(VaultConfigProvider::IS_ACTIVE_CODE) &&
+        if ($this->config->isMagentoVaultEnabled($order->getStoreId()) &&
+            $order->getPayment()->getAdditionalInformation(VaultConfigProvider::IS_ACTIVE_CODE) &&
             $order->getPayment()->getMethod() == 'mollie_methods_creditcard'
         ) {
             return true;

diff --git a/Test/Integration/Di/GatewayComponentsTest.php b/Test/Integration/Di/GatewayComponentsTest.php
@@ -0,0 +1,111 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Test\Integration\Di;
+
+use Magento\Framework\ObjectManager\ConfigInterface;
+use Magento\TestFramework\ObjectManager\Config;
+use Mollie\Payment\Test\Integration\IntegrationTestCase;
+
+class GatewayComponentsTest extends IntegrationTestCase
+{
+    public function testHasAValidatorPool()
+    {
+        /** @var Config $config */
+        $config = $this->objectManager->get(ConfigInterface::class);
+
+        foreach ($this->getMethods() as $method) {
+            $name = $method['name'];
+
+            $this->assertArrayHasKey('Mollie' . $name . 'ValidatorPool', $config->getVirtualTypes());
+        }
+    }
+
+    public function testHasTheValidatorPoolConfigured()
+    {
+        $arguments = $this->getObjectManagerArguments();
+
+        foreach ($this->getMethods() as $method) {
+            $class = $method['class'];
+            $name  = $method['name'];
+            $classArguments = $arguments[$class];
+
+            $this->assertArrayHasKey('validatorPool', $classArguments, $name . ' does not have a ValidatorPool');
+            $this->assertEquals('Mollie' . $name . 'ValidatorPool', $classArguments['validatorPool']['instance']);
+        }
+    }
+
+    public function testHasACountryValidator()
+    {
+        /** @var Config $config */
+        $config = $this->objectManager->get(ConfigInterface::class);
+
+        foreach ($this->getMethods() as $method) {
+            $name = $method['name'];
+
+            $this->assertArrayHasKey('Mollie' . $name . 'CountryValidator', $config->getVirtualTypes());
+        }
+    }
+
+    public function testCountryValidatorUsesCorrectConfiguration()
+    {
+        $arguments = $this->getObjectManagerArguments();
+
+        /** @var Config $config */
+        $config = $this->objectManager->get(ConfigInterface::class);
+
+        foreach ($this->getMethods() as $method) {
+            $name  = $method['name'];
+
+            $virtualTypes = $config->getVirtualTypes();
+
+            $validatorName = 'Mollie' . $name . 'CountryValidator';
+            $configName = 'Mollie' . $name . 'Config';
+            $this->assertArrayHasKey($validatorName, $virtualTypes);
+
+            $classArguments = $arguments[$validatorName];
+            $this->assertEquals($configName, $classArguments['config']['instance']);
+        }
+    }
+
+    private function getObjectManagerArguments(): array
+    {
+        static $arguments = null;
+
+        if ($arguments) {
+            return $arguments;
+        }
+
+        /** @var Config $config */
+        $config = $this->objectManager->get(ConfigInterface::class);
+
+        $reflectionObject = new \ReflectionObject($config);
+        $reflectionProperty = $reflectionObject->getProperty('_arguments');
+        $reflectionProperty->setAccessible(true);
+
+        $arguments = $reflectionProperty->getValue($config);
+
+        return $arguments;
+    }
+
+    private function getMethods(): array
+    {
+        $keys = array_keys($this->getObjectManagerArguments());
+
+        $methods = array_filter($keys, function ($key) {
+            return strpos($key, 'Mollie\\Payment\\Model\\Methods') !== false;
+        });
+
+        return array_map(function ($key) {
+            $parts = explode('\\', $key);
+
+            return [
+                'class' => $key,
+                'name' => end($parts),
+            ];
+        }, $methods);
+    }
+}
diff --git a/Test/Integration/Service/Order/TransactionPart/SequenceTypeTest.php b/Test/Integration/Service/Order/TransactionPart/SequenceTypeTest.php
@@ -96,6 +96,7 @@ public function testIncludesNothingWhenTheCustomersApiIsDisabled()
     /**
      * @magentoDataFixture Magento/Sales/_files/order.php
      * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoConfigFixture default_store payment/mollie_general/enable_magento_vault 1
      * @magentoConfigFixture default_store payment/mollie_methods_creditcard/enable_customers_api 1
      */
     public function testIncludesTheSequenceTypeWhenVaultIsEnabled()

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "mollie/magento2",
   "description": "Mollie Payment Module for Magento 2",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "keywords": [
     "mollie",
     "payment",

diff --git a/etc/config.xml b/etc/config.xml
@@ -3,7 +3,7 @@
     <default>
         <payment>
             <mollie_general>
-                <version>v2.1.0</version>
+                <version>v2.1.1</version>
                 <active>0</active>
                 <enabled>0</enabled>
                 <type>test</type>