Merge pull request #366 from mollie/1.23.1

1.23.1
mollie · Mar 10, 2021 · 7691c14 · 7691c14
2 parents d17796b + 960f85f
commit 7691c14
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/Service/Order/TransactionPart/CardToken.php b/Service/Order/TransactionPart/CardToken.php
@@ -22,8 +22,7 @@ class CardToken implements TransactionPartInterface
     public function process(OrderInterface $order, $apiMethod, array $transaction)
     {
         $additionalData = $order->getPayment()->getAdditionalInformation();
-
-        if (!isset($additionalData['card_token'])) {
+        if ($order->getPayment()->getMethod() != 'mollie_methods_creditcard' || !isset($additionalData['card_token'])) {
             return $transaction;
         }
 

diff --git a/Test/Integration/Service/Order/TransactionPart/CardTokenTest.php b/Test/Integration/Service/Order/TransactionPart/CardTokenTest.php
@@ -20,6 +20,7 @@ public function testAddsDataForPaymentsApi()
     {
         $order = $this->loadOrderById('100000001');
         $payment = $order->getPayment();
+        $payment->setMethod('mollie_methods_creditcard');
         $payment->setAdditionalInformation('card_token', 'abc123');
 
         /** @var CardToken $instance */
@@ -36,6 +37,7 @@ public function testAddsDataForPaymentsApi()
     public function testAddsDataForOrdersApi()
     {
         $order = $this->loadOrderById('100000001');
+        $order->getPayment()->setMethod('mollie_methods_creditcard');
         $payment = $order->getPayment();
         $payment->setAdditionalInformation('card_token', 'abc123');
 
@@ -53,6 +55,25 @@ public function testAddsDataForOrdersApi()
     public function testDoesNotChangeTheTransactionWhenNoCardTokenIsPresent()
     {
         $order = $this->loadOrderById('100000001');
+        $order->getPayment()->setMethod('mollie_methods_creditcard');
+
+        /** @var CardToken $instance */
+        $instance = $this->objectManager->create(CardToken::class);
+
+        $transaction = $instance->process($order, Orders::CHECKOUT_TYPE, ['method' => 'creditcard']);
+
+        $this->assertEquals(['method' => 'creditcard'], $transaction);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     */
+    public function testDoesATheCardFieldWhenThePaymentMethodIsNotCreditcard()
+    {
+        $order = $this->loadOrderById('100000001');
+        $payment = $order->getPayment();
+        $payment->setMethod('checkmo');
+        $payment->setAdditionalInformation('card_token', 'abc123');
 
         /** @var CardToken $instance */
         $instance = $this->objectManager->create(CardToken::class);

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

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