Merge pull request #355 from Adyen/develop

Release 2.4.1

Block/Redirect/Redirect.php

@@ -130,14 +130,16 @@ class Redirect extends \Magento\Payment\Block\Form
                             if ($this->getPaymentMethodSelectionOnAdyen()) {
                                 $url = 'https://test.adyen.com/hpp/select.shtml';
                             } else {
-                                if ($this->_adyenHelper->isPaymentMethodOpenInvoiceMethod(
-                                    $this->_order->getPayment()->getAdditionalInformation('brand_code')
-                                )
-                                ) {
-                                    $url = "https://test.adyen.com/hpp/skipDetails.shtml";
-                                } else {
-                                    $url = "https://test.adyen.com/hpp/details.shtml";
-                                }
+								if ($this->_adyenHelper->isPaymentMethodOpenInvoiceMethod(
+										$this->_order->getPayment()->getAdditionalInformation('brand_code')
+									) || $this->_adyenHelper->isPaymentMethodMolpayMethod(
+										$this->_order->getPayment()->getAdditionalInformation('brand_code')
+									)
+								) {
+									$url = "https://test.adyen.com/hpp/skipDetails.shtml";
+								} else {
+									$url = "https://test.adyen.com/hpp/details.shtml";
+								}
                             }
                         }
                         break;
@@ -148,14 +150,16 @@ class Redirect extends \Magento\Payment\Block\Form
                             if ($this->getPaymentMethodSelectionOnAdyen()) {
                                 $url = 'https://live.adyen.com/hpp/select.shtml';
                             } else {
-                                if ($this->_adyenHelper->isPaymentMethodOpenInvoiceMethod(
-                                    $this->_order->getPayment()->getAdditionalInformation('brand_code')
-                                )
-                                ) {
-                                    $url = "https://live.adyen.com/hpp/skipDetails.shtml";
-                                } else {
-                                    $url = "https://live.adyen.com/hpp/details.shtml";
-                                }
+								if ($this->_adyenHelper->isPaymentMethodOpenInvoiceMethod(
+										$this->_order->getPayment()->getAdditionalInformation('brand_code')
+									) || $this->_adyenHelper->isPaymentMethodMolpayMethod(
+										$this->_order->getPayment()->getAdditionalInformation('brand_code')
+									)
+								) {
+									$url = "https://live.adyen.com/hpp/skipDetails.shtml";
+								} else {
+									$url = "https://live.adyen.com/hpp/details.shtml";
+								}
                             }
                         }
                         break;

Helper/Data.php

@@ -928,6 +928,19 @@ class Data extends AbstractHelper
         return false;
     }
 
+	/**
+	 * @param $paymentMethod
+	 * @return bool
+	 */
+	public function isPaymentMethodMolpayMethod($paymentMethod)
+	{
+		if (strpos($paymentMethod, 'molpay_') !== false) {
+			return true;
+		}
+
+		return false;
+	}
+
     public function getRatePayId()
     {
         return $this->getAdyenHppConfigData("ratepay_id");
@@ -1291,7 +1304,7 @@ class Data extends AbstractHelper
 		if ($this->isDemoMode($storeId)) {
 			$client->setEnvironment(\Adyen\Environment::TEST);
 		} else {
-			$client->setEnvironment(\Adyen\Environment::LIVE, $this->getLiveEndpointPrefix($storeId));
+			$client->setEnvironment(\Adyen\Environment::LIVE);
 		}
 
 		$client->setLogger($this->adyenLogger);

composer.json

@@ -2,7 +2,7 @@
   "name": "adyen/module-payment",
   "description": "Official Magento2 Plugin to connect to Payment Service Provider Adyen.",
   "type": "magento2-module",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "license": [
     "OSL-3.0",
     "AFL-3.0"
@@ -14,7 +14,7 @@
     }
   ],
   "require": {
-    "adyen/php-api-library": ">=1.5.2",
+    "adyen/php-api-library": ">=1.5.3",
     "magento/framework": ">=100.1.0"
   },
   "autoload": {

etc/module.xml

@@ -24,7 +24,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
 
-    <module name="Adyen_Payment" setup_version="2.4.0">
+    <module name="Adyen_Payment" setup_version="2.4.1">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Quote"/>