Merge pull request #352 from Adyen/PW-835

PW-835 Move from details.shtml to skipDetails.shtml

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");