Merge branch 'develop'

Block/Adminhtml/System/Config/Field/Version.php

@@ -30,12 +30,9 @@ class Version extends \Magento\Config\Block\System\Config\Form\Field
 {
 
     /**
-     * Contains list of modules
-     *
-     * @var \Magento\Framework\Module\ModuleListInterface
+     * @var \Adyen\Payment\Helper\Data
      */
-    protected $_moduleList;
-
+    protected $_adyenHelper;
     /**
      * Version constructor.
      * @param \Magento\Framework\Module\ModuleListInterface $moduleList
@@ -43,12 +40,12 @@ class Version extends \Magento\Config\Block\System\Config\Form\Field
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\Module\ModuleListInterface $moduleList,
+        \Adyen\Payment\Helper\Data $adyenHelper,
         \Magento\Backend\Block\Template\Context $context,
         array $data = []
     ) {
         parent::__construct($context, $data);
-        $this->_moduleList = $moduleList;
+        $this->_adyenHelper = $adyenHelper;
     }
 
     /**
@@ -59,6 +56,6 @@ class Version extends \Magento\Config\Block\System\Config\Form\Field
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
-        return (string) $this->_moduleList->getOne("Adyen_Payment")['setup_version'];
+        return $this->_adyenHelper->getModuleVersion();
     }
 }
\ No newline at end of file

Block/Form/PayByMail.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Block\Form;
+
+class PayByMail extends \Magento\Payment\Block\Form
+{
+
+    /**
+     * @var string
+     */
+    protected $_template = 'Adyen_Payment::form/pay_by_mail.phtml';
+
+
+}
\ No newline at end of file

Block/Form/Sepa.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Block\Form;
+
+class Sepa extends \Magento\Payment\Block\Form
+{
+
+    /**
+     * @var string
+     */
+    protected $_template = 'Adyen_Payment::form/sepa.phtml';
+
+    /**
+     * @var \Adyen\Payment\Helper\Data
+     */
+    protected $_adyenHelper;
+
+    /**
+     * Sepa constructor.
+     *
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Payment\Model\Config $paymentConfig
+     * @param \Adyen\Payment\Helper\Data $adyenHelper
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Adyen\Payment\Helper\Data $adyenHelper,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->_adyenHelper = $adyenHelper;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCountries()
+    {
+        return $this->_adyenHelper->getSepaCountries();
+    }
+}
\ No newline at end of file

Block/Info/PayByMail.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Block\Info;
+
+class PayByMail extends AbstractInfo
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Adyen_Payment::info/adyen_pay_by_mail.phtml';
+
+}

Block/Info/Sepa.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Block\Info;
+
+class Sepa extends AbstractInfo
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Adyen_Payment::info/adyen_sepa.phtml';
+    
+}

Controller/Process/Json.php

@@ -75,6 +75,19 @@ class Json extends \Magento\Framework\App\Action\Action
      */
     public function execute()
     {
+
+        // if version is in the notification string show the module version
+        $response = $this->getRequest()->getParams();
+        if (isset($response['version'])) {
+
+            $this->getResponse()
+                ->clearHeader('Content-Type')
+                ->setHeader('Content-Type', 'text/html')
+                ->setBody($this->_adyenHelper->getModuleVersion());
+
+            return;
+        }
+
         try {
             $notificationItems = json_decode(file_get_contents('php://input'), true);
 

Helper/Data.php

@@ -41,6 +41,16 @@ class Data extends AbstractHelper
      */
     protected $_dataStorage;
 
+    /**
+     * @var \Magento\Directory\Model\Config\Source\Country
+     */
+    protected $_country;
+
+    /**
+     * @var \Magento\Framework\Module\ModuleListInterface
+     */
+    protected $_moduleList;
+
     /**
      * Data constructor.
      *
@@ -51,11 +61,15 @@ class Data extends AbstractHelper
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\Encryption\EncryptorInterface $encryptor,
-        \Magento\Framework\Config\DataInterface $dataStorage
+        \Magento\Framework\Config\DataInterface $dataStorage,
+        \Magento\Directory\Model\Config\Source\Country $country,
+        \Magento\Framework\Module\ModuleListInterface $moduleList
     ) {
         parent::__construct($context);
         $this->_encryptor = $encryptor;
         $this->_dataStorage = $dataStorage;
+        $this->_country = $country;
+        $this->_moduleList = $moduleList;
     }
 
     /**
@@ -350,6 +364,28 @@ class Data extends AbstractHelper
         return $this->getConfigData($field, 'adyen_pos', $storeId, true);
     }
 
+    /**
+     * @desc Gives back adyen_pay_by_mail configuration values
+     * @param $field
+     * @param null $storeId
+     * @return mixed
+     */
+    public function getAdyenPayByMailConfigData($field, $storeId = null)
+    {
+        return $this->getConfigData($field, 'adyen_pay_by_mail', $storeId);
+    }
+
+    /**
+     * @desc Gives back adyen_pay_by_mail configuration values as flag
+     * @param $field
+     * @param null $storeId
+     * @return mixed
+     */
+    public function getAdyenPayByMailConfigDataFlag($field, $storeId = null)
+    {
+        return $this->getConfigData($field, 'adyen_pay_by_mail', $storeId, true);
+    }
+
     /**
      * @desc Retrieve decrypted hmac key
      * @return string
@@ -367,6 +403,19 @@ class Data extends AbstractHelper
         return $secretWord;
     }
 
+    public function getHmacPayByMail()
+    {
+        switch ($this->isDemoMode()) {
+            case true:
+                $secretWord =  $this->_encryptor->decrypt(trim($this->getAdyenPayByMailConfigData('hmac_test')));
+                break;
+            default:
+                $secretWord = $this->_encryptor->decrypt(trim($this->getAdyenPayByMailConfigData('hmac_live')));
+                break;
+        }
+        return $secretWord;
+    }
+
     /**
      * @desc Check if configuration is set to demo mode
      * @return mixed
@@ -507,4 +556,33 @@ class Data extends AbstractHelper
             return $this->scopeConfig->isSetFlag($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId);
         }
     }
+
+
+    /**
+     * @return array
+     */
+    public function getSepaCountries()
+    {
+        $sepaCountriesAllowed = [
+            "AT", "BE", "BG", "CH", "CY", "CZ", "DE", "DK", "EE", "ES", "FI", "FR", "GB", "GF", "GI", "GP", "GR", "HR",
+            "HU", "IE", "IS", "IT", "LI", "LT", "LU", "LV", "MC", "MQ", "MT", "NL", "NO", "PL", "PT", "RE", "RO", "SE",
+            "SI", "SK"
+        ];
+
+        $countryList = $this->_country->toOptionArray();
+        $sepaCountries = [];
+
+        foreach ($countryList as $key => $country) {
+            $value = $country['value'];
+            if (in_array($value, $sepaCountriesAllowed)) {
+                $sepaCountries[$value] = $country['label'];
+            }
+        }
+        return $sepaCountries;
+    }
+
+    public function getModuleVersion()
+    {
+        return (string) $this->_moduleList->getOne("Adyen_Payment")['setup_version'];
+    }
 }
\ No newline at end of file

Model/AdyenCcConfigProvider.php

@@ -25,6 +25,7 @@ namespace Adyen\Payment\Model;
 
 use Magento\Payment\Model\CcGenericConfigProvider;
 use Magento\Payment\Helper\Data as PaymentHelper;
+use Magento\Framework\View\Asset\Source as Source;
 
 class AdyenCcConfigProvider extends CcGenericConfigProvider
 {
@@ -51,6 +52,11 @@ class AdyenCcConfigProvider extends CcGenericConfigProvider
      */
     protected $_genericConfig;
 
+    /**
+     * @var Source
+     */
+    protected $_assetSource;
+
     /**
      * AdyenCcConfigProvider constructor.
      *
@@ -58,17 +64,20 @@ class AdyenCcConfigProvider extends CcGenericConfigProvider
      * @param PaymentHelper $paymentHelper
      * @param \Adyen\Payment\Helper\Data $adyenHelper
      * @param AdyenGenericConfig $genericConfig
+     * @param Source $assetSource
      */
     public function __construct(
         \Magento\Payment\Model\CcConfig $ccConfig,
         PaymentHelper $paymentHelper,
         \Adyen\Payment\Helper\Data $adyenHelper,
-        \Adyen\Payment\Model\AdyenGenericConfig $genericConfig
+        \Adyen\Payment\Model\AdyenGenericConfig $genericConfig,
+        Source $assetSource
     ) {
         parent::__construct($ccConfig, $paymentHelper, $this->_methodCodes);
         $this->_paymentHelper = $paymentHelper;
         $this->_adyenHelper = $adyenHelper;
         $this->_genericConfig = $genericConfig;
+        $this->_assetSource = $assetSource;
     }
 
     /**
@@ -104,6 +113,10 @@ class AdyenCcConfigProvider extends CcGenericConfigProvider
         if ($this->_genericConfig->showLogos()) {
             $config['payment']['adyenCc']['creditCardPaymentMethodIcon'] = $this->_getCreditCardPaymentMethodIcon();
         }
+
+        $config['payment']['adyenCc']['icons'] = $this->getIcons();
+
+
         return $config;
     }
 
@@ -126,4 +139,53 @@ class AdyenCcConfigProvider extends CcGenericConfigProvider
         }
         return $icon;
     }
+
+    /**
+     * Retrieve availables credit card types
+     *
+     * @param string $methodCode
+     * @return array
+     */
+    protected function getCcAvailableTypes($methodCode)
+    {
+        $types = [];
+        $ccTypes = $this->_adyenHelper->getAdyenCcTypes();
+        $availableTypes = $this->methods[$methodCode]->getConfigData('cctypes');
+        if ($availableTypes) {
+            $availableTypes = explode(',', $availableTypes);
+            foreach (array_keys($ccTypes) as $code) {
+                if (in_array($code, $availableTypes)) {
+                    $types[$code] = $ccTypes[$code]['name'];
+                }
+            }
+        }
+
+        return $types;
+    }
+
+    /**
+     * Get icons for available payment methods
+     *
+     * @return array
+     */
+    protected function getIcons()
+    {
+        $icons = [];
+        $types = $this->_adyenHelper->getAdyenCcTypes();
+        foreach (array_keys($types) as $code) {
+            if (!array_key_exists($code, $icons)) {
+                $asset = $this->ccConfig->createAsset('Magento_Payment::images/cc/' . strtolower($code) . '.png');
+                $placeholder = $this->_assetSource->findRelativeSourceFilePath($asset);
+                if ($placeholder) {
+                    list($width, $height) = getimagesize($asset->getSourceFile());
+                    $icons[$code] = [
+                        'url' => $asset->getUrl(),
+                        'width' => $width,
+                        'height' => $height
+                    ];
+                }
+            }
+        }
+        return $icons;
+    }
 }
\ No newline at end of file

Model/AdyenHppConfigProvider.php

@@ -127,6 +127,8 @@ class AdyenHppConfigProvider implements ConfigProviderInterface
     }
 
     /**
+     * Set configuration for AdyenHPP payemnt method
+     *
      * @return array
      */
     public function getConfig()

Model/AdyenSepaConfigProvider.php

@@ -48,22 +48,22 @@ class AdyenSepaConfigProvider implements ConfigProviderInterface
     protected $_paymentHelper;
 
     /**
-     * @var \Magento\Directory\Model\Config\Source\Country
+     * @var \Adyen\Payment\Helper\Data
      */
-    protected $_country;
+    protected $_adyenHelper;
 
     /**
      * AdyenSepaConfigProvider constructor.
      *
      * @param PaymentHelper $paymentHelper
-     * @param \Magento\Directory\Model\Config\Source\Country $country
+     * @param \Adyen\Payment\Helper\Data $adyenHelper
      */
     public function __construct(
         PaymentHelper $paymentHelper,
-        \Magento\Directory\Model\Config\Source\Country $country
+        \Adyen\Payment\Helper\Data $adyenHelper
     ) {
         $this->_paymentHelper = $paymentHelper;
-        $this->_country = $country;
+        $this->_adyenHelper = $adyenHelper;
 
         foreach ($this->_methodCodes as $code) {
             $this->_methods[$code] = $this->_paymentHelper->getMethodInstance($code);
@@ -78,34 +78,10 @@ class AdyenSepaConfigProvider implements ConfigProviderInterface
         $config = [
             'payment' => [
                 'adyenSepa' => [
-                    'countries' => $this->getCountries()
+                    'countries' => $this->_adyenHelper->getSepaCountries()
                 ]
             ]
         ];
-
         return $config;
     }
-
-    /**
-     * @return array
-     */
-    public function getCountries()
-    {
-        $sepaCountriesAllowed = [
-            "AT", "BE", "BG", "CH", "CY", "CZ", "DE", "DK", "EE", "ES", "FI", "FR", "GB", "GF", "GI", "GP", "GR", "HR",
-            "HU", "IE", "IS", "IT", "LI", "LT", "LU", "LV", "MC", "MQ", "MT", "NL", "NO", "PL", "PT", "RE", "RO", "SE",
-            "SI", "SK"
-        ];
-
-        $countryList = $this->_country->toOptionArray();
-        $sepaCountries = [];
-
-        foreach ($countryList as $key => $country) {
-            $value = $country['value'];
-            if (in_array($value, $sepaCountriesAllowed)) {
-                $sepaCountries[$value] = $country['label'];
-            }
-        }
-        return $sepaCountries;
-    }
 }
\ No newline at end of file

Model/Config/Source/CcType.php

@@ -29,6 +29,26 @@ namespace Adyen\Payment\Model\Config\Source;
  */
 class CcType extends \Magento\Payment\Model\Source\Cctype
 {
+
+    /**
+     * @var \Adyen\Payment\Helper\Data
+     */
+    private $_adyenHelper;
+
+    /**
+     * CcType constructor.
+     *
+     * @param \Magento\Payment\Model\Config $paymentConfig
+     * @param \Adyen\Payment\Helper\Data $adyenHelper
+     */
+    public function __construct(
+        \Magento\Payment\Model\Config $paymentConfig,
+        \Adyen\Payment\Helper\Data $adyenHelper
+    ) {
+        parent::__construct($paymentConfig);
+        $this->_adyenHelper = $adyenHelper;
+    }
+
     /**
      * Allowed credit card types
      *
@@ -36,6 +56,26 @@ class CcType extends \Magento\Payment\Model\Source\Cctype
      */
     public function getAllowedTypes()
     {
-        return ['VI', 'MC', 'AE', 'DI', 'JCB', 'OT'];
+        return ['VI', 'MC', 'AE', 'DI', 'JCB', 'UN', 'OT', 'MI'];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toOptionArray()
+    {
+        /**
+         * making filter by allowed cards
+         */
+        $allowed = $this->getAllowedTypes();
+        $options = [];
+
+        foreach ($this->_adyenHelper->getAdyenCcTypes() as $code => $name) {
+            if (in_array($code, $allowed) || !count($allowed)) {
+                $options[] = ['value' => $code, 'label' => $name['name']];
+            }
+        }
+
+        return $options;
     }
 }

Model/Cron.php

@@ -810,12 +810,12 @@ class Cron
                                 '(listRecurringCall did not contain contract)'
                             );
                             $this->_adyenLogger->addAdyenNotificationCronjob(
-                                printf('recurringDetailReference in notification is %1', $recurringDetailReference)
+                                sprintf('recurringDetailReference in notification is %1', $recurringDetailReference)
                             );
                             $this->_adyenLogger->addAdyenNotificationCronjob(
-                                printf('CustomerReference is: %1 and storeId is %2', $customerReference, $storeId)
+                                sprintf('CustomerReference is: %1 and storeId is %2', $customerReference, $storeId)
                             );
-                            $this->_adyenLogger->addAdyenNotificationCronjob($listRecurringContracts);
+                            $this->_adyenLogger->addAdyenNotificationCronjob(print_r($listRecurringContracts, 1));
                             $message = __(
                                 'Failed to create billing agreement for this order ' .
                                 '(listRecurringCall did not contain contract)'
@@ -855,8 +855,12 @@ class Cron
             if ($order->canCreditmemo()) {
 
                 // there is a bug in this function of Magento see #2656 magento\magento2 repo
-                // $amount = $this->_adyenHelper->originalAmount($this->_value, $currency);
-                // $order->getPayment()->registerRefundNotification($amount);
+                // Invalid method Magento\Sales\Model\Order\Creditmemo::register
+                /*
+                $currency = $this->_order->getOrderCurrencyCode();
+                $amount = $this->_adyenHelper->originalAmount($this->_value, $currency);
+                $order->getPayment()->registerRefundNotification($amount);
+                */
 
                 $this->_adyenLogger->addAdyenNotificationCronjob('Please create your credit memo inside magentos');
             } else {

Model/Method/Hpp.php

@@ -47,6 +47,9 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
      */
     const GUEST_ID = 'customer_';
 
+    /**
+     * @var string
+     */
     protected $_infoBlockType = 'Adyen\Payment\Block\Info\Hpp';
 
     /**
@@ -106,11 +109,10 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
      */
     protected $_adyenHelper;
 
-
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
-    protected $storeManager;
+    protected $_storeManager;
 
     /**
      * @var \Magento\Framework\UrlInterface
@@ -120,7 +122,7 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
     /**
      * @var ResolverInterface
      */
-    protected $resolver;
+    protected $_resolver;
 
     /**
      * @var \Adyen\Payment\Logger\AdyenLogger
@@ -181,8 +183,8 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
         $this->_paymentRequest = $paymentRequest;
         $this->_urlBuilder = $urlBuilder;
         $this->_adyenHelper = $adyenHelper;
-        $this->storeManager = $storeManager;
-        $this->resolver = $resolver;
+        $this->_storeManager = $storeManager;
+        $this->_resolver = $resolver;
         $this->_adyenLogger = $adyenLogger;
         $this->_request = $request;
     }
@@ -336,7 +338,7 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
         $browserInfo       = $_SERVER['HTTP_USER_AGENT'];
         $deliveryDays      = $this->getConfigData('delivery_days');
         $shopperLocale     = trim($this->getConfigData('shopper_locale'));
-        $shopperLocale     = (!empty($shopperLocale)) ? $shopperLocale : $this->resolver->getLocale();
+        $shopperLocale     = (!empty($shopperLocale)) ? $shopperLocale : $this->_resolver->getLocale();
         $countryCode       = trim($this->getConfigData('country_code'));
         $countryCode       = (!empty($countryCode)) ? $countryCode : false;
 
@@ -368,18 +370,25 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
         $formFields['shopperEmail']      = $shopperEmail;
         // recurring
         $recurringType                   = trim($this->_adyenHelper->getAdyenAbstractConfigData('recurring_type'));
+        $brandCode                       = $order->getPayment()->getAdditionalInformation("brand_code");
+
+        // Paypal does not allow ONECLICK,RECURRING only RECURRING
+        if ($brandCode == "paypal" && $recurringType == 'ONECLICK,RECURRING') {
+            $recurringType = "RECURRING";
+        }
+
         $formFields['recurringContract'] = $recurringType;
         $formFields['shopperReference']  = (!empty($customerId)) ? $customerId : self::GUEST_ID . $realOrderId;
         //blocked methods
         $formFields['blockedMethods']    = "";
 
-        $baseUrl = $this->storeManager->getStore($this->getStore())
+        $baseUrl = $this->_storeManager->getStore($this->getStore())
             ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_LINK);
 
         $formFields['resURL']            = $baseUrl . 'adyen/process/result';
         $hmacKey                         = $this->_adyenHelper->getHmac();
 
-        $brandCode = $order->getPayment()->getAdditionalInformation("brand_code");
+
         if ($brandCode) {
             $formFields['brandCode']     = $brandCode;
         }

Model/Method/PayByMail.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Model\Method;
+
+/**
+ * Class Sepa
+ * @package Adyen\Payment\Model\Method
+ */
+class PayByMail extends \Magento\Payment\Model\Method\AbstractMethod
+{
+
+    const METHOD_CODE = 'adyen_pay_by_mail';
+
+    /**
+     * @var string
+     */
+    protected $_formBlockType = 'Adyen\Payment\Block\Form\PayByMail';
+
+    /**
+     * @var string
+     */
+    protected $_infoBlockType = 'Adyen\Payment\Block\Info\PayByMail';
+
+    /**
+     * @var GUEST_ID , used when order is placed by guests
+     */
+    const GUEST_ID = 'customer_';
+
+    /**
+     * @var string
+     */
+    protected $_code = self::METHOD_CODE;
+
+    /**
+     * @var \Adyen\Payment\Logger\AdyenLogger
+     */
+    protected $_adyenLogger;
+
+    /**
+     * @var \Adyen\Payment\Helper\Data
+     */
+    protected $_adyenHelper;
+
+    /**
+     * @var ResolverInterface
+     */
+    protected $_resolver;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $_storeManager;
+
+    /**
+     * Payment Method feature
+     *
+     * @var bool
+     */
+    protected $_canAuthorize = true;
+
+    /**
+     * @var bool
+     */
+    protected $_canCapture = true;
+
+    /**
+     * @var bool
+     */
+    protected $_canCapturePartial = true;
+
+    /**
+     * @var bool
+     */
+    protected $_canCaptureOnce = true;
+
+    /**
+     * @var bool
+     */
+    protected $_canRefund = true;
+
+    /**
+     * @var bool
+     */
+    protected $_canRefundInvoicePartial = true;
+
+    /**
+     * @var bool
+     */
+    protected $_isGateway = true;
+
+    /**
+     * @var bool
+     */
+    protected $_canUseInternal = true;
+
+    /**
+     * PayByMail constructor.
+     *
+     * @param \Magento\Framework\Model\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
+     * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
+     * @param \Magento\Payment\Helper\Data $paymentData
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Payment\Model\Method\Logger $logger
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
+     * @param array $data
+     */
+    public function __construct(
+        \Adyen\Payment\Logger\AdyenLogger $adyenLogger,
+        \Adyen\Payment\Helper\Data $adyenHelper,
+        \Magento\Framework\Locale\ResolverInterface $resolver,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Model\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory,
+        \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory,
+        \Magento\Payment\Helper\Data $paymentData,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Payment\Model\Method\Logger $logger,
+        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        array $data = []
+    ) {
+        parent::__construct(
+            $context,
+            $registry,
+            $extensionFactory,
+            $customAttributeFactory,
+            $paymentData,
+            $scopeConfig,
+            $logger,
+            $resource,
+            $resourceCollection,
+            $data
+        );
+
+        $this->_adyenLogger = $adyenLogger;
+        $this->_adyenHelper = $adyenHelper;
+        $this->_resolver = $resolver;
+        $this->_storeManager = $storeManager;
+    }
+
+    /**
+     * @param \Magento\Payment\Model\InfoInterface $payment
+     * @param float $amount
+     * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
+    {
+        if (!$this->canAuthorize()) {
+            throw new \Magento\Framework\Exception\LocalizedException(__('The authorize action is not available.'));
+        }
+
+        // do not let magento set status to processing
+        $payment->setLastTransId($this->getTransactionId())->setIsTransactionPending(true);
+
+        $fields = $this->getFormFields();
+
+        $url = $this->getFormUrl();
+
+        $count = 0;
+        $size = count($fields);
+        foreach ($fields as $field => $value) {
+
+            if ($count == 0) {
+                $url .= "?";
+            }
+            $url .= urlencode($field) . "=" . urlencode($value);
+
+            if ($count != $size) {
+                $url .= "&";
+            }
+
+            ++$count;
+        }
+
+        $payment->setAdditionalInformation('payment_url', $url);
+        return $this;
+    }
+
+    /**
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getFormFields()
+    {
+
+        $paymentInfo = $this->getInfoInstance();
+        $order = $paymentInfo->getOrder();
+
+        $realOrderId       = $order->getRealOrderId();
+        $orderCurrencyCode = $order->getOrderCurrencyCode();
+
+        // check if paybymail has it's own skin
+        $skinCode          = trim($this->getConfigData('skin_code'));
+        if ($skinCode == "") {
+            // use HPP skin and HMAC
+            $skinCode = $this->_adyenHelper->getAdyenHppConfigData('skin_code');
+            $hmacKey           = $this->_adyenHelper->getHmac();
+        } else {
+            // use pay_by_mail skin and hmac
+            $hmacKey = $this->_adyenHelper->getHmacPayByMail();
+        }
+
+        $amount            = $this->_adyenHelper->formatAmount($order->getGrandTotal(), $orderCurrencyCode);
+        $merchantAccount   = trim($this->_adyenHelper->getAdyenAbstractConfigData('merchant_account'));
+        $shopperEmail      = $order->getCustomerEmail();
+        $customerId        = $order->getCustomerId();
+        $shopperLocale     = trim($this->getConfigData('shopper_locale'));
+        $shopperLocale     = (!empty($shopperLocale)) ? $shopperLocale : $this->_resolver->getLocale();
+        $countryCode       = trim($this->getConfigData('country_code'));
+        $countryCode       = (!empty($countryCode)) ? $countryCode : false;
+
+        // if directory lookup is enabled use the billingadress as countrycode
+        if ($countryCode == false) {
+            if (is_object($order->getBillingAddress()) && $order->getBillingAddress()->getCountry() != "") {
+                $countryCode = $order->getBillingAddress()->getCountry();
+            }
+        }
+
+        $deliveryDays                   = $this->_adyenHelper->getAdyenHppConfigData('delivery_days');
+        $deliveryDays                   = (!empty($deliveryDays)) ? $deliveryDays : 5;
+
+        $formFields = [];
+        $formFields['merchantAccount']   = $merchantAccount;
+        $formFields['merchantReference'] = $realOrderId;
+        $formFields['paymentAmount']     = (int)$amount;
+        $formFields['currencyCode']      = $orderCurrencyCode;
+        $formFields['shipBeforeDate']    = date(
+            "Y-m-d",
+            mktime(date("H"), date("i"), date("s"), date("m"), date("j") + $deliveryDays, date("Y"))
+        );
+        $formFields['skinCode']          = $skinCode;
+        $formFields['shopperLocale']     = $shopperLocale;
+        $formFields['countryCode']       = $countryCode;
+        $formFields['sessionValidity']   = date(
+            DATE_ATOM,
+            mktime(date("H") + 1, date("i"), date("s"), date("m"), date("j"), date("Y"))
+        );
+        $formFields['shopperEmail']      = $shopperEmail;
+        // recurring
+        $recurringType                   = trim($this->_adyenHelper->getAdyenAbstractConfigData('recurring_type'));
+
+        $formFields['recurringContract'] = $recurringType;
+
+
+        $sessionValidity = $this->_adyenHelper->getAdyenPayByMailConfigData('session_validity');
+
+        if ($sessionValidity == "") {
+            $sessionValidity = 3;
+        }
+
+        $formFields['sessionValidity']   = date(
+            DATE_ATOM,
+            mktime(date("H") + 1, date("i"), date("s"), date("m"), date("j"), date("Y"))
+        );
+
+        $adyFields['sessionValidity'] = date("c", strtotime("+". $sessionValidity. " days"));
+        $formFields['shopperReference']  = (!empty($customerId)) ? $customerId : self::GUEST_ID . $realOrderId;
+
+        // Sort the array by key using SORT_STRING order
+        ksort($formFields, SORT_STRING);
+
+        // Generate the signing data string
+        $signData = implode(":", array_map([$this, 'escapeString'],
+            array_merge(array_keys($formFields), array_values($formFields))));
+
+        $merchantSig = base64_encode(hash_hmac('sha256', $signData, pack("H*", $hmacKey), true));
+
+        $formFields['merchantSig']      = $merchantSig;
+
+        $this->_adyenLogger->debug(print_r($formFields, true));
+
+        return $formFields;
+    }
+
+    /**
+     * The character escape function is called from the array_map function in _signRequestParams
+     *
+     * @param $val
+     * @return mixed
+     */
+    protected function escapeString($val)
+    {
+        return str_replace(':', '\\:', str_replace('\\', '\\\\', $val));
+    }
+
+    /**
+     * @return string
+     */
+    public function getFormUrl()
+    {
+        if ($this->_adyenHelper->isDemoMode()) {
+            $url = 'https://test.adyen.com/hpp/pay.shtml';
+        } else {
+            $url = 'https://live.adyen.com/hpp/pay.shtml';
+        }
+        return $url;
+    }
+}
\ No newline at end of file

Model/Method/Pos.php

@@ -47,6 +47,9 @@ class Pos extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
      */
     const GUEST_ID = 'customer_';
 
+    /**
+     * @var string
+     */
     protected $_infoBlockType = 'Adyen\Payment\Block\Info\Pos';
 
     /**

Model/Method/Sepa.php

@@ -37,6 +37,16 @@ class Sepa extends \Magento\Payment\Model\Method\AbstractMethod
      */
     protected $_code = self::METHOD_CODE;
 
+    /**
+     * @var string
+     */
+    protected $_formBlockType = 'Adyen\Payment\Block\Form\Sepa';
+
+    /**
+     * @var string
+     */
+    protected $_infoBlockType = 'Adyen\Payment\Block\Info\Sepa';
+
     /**
      * @var \Adyen\Payment\Model\Api\PaymentRequest
      */
@@ -186,14 +196,13 @@ class Sepa extends \Magento\Payment\Model\Method\AbstractMethod
     }
 
     /**
-     * Validate IBAN
-     *
      * @param $iban
      * @return bool
      */
-    public function validateIban($iban)
-    {
+    public function validateIban($iban) {
+
         $iban = strtolower(str_replace(' ', '', $iban));
+
         $countries =    ['al'=>28,'ad'=>24,'at'=>20,'az'=>28,'bh'=>22,'be'=>16,'ba'=>20,'br'=>29,'bg'=>22,'cr'=>21,
             'hr'=>21,'cy'=>28,'cz'=>24,'dk'=>18,'do'=>28,'ee'=>20,'fo'=>18,'fi'=>18,'fr'=>27,'ge'=>22,
             'de'=>22,'gi'=>23,'gr'=>27,'gl'=>18,'gt'=>28,'hu'=>28,'is'=>26,'ie'=>22,'il'=>23,'it'=>27,
@@ -206,14 +215,17 @@ class Sepa extends \Magento\Payment\Model\Method\AbstractMethod
             'm'=>22,'n'=>23,'o'=>24,'p'=>25,'q'=>26,'r'=>27,'s'=>28,'t'=>29,'u'=>30,'v'=>31,'w'=>32,'x'=>33,
             'y'=>34,'z'=>35];
 
-        if (isset($countries[substr($iban, 0, 2)]) && strlen($iban) == $countries[substr($iban, 0, 2)]) {
+
+        if (isset($countries[substr($iban, 0, 2)]) &&
+            strlen($iban) == $countries[substr($iban, 0, 2)]) {
+
             $movedChar = substr($iban, 4).substr($iban, 0, 4);
             $movedCharArray = str_split($movedChar);
             $newString = "";
 
-            foreach ($movedChar AS $key => $value) {
+            foreach ($movedCharArray AS $key => $value) {
                 if (!is_numeric($movedCharArray[$key])) {
-                    $movedChar[$key] = $chars[$movedChar[$key]];
+                    $movedCharArray[$key] = $chars[$movedCharArray[$key]];
                 }
                 $newString .= $movedCharArray[$key];
             }

composer.json

@@ -22,7 +22,6 @@
     "magento/module-theme": "100.0.*",
     "magento/module-paypal": "100.0.*",
     "magento/framework": "100.0.*",
-    "magento/magento-composer-installer": "*",
     "adyen/php-api-library": "*"
   },
   "autoload": {

etc/adminhtml/system.xml

@@ -42,6 +42,7 @@
                 <include path="Adyen_Payment::system/adyen_hpp.xml"/>
                 <include path="Adyen_Payment::system/adyen_sepa.xml"/>
                 <include path="Adyen_Payment::system/adyen_pos.xml"/>
+                <include path="Adyen_Payment::system/adyen_pay_by_mail.xml"/>
             </group>
             <group id="test" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Test</label>

etc/adminhtml/system/adyen_pay_by_mail.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="adyen_pay_by_mail" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label><![CDATA[Pay by Mail integration]]></label>
+        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
+        <fieldset_css>adyen-method-adyen-cc</fieldset_css>
+        <comment>Process Pay By Mail transactions</comment>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Enabled</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/adyen_pay_by_mail/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Title</label>
+            <config_path>payment/adyen_pay_by_mail/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Sort Order</label>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/adyen_pay_by_mail/sort_order</config_path>
+        </field>
+        <field id="session_validity" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Session Validity</label>
+            <tooltip>How many days do you want this payment page to be active</tooltip>
+            <config_path>payment/adyen_pay_by_mail/session_validity</config_path>
+        </field>
+        <field id="skin_code" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Skin Code</label>
+            <tooltip>The skin code you want to use leave this empty if you want to use the same as Adyen HPP settings</tooltip>
+            <config_path>payment/adyen_pay_by_mail/skin_code</config_path>
+        </field>
+        <field id="hmac_test" translate="label" type="obscure" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>HMAC Key for Test</label>
+            <tooltip>Should match with the HMAC test key in the Adyen Customer Area. Fill this in if you are using a different skin then defined in Adyen HPP</tooltip>
+            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+            <config_path>payment/adyen_pay_by_mail/hmac_test</config_path>
+        </field>
+        <field id="hmac_live" translate="label" type="obscure" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>HMAC Key for Live</label>
+            <tooltip>Should match with the HMAC live key in the Adyen Customer Area. Fill this in if you are using a different skin then defined in Adyen HPP</tooltip>
+            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+            <config_path>payment/adyen_pay_by_mail/hmac_live</config_path>
+        </field>
+        <group id="adyen_pay_by_mail_country_specific" translate="label" showInDefault="1" showInWebsite="1" sortOrder="210">
+            <label>Country Specific Settings</label>
+            <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+            <field id="allowspecific" translate="label" type="allowspecific" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
+                <label>Payment from Applicable Countries</label>
+                <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+                <config_path>payment/adyen_pay_by_mail/allowspecific</config_path>
+            </field>
+            <field id="specificcountry" translate="label" type="multiselect" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
+                <label>Payment from Specific Countries</label>
+                <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                <can_be_empty>1</can_be_empty>
+                <config_path>payment/adyen_pay_by_mail/specificcountry</config_path>
+            </field>
+        </group>
+    </group>
+</include>
\ No newline at end of file

etc/adyen_payment.xml

@@ -53,5 +53,13 @@
             <label>Diners</label>
             <code_alt>diners</code_alt>
         </type>
+        <type id="MI" order="70">
+            <label>Maestro</label>
+            <code_alt>maestro</code_alt>
+        </type>
+        <type id="UN" order="80">
+            <label>UnionPay</label>
+            <code_alt>unionpay</code_alt>
+        </type>
     </adyen_credit_cards>
 </payment>

etc/config.xml

@@ -96,6 +96,17 @@
                 <payment_action>order</payment_action>
                 <group>adyen</group>
             </adyen_pos>
+            <adyen_pay_by_mail>
+                <active>0</active>
+                <model>Adyen\Payment\Model\Method\PayByMail</model>
+                <order_status>pending</order_status>
+                <title>Adyen PayByMail</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>6</sort_order>
+                <session_validity>3</session_validity>
+                <payment_action>authorize</payment_action>
+                <group>adyen</group>
+            </adyen_pay_by_mail>
         </payment>
     </default>
 </config>

etc/payment.xml

@@ -34,7 +34,7 @@
             <allow_multiple_address>1</allow_multiple_address>
         </method>
         <method name="adyen_hpp">
-            <allow_multiple_address>1</allow_multiple_address>
+            <allow_multiple_address>0</allow_multiple_address>
         </method>
     </methods>
 </payment>

view/adminhtml/templates/form/pay_by_mail.phtml

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+// @codingStandardsIgnoreFile
+
+$code = $block->escapeHtml($block->getMethodCode());
+?>
+
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @noEscape */ echo $code; ?>"
+          style="display:none">
+
+</fieldset>
\ No newline at end of file

view/adminhtml/templates/form/sepa.phtml

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+// @codingStandardsIgnoreFile
+/**
+ * @var \Magento\Payment\Block\Adminhtml\Transparent\Form $block
+ */
+$code = $block->escapeHtml($block->getMethodCode());
+$currentCountry = $block->getInfoData('country');
+?>
+
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @noEscape */ echo $code; ?>"
+          style="display:none">
+
+
+    <div class="field admin__field _required">
+        <label class="admin__field-label" for="<?php /* @noEscape */ echo $code; ?>_account_name">
+            <span><?php echo $block->escapeHtml(__('Bank account holder name')); ?></span>
+        </label>
+        <div class="admin__field-control">
+            <input type="text"
+                   id="<?php /* @noEscape */ echo $code; ?>_account_name"
+                   name="payment[account_name]"
+                   title="<?php echo $block->escapeHtml(__('Bank account holder name')); ?>" class="admin__control-text"
+                   value="<?php /* @noEscape */ echo $block->getInfoData('holder_name'); ?>"/>
+        </div>
+    </div>
+
+    <div class="field admin__field _required">
+        <label class="admin__field-label" for="<?php /* @noEscape */ echo $code; ?>_iban">
+            <span><?php echo $block->escapeHtml(__('IBAN')); ?></span>
+        </label>
+        <div class="admin__field-control">
+            <input type="text"
+                   id="<?php /* @noEscape */ echo $code; ?>_account_name"
+                   name="payment[iban]"
+                   title="<?php echo $block->escapeHtml(__('IBAN')); ?>" class="admin__control-text"
+                   value="<?php /* @noEscape */ echo $block->getInfoData('iban'); ?>"/>
+        </div>
+    </div>
+
+    <div class="field-type admin__field _required">
+        <label class="admin__field-label" for="<?php /* @noEscape */ echo $code; ?>_cc_type">
+            <span><?php echo $block->escapeHtml(__('country')); ?></span>
+        </label>
+        <div class="admin__field-control">
+            <select id="<?php /* @noEscape */ echo $code; ?>_cc_type" name="payment[country]"
+                    class="required-entry admin__control-select">
+                <option value=""></option>
+                <?php foreach ($block->getCountries() as $countryCode => $countryName): ?>
+                    <option value="<?php echo $block->escapeHtml($countryCode); ?>" <?php if ($countryCode == $currentCountry): ?>selected="selected"<?php endif ?>>
+                        <?php echo $block->escapeHtml($countryName); ?>
+                    </option>
+                <?php endforeach ?>
+            </select>
+        </div>
+    </div>
+
+    <div class="field-type admin__field _required">
+
+        <div class="admin__field-control">
+            <input id="<?php /* @noEscape */ echo $code; ?>_accept_sepa"
+                   name="payment[accept_sepa]"
+                   type="checkbox"
+                   title="<?php echo $block->escapeHtml(__('I agree that the above amount will be debited from my bank account.')); ?>"
+                   class=""
+                   value="<?php /* @noEscape */ echo $block->getInfoData('accept_sepa'); ?>"/>
+            <label class="admin__field-label" for="<?php /* @noEscape */ echo $code; ?>_accept_sepa">
+                <span><?php echo $block->escapeHtml(__('I agree that the above amount will be debited from my bank account.')); ?></span>
+            </label>
+        </div>
+    </div>
+
+
+</fieldset>

view/adminhtml/templates/info/adyen_cc.phtml

@@ -29,8 +29,9 @@
  * @see \Magento\Payment\Block\Info
  */
 ?>
-<?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?>
-
+<div>
+    <?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?>
+</div>
 <?php
 $_info = $this->getInfo();
 $_isDemoMode = $block->isDemoMode();
@@ -46,7 +47,9 @@ $_isDemoMode = $block->isDemoMode();
 <?php endif;?>
 
 <?php if($block->getCcTypeName() != ""):?>
+    <div>
         <?php echo __('Credit Card Type: %1', $block->getCcTypeName()) ?><br/>
+    </div>
 <?php endif; ?>
 <?php if($_info->getCcLast4() != ""):?>
     <?php echo __('Credit Card Number: xxxx-%1', $this->getInfo()->getCcLast4()) ?><br/>

view/adminhtml/templates/info/adyen_pay_by_mail.phtml

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+// @codingStandardsIgnoreFile
+
+?>
+<?php
+/**
+ * @see \Magento\Payment\Block\Info
+ */
+?>
+<?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?>
+
+<?php
+$_info = $this->getInfo();
+$_isDemoMode = $block->isDemoMode();
+?>
+
+<div>
+    <a target="_blank" href="<?php echo $_info->getAdditionalInformation('payment_url'); ?>">Payment Link</a><br />
+</div>
+
+<?php if ($_pspReference = $_info->getAdditionalInformation('pspReference')):?>
+    <div>
+        <?php if($_isDemoMode): ?>
+            <?php echo __('Adyen PSP Reference: <a href="https://ca-test.adyen.com/ca/ca/accounts/showTx.shtml?pspReference=%1&txType=Payment" target="__blank">%1</a>', $block->escapeHtml($_pspReference), $block->escapeHtml($_pspReference)) ?>
+        <?php else: ?>
+            <?php echo __('Adyen PSP Reference: <a href="https://ca-live.adyen.com/ca/ca/accounts/showTx.shtml?pspReference=%1&txType=Payment" target="__blank">%1</a>', $block->escapeHtml($_pspReference), $block->escapeHtml($_pspReference)) ?>
+        <?php endif; ?>
+    </div>
+<?php endif;?>
+
+<?php if ($_brandCode = $_info->getAdditionalInformation('brand_code')):?>
+    <div><?php echo __('Payment Method: %1', $_brandCode); ?>
+    </div>
+<?php endif;?>
+
+<?php if($_info->getAdditionalInformation('adyen_total_fraud_score') != ""): ?>
+    <?php echo __('Total fraud score: %1', $_info->getAdditionalInformation('adyen_total_fraud_score')) ?><br/>
+<?php endif; ?>
+
+<?php if ($_specificInfo = $block->getSpecificInformation()):?>
+    <table class="data-table admin__table-secondary">
+        <?php foreach ($_specificInfo as $_label => $_value):?>
+            <tr>
+                <th><?php echo $block->escapeHtml($_label)?>:</th>
+                <td><?php echo nl2br(implode("\n", $block->getValueAsArray($_value, true)))?></td>
+            </tr>
+        <?php endforeach; ?>
+    </table>
+<?php endif;?>
+
+<?php echo $block->getChildHtml()?>
\ No newline at end of file

view/adminhtml/templates/info/adyen_pos.phtml

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+// @codingStandardsIgnoreFile
+
+?>
+<?php
+/**
+ * @see \Magento\Payment\Block\Info
+ */
+?>
+<?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?>
+
+<?php
+$_info = $this->getInfo();
+$_isDemoMode = $block->isDemoMode();
+?>
+<?php if ($_pspReference = $_info->getAdditionalInformation('pspReference')):?>
+    <div>
+        <?php if($_isDemoMode): ?>
+            <?php echo __('Adyen PSP Reference: <a href="https://ca-test.adyen.com/ca/ca/accounts/showTx.shtml?pspReference=%1&txType=Payment" target="__blank">%1</a>', $block->escapeHtml($_pspReference), $block->escapeHtml($_pspReference)) ?>
+        <?php else: ?>
+            <?php echo __('Adyen PSP Reference: <a href="https://ca-live.adyen.com/ca/ca/accounts/showTx.shtml?pspReference=%1&txType=Payment" target="__blank">%1</a>', $block->escapeHtml($_pspReference), $block->escapeHtml($_pspReference)) ?>
+        <?php endif; ?>
+    </div>
+<?php endif;?>
+
+<?php if($_info->getAdditionalInformation('adyen_total_fraud_score') != ""): ?>
+    <?php echo __('Total fraud score: %1', $_info->getAdditionalInformation('adyen_total_fraud_score')) ?><br/>
+<?php endif; ?>
+
+<?php if ($_specificInfo = $block->getSpecificInformation()):?>
+    <table class="data-table admin__table-secondary">
+        <?php foreach ($_specificInfo as $_label => $_value):?>
+            <tr>
+                <th><?php echo $block->escapeHtml($_label)?>:</th>
+                <td><?php echo nl2br(implode("\n", $block->getValueAsArray($_value, true)))?></td>
+            </tr>
+        <?php endforeach; ?>
+    </table>
+<?php endif;?>
+
+<?php echo $block->getChildHtml()?>

view/adminhtml/templates/info/adyen_sepa.phtml

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+// @codingStandardsIgnoreFile
+
+?>
+<?php
+/**
+ * @see \Magento\Payment\Block\Info
+ */
+?>
+<?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?>
+
+<?php
+$_info = $this->getInfo();
+$_isDemoMode = $block->isDemoMode();
+?>
+
+<?php if ($_pspReference = $_info->getAdditionalInformation('pspReference')):?>
+    <div>
+        <?php if($_isDemoMode): ?>
+            <?php echo __('Adyen PSP Reference: <a href="https://ca-test.adyen.com/ca/ca/accounts/showTx.shtml?pspReference=%1&txType=Payment" target="__blank">%1</a>', $block->escapeHtml($_pspReference), $block->escapeHtml($_pspReference)) ?>
+        <?php else: ?>
+            <?php echo __('Adyen PSP Reference: <a href="https://ca-live.adyen.com/ca/ca/accounts/showTx.shtml?pspReference=%1&txType=Payment" target="__blank">%1</a>', $block->escapeHtml($_pspReference), $block->escapeHtml($_pspReference)) ?>
+        <?php endif; ?>
+    </div>
+<?php endif;?>
+
+<?php if ($_brandCode = $_info->getAdditionalInformation('brand_code')):?>
+    <div><?php echo __('Payment Method: %1', $_brandCode); ?>
+    </div>
+<?php endif;?>
+
+<?php if($_info->getAdditionalInformation('adyen_total_fraud_score') != ""): ?>
+    <?php echo __('Total fraud score: %1', $_info->getAdditionalInformation('adyen_total_fraud_score')) ?><br/>
+<?php endif; ?>
+
+<?php if ($_specificInfo = $block->getSpecificInformation()):?>
+    <table class="data-table admin__table-secondary">
+        <?php foreach ($_specificInfo as $_label => $_value):?>
+            <tr>
+                <th><?php echo $block->escapeHtml($_label)?>:</th>
+                <td><?php echo nl2br(implode("\n", $block->getValueAsArray($_value, true)))?></td>
+            </tr>
+        <?php endforeach; ?>
+    </table>
+<?php endif;?>
+
+<?php echo $block->getChildHtml()?>
\ No newline at end of file

view/frontend/templates/info/adyen_pay_by_mail.phtml

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+// @codingStandardsIgnoreFile
+
+?>
+<?php
+$_info = $this->getInfo();
+?>
+
+<dl class="payment-method adyen_pos">
+    <dt class="title"><?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
+    <dt><a target="_blank" href="<?php echo $this->getMethod()->getInfoInstance()->getAdditionalInformation('payment_url'); ?>"><?php echo __("Click here to pay for your purchase"); ?></a></dt>
+</dl>

view/frontend/templates/info/adyen_sepa.phtml

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+// @codingStandardsIgnoreFile
+
+?>
+<?php
+$_info = $this->getInfo();
+?>
+
+<dl class="payment-method adyen_sepa">
+    <?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?><br/>
+    <dt class="title"><?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
+</dl>

view/frontend/web/js/view/payment/method-renderer/adyen-cc-method.js

@@ -29,7 +29,7 @@ define(
         'Adyen_Payment/js/action/place-order',
         'mage/translate',
         'Magento_Checkout/js/model/payment/additional-validators',
-        'adyen/encrypt',
+        'adyen/encrypt'
     ],
     function (_, $, Component, placeOrderAction, $t, additionalValidators, adyenEncrypt) {
 
@@ -165,7 +165,12 @@ define(
             },
             showLogo: function() {
                 return window.checkoutConfig.payment.adyen.showLogo;
-            }
+            },
+            getIcons: function (type) {
+                return window.checkoutConfig.payment.adyenCc.icons.hasOwnProperty(type)
+                    ? window.checkoutConfig.payment.adyenCc.icons[type]
+                    : false
+            },
         });
     }
 );