[PW-1819]: Copy and design changes to config UI (#659)

* [PW-1819]: Copy and design changes to config UI

* [PW-1819]: Removing unnecesary file and adjusting tabs

* Update Block/Form/Cc.php
Co-Authored-By: cyattilakiss <42297201+cyattilakiss@users.noreply.github.com>

* Update Block/Form/Cc.php
Co-Authored-By: cyattilakiss <42297201+cyattilakiss@users.noreply.github.com>

* [PW-1819]: Newline char in Cc.php

* Update Model/Ui/AdyenCcConfigProvider.php
Co-Authored-By: cyattilakiss <42297201+cyattilakiss@users.noreply.github.com>

* Update Model/Ui/AdyenCcConfigProvider.php
Co-Authored-By: cyattilakiss <42297201+cyattilakiss@users.noreply.github.com>

* Update Model/Ui/AdyenOneclickConfigProvider.php
Co-Authored-By: cyattilakiss <42297201+cyattilakiss@users.noreply.github.com>

* Update etc/adminhtml/system/payment_methods/cards/advanced_options.xml
Co-Authored-By: cyattilakiss <42297201+cyattilakiss@users.noreply.github.com>

* [PW-1819]: Missing constructor argument and adjusting LPM comment
Co-authored-by: cyattilakiss <42297201+cyattilakiss@users.noreply.github.com>

Block/Form/Cc.php

@@ -45,6 +45,11 @@ class Cc extends \Magento\Payment\Block\Form\Cc
      */
     protected $checkoutSession;
 
+    /**
+     * @var \Adyen\Payment\Helper\CardAvailableTypes
+     */
+    protected $cardAvailableTypesHelper;
+
     /**
      * Cc constructor.
      *
@@ -52,6 +57,7 @@ class Cc extends \Magento\Payment\Block\Form\Cc
      * @param \Magento\Payment\Model\Config $paymentConfig
      * @param \Adyen\Payment\Helper\Data $adyenHelper
      * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Adyen\Payment\Helper\CardAvailableTypes $cardAvailableTypesHelper
      * @param array $data
      */
     public function __construct(
@@ -59,12 +65,14 @@ class Cc extends \Magento\Payment\Block\Form\Cc
         \Magento\Payment\Model\Config $paymentConfig,
         \Adyen\Payment\Helper\Data $adyenHelper,
         \Magento\Checkout\Model\Session $checkoutSession,
+        \Adyen\Payment\Helper\CardAvailableTypes $cardAvailableTypesHelper,
         array $data = []
     ) {
         parent::__construct($context, $paymentConfig);
         $this->adyenHelper = $adyenHelper;
         $this->appState = $context->getAppState();
         $this->checkoutSession = $checkoutSession;
+        $this->cardAvailableTypesHelper = $cardAvailableTypesHelper;
     }
 
 	/**
@@ -118,6 +126,9 @@ class Cc extends \Magento\Payment\Block\Form\Cc
 	 * Retrieve available credit card type codes by alt code
 	 *
 	 * @return array
+	 * @deprecated Use Adyen\Payment\Helper\CardAvailableTypes getCardAvailableTypes() instead.
+	 * This method will be removed in version 6.0.0
+	 *
 	 */
 	public function getCcAvailableTypesByAlt()
 	{
@@ -137,6 +148,17 @@ class Cc extends \Magento\Payment\Block\Form\Cc
 		return $types;
 	}
 
+    /**
+     * Retrieve available credit card type codes by alt code
+     *
+     * @return array
+     *
+     */
+    public function getCardAvailableTypes()
+    {
+        return $this->cardAvailableTypesHelper->getCardAvailableTypes('code_alt');
+    }
+
     /**
      * Allow checkbox for MOTO payments to be saved as RECURRING
      *
@@ -159,3 +181,4 @@ class Cc extends \Magento\Payment\Block\Form\Cc
     }
 
 }
+

Block/Form/Oneclick.php

@@ -42,6 +42,7 @@ class Oneclick extends \Adyen\Payment\Block\Form\Cc
      * @param \Magento\Payment\Model\Config $paymentConfig
      * @param \Adyen\Payment\Helper\Data $adyenHelper
      * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Adyen\Payment\Helper\CardAvailableTypes $cardAvailableTypesHelper
      * @param array $data
      */
     public function __construct(
@@ -50,9 +51,10 @@ class Oneclick extends \Adyen\Payment\Block\Form\Cc
         \Adyen\Payment\Helper\Data $adyenHelper,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Backend\Model\Session\Quote $sessionQuote,
+        \Adyen\Payment\Helper\CardAvailableTypes $cardAvailableTypesHelper,
         array $data = []
     ) {
-        parent::__construct($context, $paymentConfig, $adyenHelper, $checkoutSession, $data);
+        parent::__construct($context, $paymentConfig, $adyenHelper, $checkoutSession, $cardAvailableTypesHelper, $data);
         $this->_sessionQuote = $sessionQuote;
     }
 

Block/System/Config/Header.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Block\System\Config;
+
+class Header extends \Magento\Config\Block\System\Config\Form\Fieldset implements
+    \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
+{
+
+    /**
+     * Return header html for fieldset
+     *
+     * @param Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    protected function _getHeaderHtml($element)
+    {
+        if ($element->getIsNested()) {
+            $html = '<tr class="nested"><td colspan="4"><div class="' . $this->_getFrontendClass($element) . '">';
+        } else {
+            $html = '<div class="' . $this->_getFrontendClass($element) . '">';
+        }
+
+        $html .= '<div class="entry-edit-head admin__collapsible-block">' .
+            '<span id="' .
+            $element->getHtmlId() .
+            '-link" class="entry-edit-head-link"></span>';
+
+        $html .= $this->_getHeaderTitleHtml($element);
+
+        $html .= '</div>';
+        $html .= '<input id="' .
+            $element->getHtmlId() .
+            '-state" name="config_state[' .
+            $element->getId() .
+            ']" type="hidden" value="' .
+            (int)$this->_isCollapseState(
+                $element
+            ) . '" />';
+        $html .= '<fieldset class="' . $this->_getFieldsetCss() . '" id="' . $element->getHtmlId() . '">';
+        $html .= '<legend>' . $element->getLegend() . '</legend>';
+
+        // field label column
+        $html .= '<table cellspacing="0" class="form-list"><colgroup class="label" /><colgroup class="value" />';
+        if ($this->getRequest()->getParam('website') || $this->getRequest()->getParam('store')) {
+            $html .= '<colgroup class="use-default" />';
+        }
+        $html .= '<colgroup class="scope-label" /><colgroup class="" /><tbody>';
+
+        return $html;
+    }
+
+    /**
+     * Return header title part of html for fieldset
+     *
+     * @param Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    protected function _getHeaderTitleHtml($element)
+    {
+        $html = '<div class="adyen-config-column adyen-config-logo"></div>';
+        $html .= $this->_getHeaderCommentHtml($element);
+        $html .= '<div class="adyen-config-column adyen-config-button">' . $this->_getConfigureButtonHtml($element) . '</div>';
+        return $html;
+    }
+
+    /**
+     * Return header comment part of html for fieldset
+     *
+     * @param Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    protected function _getHeaderCommentHtml($element)
+    {
+        return $element->getComment() ? '<div class="adyen-config-column adyen-config-comment comment">' . $element->getComment() . '</div>' : '';
+    }
+
+    /**
+     * Return header title part of html for fieldset
+     *
+     * @param Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    protected function _getConfigureButtonHtml($element)
+    {
+        return '<a id="' .
+            $element->getHtmlId() .
+            '-head" href="#' .
+            $element->getHtmlId() .
+            '-link" onclick="Fieldset.toggleCollapse(\'' .
+            $element->getHtmlId() .
+            '\', \'' .
+            $this->getUrl(
+                '*/*/state'
+            ) . '\'); return false;"><button class="button action-configure" type="button">Configure</button></a>';
+    }
+
+}

Block/System/Config/Links.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Block\System\Config;
+
+class Links extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * Template path
+     *
+     * @var string
+     */
+    protected $_template = 'Adyen_Payment::system/config/adyen_header_links.phtml';
+
+    /**
+     * Links to show below the Adyen payment method header
+     *
+     * @var array
+     */
+    protected $links = array(
+        [
+            "label" => "Docs",
+            "url" => "https://docs.adyen.com/developers/plug-ins-and-partners/magento-2"
+        ],
+        [
+            "label" => "FAQs",
+            "url" => "https://support.adyen.com/hc/en-us/sections/360000809984-Plugins"
+        ],
+        [
+            "label" => "Support",
+            "url" => "https://support.adyen.com/hc/en-us/requests/new?ticket_form_id=78764"
+        ],
+        [
+            "label" => "GitHub",
+            "url" => "https://github.com/Adyen/adyen-magento2/releases"
+        ],
+        [
+            "label" => "Magento Marketplace",
+            "url" => "https://marketplace.magento.com/adyen-module-payment.html"
+        ]
+    );
+
+    /**
+     * Render fieldset html
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        return $this->_decorateRowHtml($element, "<td colspan='4'>" . $this->toHtml() . '</td>');
+    }
+
+    /**
+     * Outputs information links in format
+     *
+     * @return string
+     */
+    public function outputLinks()
+    {
+        foreach ($this->links as $link) {
+            $anchorTags[] = '<a href="' . $link["url"] . '"  target="_blank">' . $link["label"] . '</a>';
+        }
+
+        return '<div class="adyen-header-links">' . implode(' | ', $anchorTags) . '</div>';
+    }
+
+}

Block/System/Config/LpmTitle.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Block\System\Config;
+
+class LpmTitle extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * Text to show instead of title field
+     *
+     * @var string
+     */
+    protected $titleText = 'The title is automatically set based on the locale and name of the payment method.';
+
+    /**
+     * Render fieldset html
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    public function _renderValue(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        return '<td class="value">' . $this->titleText . '</td>';
+    }
+
+}

Helper/CardAvailableTypes.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Helper;
+
+use Magento\Framework\App\Helper\AbstractHelper;
+
+class CardAvailableTypes extends AbstractHelper
+{
+
+    /**
+     * @var \Adyen\Payment\Helper\Data
+     */
+    protected $adyenHelper;
+
+    public function __construct(\Adyen\Payment\Helper\Data $adyenHelper)
+    {
+        $this->adyenHelper = $adyenHelper;
+    }
+
+    /**
+     * Retrieve available card types
+     *
+     * @param string $index Either 'name' or 'code_alt' to retrieve that information from the card types
+     *
+     * @return array
+     */
+    public function getCardAvailableTypes($index = 'name')
+    {
+        $types = [];
+        $cardTypes = $this->adyenHelper->getAdyenCcTypes();
+        $enableAvailableTypes = $this->adyenHelper->getAdyenCcConfigData('enablecctypes');
+        if (!$enableAvailableTypes) {
+            return $types;
+        }
+
+        $availableTypes = $this->adyenHelper->getAdyenCcConfigData('cctypes');
+        if (!$availableTypes) {
+            return $types;
+        }
+
+        $availableTypes = explode(',', $availableTypes);
+        foreach (array_keys($cardTypes) as $code) {
+            if (in_array($code, $availableTypes)) {
+                $types[$code] = $cardTypes[$code][$index];
+            }
+        }
+
+        return $types;
+    }
+
+}

Helper/Data.php

@@ -234,8 +234,8 @@ class Data extends AbstractHelper
     public function getModes()
     {
         return [
-            '1' => 'Test Mode',
-            '0' => 'Production Mode'
+            '1' => 'Test',
+            '0' => 'Live'
         ];
     }
 
@@ -246,8 +246,22 @@ class Data extends AbstractHelper
     public function getCaptureModes()
     {
         return [
-            'auto' => 'immediate',
-            'manual' => 'manual'
+            'auto' => 'Immediate',
+            '1_7days' => '1 - 7 days',
+            'manual' => 'Manual'
+        ];
+    }
+
+    /**
+     * return recurring types for configuration setting
+     * @return array
+     */
+    public function getPosCaptureModes()
+    {
+        return [
+            'auto' => 'Immediate',
+            '1min_2days' => '1 min - 2 days',
+            'manual' => 'Manual'
         ];
     }
 
@@ -1382,6 +1396,17 @@ class Data extends AbstractHelper
         return $apiKey;
     }
 
+    /**
+     * Return the terminal selection level, merchant account or store
+     *
+     * @param int|null $storeId
+     * @return string
+     */
+    public function getTerminalSelectionLevel($storeId = null)
+    {
+        return $this->getAdyenPosCloudConfigData('terminal_selection', $storeId);
+    }
+
     /**
      * Return the Store ID for the current store/mode
      *

Helper/PaymentMethods.php

@@ -372,10 +372,12 @@ class PaymentMethods extends AbstractHelper
             "merchantAccount" => $this->adyenHelper->getAdyenMerchantAccount('adyen_pos_cloud', $storeId),
         ];
 
-        // In case the POS store id is set, provide in the request
+        // In case the terminal selection level is store and POS store ID is set, provide it in the request
+        if (strcmp($this->adyenHelper->getTerminalSelectionLevel($storeId), 'store_level') === 0) {
             if (!empty($this->adyenHelper->getPosStoreId($storeId))) {
                 $requestParams['store'] = $this->adyenHelper->getPosStoreId($storeId);
             }
+        }
 
         try {
             $responseData = $service->getConnectedTerminals($requestParams);

Model/Comment/ApiKeyEnding.php

@@ -34,6 +34,6 @@ class ApiKeyEnding implements CommentInterface
         if (!$apiKeyEnding) {
             return '';
         }
-        return "Key stored ending in <strong>$apiKeyEnding</strong>";
+        return "Saved key ends in <strong>$apiKeyEnding</strong>";
     }
 }

Model/Config/Source/AcceptedCardTypes.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Model\Config\Source;
+
+class AcceptedCardTypes implements \Magento\Framework\Option\ArrayInterface
+{
+    const OPTIONS = [
+        [
+            'value' => 0,
+            'label' => 'All types enabled on the merchant account'
+        ],
+        [
+            'value' => 1,
+            'label' => 'Custom'
+        ],
+    ];
+
+    /**
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return self::OPTIONS;
+    }
+}

Model/Config/Source/KarCaptureMode.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Model\Config\Source;
+
+class KarCaptureMode implements \Magento\Framework\Option\ArrayInterface
+{
+    const OPTIONS = [
+        [
+            'value' => 0,
+            'label' => 'Capture immediately'
+        ],
+        [
+            'value' => 1,
+            'label' => 'Capture manually'
+        ],
+    ];
+
+    /**
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return self::OPTIONS;
+    }
+}

Model/Config/Source/PaypalCaptureMode.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Model\Config\Source;
+
+class PaypalCaptureMode implements \Magento\Framework\Option\ArrayInterface
+{
+    const OPTIONS = [
+        [
+            'value' => 0,
+            'label' => 'Capture immediately'
+        ],
+        [
+            'value' => 1,
+            'label' => 'Capture manually'
+        ],
+    ];
+
+    /**
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return self::OPTIONS;
+    }
+}

Model/Config/Source/PosCaptureMode.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Model\Config\Source;
+
+class PosCaptureMode implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * @var \Adyen\Payment\Helper\Data
+     */
+    protected $adyenHelper;
+
+
+    /**
+     * CaptureMode constructor.
+     *
+     * @param \Adyen\Payment\Helper\Data $adyenHelper
+     */
+    public function __construct(
+        \Adyen\Payment\Helper\Data $adyenHelper
+    ) {
+        $this->adyenHelper = $adyenHelper;
+    }
+
+    /**
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        $recurringTypes = $this->adyenHelper->getPosCaptureModes();
+
+        foreach ($recurringTypes as $code => $label) {
+            $options[] = ['value' => $code, 'label' => $label];
+        }
+        return $options;
+    }
+}

Model/Config/Source/RecurringPaymentType.php

@@ -27,6 +27,11 @@ class RecurringPaymentType implements \Magento\Framework\Option\ArrayInterface
 {
     const UNDEFINED_OPTION_LABEL = 'NONE';
 
+    const RECURRING_TYPES_LABELS = [
+        \Adyen\Payment\Model\RecurringType::ONECLICK => "One-click payments",
+        \Adyen\Payment\Model\RecurringType::RECURRING => "Recurring payments"
+    ];
+
     /**
      * @var \Adyen\Payment\Helper\Data
      */
@@ -53,7 +58,7 @@ class RecurringPaymentType implements \Magento\Framework\Option\ArrayInterface
         foreach ($recurringTypes as $code => $label) {
             if ($code == \Adyen\Payment\Model\RecurringType::ONECLICK ||
                 $code == \Adyen\Payment\Model\RecurringType::RECURRING) {
-                $options[] = ['value' => $code, 'label' => $label];
+                $options[] = ['value' => $code, 'label' => self::RECURRING_TYPES_LABELS[$code]];
             }
         }
         return $options;

Model/Config/Source/SplitPaymentRefundStrategy.php

@@ -43,9 +43,9 @@ class SplitPaymentRefundStrategy implements \Magento\Framework\Option\ArrayInter
     public function getSplitPaymentRefundStrategies()
     {
         return [
-            self::REFUND_FIRST_PAYEMENT_FIRST => __('Refund from first payment first'),
-            self::REFUND_LAST_PAYEMENT_FIRST => 'Refund from last payment first',
-            self::REFUND_ON_RATIO => __('refund based on ratio')
+            self::REFUND_FIRST_PAYEMENT_FIRST => __('Refund from first payment method'),
+            self::REFUND_LAST_PAYEMENT_FIRST => 'Refund from last payment method',
+            self::REFUND_ON_RATIO => __('Refund payment methods based on ratio')
         ];
     }
 }

Model/Config/Source/TerminalSelection.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Model\Config\Source;
+
+class TerminalSelection implements \Magento\Framework\Option\ArrayInterface
+{
+    const OPTIONS = [
+        [
+            'value' => 'merchant_account_level',
+            'label' => 'All online terminals on merchant account'
+        ],
+        [
+            'value' => 'store_level',
+            'label' => 'All online terminals at a specific store'
+        ],
+    ];
+
+    /**
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return self::OPTIONS;
+    }
+}

Model/Cron.php

@@ -1467,7 +1467,10 @@ class Cron
                         'This payment method is POS Cloud and configured to be working as auto capture '
                     );
                     return true;
-                } elseif (strcmp($captureModePos, 'manual') === 0) {
+                } elseif (
+                    strcmp($captureModePos, 'manual') === 0 ||
+                    strcmp($captureModePos, '1min_2days') === 0
+                ) {
                     $this->_adyenLogger->addAdyenNotificationCronjob(
                         'This payment method is POS Cloud and configured to be working as manual capture '
                     );
@@ -1499,8 +1502,8 @@ class Cron
                     return true;
                 }
             }
-            if (strcmp($captureMode, 'manual') === 0) {
-                $this->_adyenLogger->addAdyenNotificationCronjob('Capture mode for this payment is set to manual');
+            if (strcmp($captureMode, 'manual') === 0 || strcmp($captureMode, '1_7days') === 0) {
+                $this->_adyenLogger->addAdyenNotificationCronjob('Capture mode for this payment is set to manual or 1 - 7 days');
                 return false;
             }
 

Model/Ui/AdyenCcConfigProvider.php

@@ -74,6 +74,11 @@ class AdyenCcConfigProvider implements ConfigProviderInterface
      */
     private $serializer;
 
+    /**
+     * @var \Adyen\Payment\Helper\CardAvailableTypes
+     */
+    protected $cardAvailableTypesHelper;
+
     /**
      * AdyenCcConfigProvider constructor.
      *
@@ -94,7 +99,8 @@ class AdyenCcConfigProvider implements ConfigProviderInterface
         \Magento\Framework\View\Asset\Source $assetSource,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Payment\Model\CcConfig $ccConfig,
-        \Magento\Framework\Serialize\SerializerInterface $serializer
+        \Magento\Framework\Serialize\SerializerInterface $serializer,
+        \Adyen\Payment\Helper\CardAvailableTypes $cardAvailableTypesHelper
     ) {
         $this->_paymentHelper = $paymentHelper;
         $this->_adyenHelper = $adyenHelper;
@@ -104,6 +110,7 @@ class AdyenCcConfigProvider implements ConfigProviderInterface
         $this->ccConfig = $ccConfig;
         $this->storeManager = $storeManager;
         $this->serializer = $serializer;
+        $this->cardAvailableTypesHelper = $cardAvailableTypesHelper;
     }
 
     /**
@@ -128,8 +135,8 @@ class AdyenCcConfigProvider implements ConfigProviderInterface
         $config = array_merge_recursive($config, [
             'payment' => [
                 'ccform' => [
-                    'availableTypes' => [$methodCode => $this->getCcAvailableTypes()],
-                    'availableTypesByAlt' => [$methodCode => $this->getCcAvailableTypesByAlt()],
+                    'availableTypes' => [$methodCode => $this->cardAvailableTypesHelper->getCardAvailableTypes()],
+                    'availableTypesByAlt' => [$methodCode => $this->cardAvailableTypesHelper->getCardAvailableTypes('code_alt')],
                     'months' => [$methodCode => $this->getCcMonths()],
                     'years' => [$methodCode => $this->getCcYears()],
                     'hasVerification' => [$methodCode => $this->hasVerification($methodCode)],
@@ -176,6 +183,9 @@ class AdyenCcConfigProvider implements ConfigProviderInterface
      * Retrieve available credit card types
      *
      * @return array
+     * @deprecated Use Adyen\Payment\Helper\CardAvailableTypes getCardAvailableTypes() instead.
+     * This method will be removed in version 6.0.0
+     *
      */
     protected function getCcAvailableTypes()
     {
@@ -198,6 +208,9 @@ class AdyenCcConfigProvider implements ConfigProviderInterface
      * Retrieve available credit card type codes by alt code
      *
      * @return array
+     * @deprecated Use Adyen\Payment\Helper\CardAvailableTypes getCardAvailableTypes() instead.
+     * This method will be removed in version 6.0.0
+     *
      */
     protected function getCcAvailableTypesByAlt()
     {
@@ -292,4 +305,3 @@ class AdyenCcConfigProvider implements ConfigProviderInterface
         return $this->_request;
     }
 }
-

Model/Ui/AdyenOneclickConfigProvider.php

@@ -72,6 +72,11 @@ class AdyenOneclickConfigProvider implements ConfigProviderInterface
      */
     private $ccConfig;
 
+    /**
+     * @var \Adyen\Payment\Helper\CardAvailableTypes
+     */
+    protected $cardAvailableTypesHelper;
+
     /**
      * AdyenOneclickConfigProvider constructor.
      *
@@ -82,6 +87,7 @@ class AdyenOneclickConfigProvider implements ConfigProviderInterface
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Payment\Model\CcConfig $ccConfig
+     * @param \Adyen\Payment\Helper\CardAvailableTypes $cardAvailableTypesHelper
      */
     public function __construct(
         \Adyen\Payment\Helper\Data $adyenHelper,
@@ -90,7 +96,8 @@ class AdyenOneclickConfigProvider implements ConfigProviderInterface
         \Magento\Checkout\Model\Session $session,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\UrlInterface $urlBuilder,
-        \Magento\Payment\Model\CcConfig $ccConfig
+        \Magento\Payment\Model\CcConfig $ccConfig,
+        \Adyen\Payment\Helper\CardAvailableTypes $cardAvailableTypesHelper
     ) {
         $this->_adyenHelper = $adyenHelper;
         $this->_request = $request;
@@ -99,6 +106,7 @@ class AdyenOneclickConfigProvider implements ConfigProviderInterface
         $this->_storeManager = $storeManager;
         $this->_urlBuilder = $urlBuilder;
         $this->ccConfig = $ccConfig;
+        $this->cardAvailableTypesHelper = $cardAvailableTypesHelper;
     }
 
     /**
@@ -132,7 +140,7 @@ class AdyenOneclickConfigProvider implements ConfigProviderInterface
         $config = array_merge_recursive($config, [
             'payment' => [
                 'ccform' => [
-                    'availableTypes' => [$methodCode => $this->getCcAvailableTypes()],
+                    'availableTypes' => [$methodCode => $this->cardAvailableTypesHelper->getCardAvailableTypes()],
                     'months' => [$methodCode => $this->getCcMonths()],
                     'years' => [$methodCode => $this->getCcYears()],
                     'hasVerification' => [$methodCode => $this->hasVerification($methodCode)],
@@ -210,6 +218,9 @@ class AdyenOneclickConfigProvider implements ConfigProviderInterface
      * Retrieve availables credit card types
      *
      * @return array
+     * @deprecated Use Adyen\Payment\Helper\CardAvailableTypes getCardAvailableTypes() instead.
+     * This method will be removed in version 6.0.0
+     *
      */
     protected function getCcAvailableTypes()
     {

Test/Unit/Comment/ApiKeyEndingTest.php

@@ -30,7 +30,7 @@ class ApiKeyEndingTest extends TestCase
 
     public function testCommentReturnsJustTheEnding()
     {
-        $this->assertEquals('Key stored ending in <strong>1234</strong>', $this->apiKeyEndingComment->getCommentText('4321'));
-        $this->assertEquals('Key stored ending in <strong>qwer</strong>', $this->apiKeyEndingComment->getCommentText('asdfasdfasdf'));
+        $this->assertEquals('Saved key ends in <strong>1234</strong>', $this->apiKeyEndingComment->getCommentText('4321'));
+        $this->assertEquals('Saved key ends in <strong>qwer</strong>', $this->apiKeyEndingComment->getCommentText('asdfasdfasdf'));
     }
 }

Test/Unit/Helper/CardAvailableTypesTest.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Tests\Helper;
+
+use Adyen\Payment\Helper\CardAvailableTypes;
+
+class CardAvailableTypesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Adyen\Payment\Helper\CardAvailableTypes
+     */
+    private $cardAvailableTypesHelper;
+
+    /**
+     * @var \Adyen\Payment\Helper\Data
+     */
+    private $adyenHelper;
+
+    private function getSimpleMock($originalClassName)
+    {
+        return $this->getMockBuilder($originalClassName)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    public function setUp()
+    {
+        $this->adyenHelper = $this->getMockBuilder(\Adyen\Payment\Helper\Data::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adyenHelper->method("getAdyenCcTypes")
+            ->willReturn([
+                'AE' => [
+                    'name' => 'American Express',
+                    'code_alt' => 'amex'
+                ],
+                'VI' => [
+                    'name' => 'Visa',
+                    'code_alt' => 'visa'
+                ],
+                'MC' => [
+                    'name' => 'MasterCard',
+                    'code_alt' => 'mc'
+                ],
+                'DI' => [
+                    'name' => 'Discover',
+                    'code_alt' => 'discover'
+                ]
+            ]);
+        $this->adyenHelper->method("getAdyenCcConfigData")
+            ->withConsecutive(
+                ['enablecctypes'],
+                ['cctypes']
+            )->willReturnOnConsecutiveCalls(
+                1,
+                'AE,VI,DI'
+            ); //Intentionally missing 'MC' to assert that the method filters out that option
+
+        $this->cardAvailableTypesHelper = new CardAvailableTypes($this->adyenHelper);
+
+    }
+
+    /**
+     * @dataProvider cardAvailableTypesProvider
+     */
+    public function testGetCardAvailableTypes($index, $return)
+    {
+        $cardAvailableTypes = $this->cardAvailableTypesHelper->getCardAvailableTypes($index);
+        $this->assertEquals($return, $cardAvailableTypes);
+
+    }
+
+    public function cardAvailableTypesProvider()
+    {
+        return array(
+            array(
+                'name',
+                [
+                    'AE' => 'American Express',
+                    'VI' => 'Visa',
+                    'DI' => 'Discover',
+                ]
+
+            ),
+            array(
+                'code_alt',
+                [
+                    'AE' => 'amex',
+                    'VI' => 'visa',
+                    'DI' => 'discover',
+                ]
+
+            )
+        );
+    }
+}

etc/adminhtml/system.xml

@@ -16,7 +16,7 @@
  *
  * Adyen Payment module (https://www.adyen.com/)
  *
- * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
  * See LICENSE.txt for license details.
  *
  * Author: Adyen <magento@adyen.com>
@@ -24,29 +24,79 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="payment" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
-            <group id="adyen_group_all_in_one" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Adyen All-in-One Payment Solutions</label>
-                <comment><![CDATA[Adyen All-in-One Payment Solutions]]></comment>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <include path="Adyen_Payment::system/adyen_getting_started.xml"/>
-                <include path="Adyen_Payment::system/adyen_required_settings.xml"/>
-                <include path="Adyen_Payment::system/adyen_advanced_order_processing.xml"/>
-                <include path="Adyen_Payment::system/adyen_advanced_notifications.xml"/>
-                <include path="Adyen_Payment::system/adyen_billing_agreements.xml"/>
-                <include path="Adyen_Payment::system/adyen_checkout_experience.xml"/>
-                <include path="Adyen_Payment::system/adyen_manual_review.xml"/>
-                <include path="Adyen_Payment::system/adyen_split_payment.xml"/>
-                <include path="Adyen_Payment::system/adyen_cc.xml"/>
-                <include path="Adyen_Payment::system/adyen_oneclick.xml"/>
-                <include path="Adyen_Payment::system/adyen_hpp.xml"/>
-                <include path="Adyen_Payment::system/adyen_pos_cloud.xml"/>
-                <include path="Adyen_Payment::system/adyen_pay_by_mail.xml"/>
-                <include path="Adyen_Payment::system/adyen_boleto.xml"/>
-                <include path="Adyen_Payment::system/adyen_apple_pay.xml"/>
-                <include path="Adyen_Payment::system/adyen_google_pay.xml"/>
+        <section id="payment" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="adyen_group_all_in_one" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Adyen</label>
+                <include path="Adyen_Payment::system/header.xml"/>
+                <include path="Adyen_Payment::system/header_links.xml"/>
+                <include path="Adyen_Payment::system/main.xml"/>
+                <group id="adyen_group_all_in_one_ecommerce_payments" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <fieldset_css>adyen-ecommerce-payments-config</fieldset_css>
+                    <include path="Adyen_Payment::system/ecommerce_payments/ecommerce_payments.xml"/>
+                    <group id="adyen_group_all_in_one_ecommerce_payments_payment_links" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <include path="Adyen_Payment::system/ecommerce_payments/payment_links.xml"/>
+                    </group>
+                    <group id="adyen_group_all_in_one_ecommerce_payments_advanced_options" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <include path="Adyen_Payment::system/ecommerce_payments/advanced_options.xml"/>
+                    </group>
+                </group>
+                <group id="adyen_group_all_in_one_pos_payments" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <include path="Adyen_Payment::system/pos_payments/pos_payments.xml"/>
+                    <group id="adyen_group_all_in_one_pos_payments_advanced_options" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <include path="Adyen_Payment::system/pos_payments/advanced_options.xml"/>
+                    </group>
+                </group>
+                <group id="adyen_group_all_in_one_payment_methods" translate="label" type="text" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <include path="Adyen_Payment::system/payment_methods/payment_methods.xml"/>
+                    <group id="adyen_group_all_in_one_payment_methods_cards" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <include path="Adyen_Payment::system/payment_methods/cards/cards.xml"/>
+                        <group id="adyen_group_all_in_one_payment_methods_cards_stored_card_details" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+                            <include path="Adyen_Payment::system/payment_methods/cards/stored_card_details.xml"/>
+                        </group>
+                        <group id="adyen_group_all_in_one_payment_methods_cards_advanced_options" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
+                            <include path="Adyen_Payment::system/payment_methods/cards/advanced_options.xml"/>
+                        </group>
+                    </group>
+                    <group id="adyen_group_all_in_one_payment_methods_billing_agreements" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <include path="Adyen_Payment::system/payment_methods/billing_agreements/billing_agreements.xml"/>
+                    </group>
+                    <group id="adyen_group_all_in_one_payment_methods_local_payment_methods" translate="label" type="text" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <include path="Adyen_Payment::system/payment_methods/local_payment_methods/local_payment_methods.xml"/>
+                        <group id="adyen_group_all_in_one_payment_methods_local_payment_methods_stored_payment_method_details" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+                            <include path="Adyen_Payment::system/payment_methods/local_payment_methods/stored_payment_method_details.xml"/>
+                        </group>
+                        <group id="adyen_group_all_in_one_payment_methods_local_payment_methods_advanced_options" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
+                            <include path="Adyen_Payment::system/payment_methods/local_payment_methods/advanced_options.xml"/>
+                        </group>
+                    </group>
+                    <group id="adyen_group_all_in_one_payment_methods_payment_links" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <include path="Adyen_Payment::system/payment_methods/payment_links/payment_links.xml"/>
+                    </group>
+                    <group id="adyen_group_all_in_one_payment_methods_boleto" translate="label" type="text" sortOrder="500" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <include path="Adyen_Payment::system/payment_methods/boleto/boleto.xml"/>
+                    </group>
+                    <group id="adyen_group_all_in_one_payment_methods_apple_pay" translate="label" type="text" sortOrder="600" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <include path="Adyen_Payment::system/payment_methods/apple_pay/apple_pay.xml"/>
+                    </group>
+                    <group id="adyen_group_all_in_one_payment_methods_google_pay" translate="label" type="text" sortOrder="700" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <include path="Adyen_Payment::system/payment_methods/google_pay/google_pay.xml"/>
+                    </group>
+                    <group id="adyen_group_all_in_one_payment_methods_pos" translate="label" type="text" sortOrder="800" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <include path="Adyen_Payment::system/payment_methods/pos/pos.xml"/>
+                        <group id="adyen_group_all_in_one_payment_methods_pos_stored_payment_details" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+                            <include path="Adyen_Payment::system/payment_methods/pos/stored_payment_details.xml"/>
+                        </group>
+                        <group id="adyen_group_all_in_one_payment_methods_pos_advanced_options" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
+                            <include path="Adyen_Payment::system/payment_methods/pos/advanced_options.xml"/>
+                        </group>
+                    </group>
+                </group>
+                <group id="adyen_group_all_in_one_payment_methods_order_management" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <include path="Adyen_Payment::system/order_management/order_management.xml"/>
+                </group>
+                <group id="adyen_group_all_in_one_payment_methods_developer_options" translate="label" type="text" sortOrder="500" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <include path="Adyen_Payment::system/developer_options/developer_options.xml"/>
+                </group>
             </group>
         </section>
     </system>

etc/adminhtml/system/adyen_advanced_order_processing.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_advanced_order_processing" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Advanced: Magento Order Processing]]></label>
-        <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-        <field id="paypal_capture_mode" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Use manual capture for PayPal</label>
-            <tooltip>Should be on 'No' by default. If you have requested with Adyen Support for your PayPal integration to be on manual capture, set this to 'Yes'.</tooltip>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_abstract/paypal_capture_mode</config_path>
-        </field>
-        <field id="capture_on_shipment" translate="label" type="select" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Capture on shipment for OpenInvoice Methods (Klarna, Ratepay and Afterpay)</label>
-            <tooltip>If you enable this function it will do a capture request to Adyen if you do a shipment for openinvoice payment methods.</tooltip>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_abstract/capture_on_shipment</config_path>
-        </field>
-        <field id="auto_capture_openinvoice" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Use auto-capture for OpenInvoice payments</label>
-            <tooltip>Applicable for Klarna and AfterPay only. By default OpenInvoice is set to manual capture. If you want auto capture you need to contact magento@adyen.com. After approval has been given, then you can set this option to 'Yes'.</tooltip>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_abstract/auto_capture_openinvoice</config_path>
-        </field>
-        <field id="payment_authorized_virtual" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Order status: payment capture (virtual products)</label>
-            <tooltip>(optional) Select only status assigned to state complete. Leave empty to use the same as normal products</tooltip>
-            <source_model>Adyen\Payment\Model\Config\Source\Complete</source_model>
-            <config_path>payment/adyen_abstract/payment_authorized_virtual</config_path>
-        </field>
-        <field id="pending_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Order status: pending Bank Transfer/SEPA orders</label>
-            <tooltip>By default, Adyen does not inform your Magento store about pending payments. If you want these notifications to be received, Go to Adyen Customer Area => Server Communication and add BankTransfer Pending Notification and Direct-Debit Pending Notification.</tooltip>
-            <source_model>Magento\Sales\Model\Config\Source\Order\Status\NewStatus</source_model>
-            <config_path>payment/adyen_abstract/pending_status</config_path>
-        </field>
-        <field id="send_email_bank_sepa_on_pending" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Send order confirmation email for Bank Transfer/SEPA</label>
-            <tooltip>Send a confirmation mail after Bank Tranfer/SEPA is placed (not yet paid). If you want these notifications to be received, Go to Adyen Customer Area => Server Communication and add BankTransfer Pending Notification and Direct-Debit Pending Notification.</tooltip>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_abstract/send_email_bank_sepa_on_pending</config_path>
-        </field>
-        <field id="sepa_flow" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Sepa Payment flow</label>
-            <tooltip>If you are not sure just leave it at 'Sale’. Sale means it is always immediate capture with auth/cap it will follow the Capture Delay. If you want to enable 'Auth/Capt' for SEPA Direct Debit, please contact support@adyen.com</tooltip>
-            <source_model>Adyen\Payment\Model\Config\Source\SepaFlow</source_model>
-            <config_path>payment/adyen_abstract/sepa_flow</config_path>
-        </field>
-    </group>
-</include>
\ No newline at end of file

etc/adminhtml/system/adyen_apple_pay.xml

-<?xml version="1.0"?>
-<!--
-  ~                       ######
-  ~                       ######
-  ~ ############    ####( ######  #####. ######  ############   ############
-  ~ #############  #####( ######  #####. ######  #############  #############
-  ~        ######  #####( ######  #####. ######  #####  ######  #####  ######
-  ~ ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
-  ~ ###### ######  #####( ######  #####. ######  #####          #####  ######
-  ~ #############  #############  #############  #############  #####  ######
-  ~  ############   ############  #############   ############  #####  ######
-  ~                                      ######
-  ~                               #############
-  ~                               ############
-  ~
-  ~ Adyen Payment Module
-  ~
-  ~ Copyright (c) 2017 Adyen B.V.
-  ~ This file is open source and available under the MIT license.
-  ~ See the LICENSE file for more info.
-  ~
-  ~ 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_apple_pay" translate="label" type="text" sortOrder="460" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Apple Pay integration]]></label>
-        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-        <fieldset_css>adyen-method-adyen-cc</fieldset_css>
-        <comment>Process Apple Pay 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_apple_pay/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_apple_pay/title</config_path>
-        </field>
-        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Sort Order</label>
-            <frontend_class>validate-number</frontend_class>
-            <config_path>payment/adyen_apple_pay/sort_order</config_path>
-        </field>
-        <field id="merchant_identifier_test" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Test: Apple Merchant Identifier</label>
-            <tooltip>You can retrieve this from your Apple Account.</tooltip>
-            <config_path>payment/adyen_apple_pay/merchant_identifier_test</config_path>
-        </field>
-        <field id="merchant_identifier_live" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Live: Apple Merchant Identifier</label>
-            <tooltip>You can retrieve this from your Apple Account.</tooltip>
-            <config_path>payment/adyen_apple_pay/merchant_identifier_live</config_path>
-        </field>
-        <field id="full_path_location_pem_file_test" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Test: PEM File location</label>
-            <tooltip>You need to generate a pem file from the apple certificate. You need to upload this to your webserver and define the full path location here.</tooltip>
-            <config_path>payment/adyen_apple_pay/full_path_location_pem_file_test</config_path>
-        </field>
-        <field id="full_path_location_pem_file_live" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Live: PEM File location</label>
-            <tooltip>You need to generate a pem file from the apple certificate. You need to upload this to your webserver and define the full path location here.</tooltip>
-            <config_path>payment/adyen_apple_pay/full_path_location_pem_file_live</config_path>
-        </field>
-    </group>
-</include>
\ No newline at end of file

etc/adminhtml/system/adyen_boleto.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_boleto" translate="label" type="text" sortOrder="450" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Boleto integration]]></label>
-        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-        <fieldset_css>adyen-method-adyen-cc</fieldset_css>
-        <comment>Process Boleto 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_boleto/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_boleto/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_boleto/sort_order</config_path>
-        </field>
-        <field id="cctypes" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Boleto Types</label>
-            <depends><field id="active">1</field></depends>
-            <validate>validate-no-empty</validate>
-            <source_model>Adyen\Payment\Model\Config\Source\BoletoType</source_model>
-            <config_path>payment/adyen_boleto/boletotypes</config_path>
-        </field>
-        <field id="delivery_days" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Days for Delivery</label>
-            <tooltip>How many days to be added to the current date for delivery. Only numbers allowed.</tooltip>
-            <frontend_class>validate-number</frontend_class>
-            <config_path>payment/adyen_boleto/delivery_days</config_path>
-        </field>
-
-        <group id="adyen_boleto_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_boleto/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_boleto/specificcountry</config_path>
-            </field>
-        </group>
-    </group>
-</include>
\ No newline at end of file

etc/adminhtml/system/adyen_cc.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_cc" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1"
-           showInStore="1">
-        <label><![CDATA[CreditCard API integration]]></label>
-        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-        <fieldset_css>adyen-method-adyen-cc</fieldset_css>
-        <comment>Process creditcard payments inside your checkout.</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_cc/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_cc/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_cc/sort_order</config_path>
-        </field>
-        <field id="cctypes" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="1"
-               showInStore="0">
-            <label>Credit Card Types</label>
-            <source_model>Adyen\Payment\Model\Config\Source\CcType</source_model>
-            <config_path>payment/adyen_cc/cctypes</config_path>
-        </field>
-        <field id="adyen_cc_vault" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1"
-               showInStore="0">
-            <label>Vault Enabled</label>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_cc_vault/active</config_path>
-        </field>
-        <field id="adyen_cc_threeds2" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1"
-               showInStore="1">
-            <label>3DS2.0 Enabled</label>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_cc/threeds2_enabled</config_path>
-        </field>
-
-        <group id="adyen_cc_advanced_settings" translate="label" showInDefault="1" showInWebsite="1" showInStore="1"
-               sortOrder="150">
-            <label>Advanced Settings</label>
-            <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-            <field id="enable_installments" translate="label" type="select" sortOrder="219" showInDefault="1"
-                   showInWebsite="1" showInStore="1">
-                <label>Enable Installments</label>
-                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                <tooltip>Enable installments for each credit card type.</tooltip>
-                <config_path>payment/adyen_cc/enable_installments</config_path>
-            </field>
-            <field id="installments" translate="label" sortOrder="220" showInDefault="1" showInWebsite="1"
-                   showInStore="1">
-                <label>Installments</label>
-                <depends>
-                    <field id="enable_installments">1</field>
-                </depends>
-                <tooltip>Configure your installment for each credit card type: Insert the minimum amount required to
-                    make the configured installment available in the amount range column.
-                    Example: if the amount range is configured to 100 and the number of installments to 4x, the shopper
-                    will see the 4x option only if the payment total is higher or equal than 100.
-                </tooltip>
-                <frontend_model>Adyen\Payment\Block\Adminhtml\System\Config\Field\Installments</frontend_model>
-                <backend_model>Adyen\Payment\Model\Config\Backend\Installments</backend_model>
-                <config_path>payment/adyen_cc/installments</config_path>
-            </field>
-        </group>
-
-        <group id="adyen_cc_country_specific" translate="label" showInDefault="1" showInWebsite="1" sortOrder="200">
-            <label>Country Specific Settings</label>
-            <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-            <field id="allowspecific" translate="label" type="allowspecific" sortOrder="100" 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_cc/allowspecific</config_path>
-            </field>
-            <field id="specificcountry" translate="label" type="multiselect" sortOrder="200" 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_cc/specificcountry</config_path>
-            </field>
-        </group>
-    </group>
-</include>
\ No newline at end of file

etc/adminhtml/system/adyen_google_pay.xml

-<?xml version="1.0"?>
-<!--
-  ~                       ######
-  ~                       ######
-  ~ ############    ####( ######  #####. ######  ############   ############
-  ~ #############  #####( ######  #####. ######  #############  #############
-  ~        ######  #####( ######  #####. ######  #####  ######  #####  ######
-  ~ ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
-  ~ ###### ######  #####( ######  #####. ######  #####          #####  ######
-  ~ #############  #############  #############  #############  #####  ######
-  ~  ############   ############  #############   ############  #####  ######
-  ~                                      ######
-  ~                               #############
-  ~                               ############
-  ~
-  ~ Adyen Payment Module
-  ~
-  ~ Copyright (c) 2019 Adyen B.V.
-  ~ This file is open source and available under the MIT license.
-  ~ See the LICENSE file for more info.
-  ~
-  ~ 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_google_pay" translate="label" type="text" sortOrder="460" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Google Pay integration]]></label>
-        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-        <fieldset_css>adyen-method-adyen-cc</fieldset_css>
-        <comment>Process Google Pay 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_google_pay/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_google_pay/title</config_path>
-        </field>
-        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Sort Order</label>
-            <frontend_class>validate-number</frontend_class>
-            <config_path>payment/adyen_google_pay/sort_order</config_path>
-        </field>
-        <field id="merchant_identifier" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Google Merchant Identifier</label>
-            <comment><![CDATA[Your Google Merchant ID from Google Pay Developer Profile. For more information refer to <a href="https://developers.google.com/pay/api/web/guides/test-and-deploy/deploy-production-environment#obtain-your-merchantID">Obtain your merchantID</a>.]]></comment>
-            <config_path>payment/adyen_google_pay/merchant_identifier</config_path>
-        </field>
-    </group>
-</include>
\ No newline at end of file

etc/adminhtml/system/adyen_hpp.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_hpp" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Alternative payment methods]]></label>
-        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-        <fieldset_css>adyen-method-adyen-cc</fieldset_css>
-        <comment>Process alternative payments methods</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_hpp/active</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_hpp/sort_order</config_path>
-        </field>
-        <group id="adyen_hpp_openinvoice_settings" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
-            <label>Klarna\RatePay\Afterpay Settings</label>
-            <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-            <field id="ratepay_id" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>RatePAY Device Ident SId</label>
-                <tooltip>Unique RatePAY Id provided by RatePAY integration consultant</tooltip>
-                <config_path>payment/adyen_hpp/ratepay_id</config_path>
-            </field>
-        </group>
-        <group id="adyen_hpp_advanced_settings" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="200">
-            <label>Advanced Settings</label>
-            <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-            <field id="title" translate="label" type="text" sortOrder="65" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Title</label>
-                <config_path>payment/adyen_hpp/title</config_path>
-            </field>
-            <field id="shopper_locale" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Language locale (optional)</label>
-                <tooltip>This will override the default shopper locale of the Magento store (e.g. nl_NL). Leave empty to let Magento decide.</tooltip>
-                <config_path>payment/adyen_hpp/shopper_locale</config_path>
-            </field>
-            <field id="country_code" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>ISO Country Code (optional)</label>
-                <tooltip>This will override the shopper billing address country when determining what payment methods to display.</tooltip>
-                <config_path>payment/adyen_hpp/country_code</config_path>
-            </field>
-        </group>
-        <group id="adyen_hpp_country_specific" translate="label" showInDefault="1" showInWebsite="1" showInStore="0" 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_hpp/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_hpp/specificcountry</config_path>
-            </field>
-        </group>
-    </group>
-</include>
\ No newline at end of file

etc/adminhtml/system/adyen_manual_review.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_manual_review" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Advanced: Manual Review]]></label>
-        <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-        <comment>
-            <![CDATA[
-                <p>
-                Adyen's Risk analysis tool allows merchants to configure when a transaction should be rejected or accepted depending on certain characteristics of the payment.
-            This process has always had two automatic outcomes, either accept or reject the payment. Now, Adyen's risk system can tell merchants when a transaction seems to be risky but without rejecting it, and requires to be manually reviewed in order to decide if it should be accepted or rejected.
-                If you want this to be turned on please contact <a href="mailto:magento@adyen.com">magento@adyen.com</a>
-                </p>
-            ]]>
-        </comment>
-
-        <field id="fraud_manual_review_status" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Manual Review Status</label>
-            <tooltip>This status will be triggered when Adyen notifies your Magento module that the payment has come under Manual Review. If you do not have this set up or do not want a separate status, please keep it on the default (e.g.'— Please Select —').</tooltip>
-            <source_model>Magento\Sales\Model\Config\Source\Order\Status\NewStatus</source_model>
-            <config_path>payment/adyen_abstract/fraud_manual_review_status</config_path>
-        </field>
-        <field id="fraud_manual_review_accept_status" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Manual Review Accepted Status</label>
-            <tooltip>Only relevant if you do not have an action defined when you accept a manual review. This status will be triggered when a 'MANUAL_REVIEW_ACCEPT' notification is received from Adyen. If you have already asked Adyen to set an action for this (e.g. capture) or don't want a separate status for this, please keep it on the default (e.g.'— Please Select —')</tooltip>
-            <source_model>Magento\Sales\Model\Config\Source\Order\Status\Processing</source_model>
-            <config_path>payment/adyen_abstract/fraud_manual_review_accept_status</config_path>
-        </field>
-
-    </group>
-</include>
\ No newline at end of file

etc/adminhtml/system/adyen_oneclick.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_oneclick" translate="label" type="text" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Stored Payment Methods - Requires Adyen Credit Card]]></label>
-        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-        <fieldset_css>adyen-method-adyen-cc</fieldset_css>
-        <comment><![CDATA[During checkout shoppers can choose to have their payment details remembered and stored for trusted websites in Adyen’s highly secure platform. Adyen takes care of this process for its customers. Shoppers can then select the stored payment method in the checkout.]]></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_oneclick/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_oneclick/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_oneclick/sort_order</config_path>
-        </field>
-        <field id="recurring_payment_type" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Agreement Type</label>
-            <tooltip>With ONECLICK the shopper needs to fill in their security code for credit cards. For RECURRING, this is not needed. If you want to use RECURRING make sure you have Agreement Type set to RECURRING or ONECLICK,RECURRING</tooltip>
-            <source_model>Adyen\Payment\Model\Config\Source\RecurringPaymentType</source_model>
-            <config_path>payment/adyen_oneclick/recurring_payment_type</config_path>
-        </field>
-        <group id="adyen_oneclick_advanced_settings" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="200">
-            <label>Advanced Settings</label>
-            <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-            <field id="title" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Share billing agreements between stores</label>
-                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                <config_path>payment/adyen_oneclick/share_billing_agreement</config_path>
-            </field>
-        </group>
-    </group>
-</include>

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</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.</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.</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/adminhtml/system/adyen_pos_cloud.xml

-<?xml version="1.0"?>
-<!--
-  ~                       ######
-  ~                       ######
-  ~ ############    ####( ######  #####. ######  ############   ############
-  ~ #############  #####( ######  #####. ######  #############  #############
-  ~        ######  #####( ######  #####. ######  #####  ######  #####  ######
-  ~ ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
-  ~ ###### ######  #####( ######  #####. ######  #####          #####  ######
-  ~ #############  #############  #############  #############  #####  ######
-  ~  ############   ############  #############   ############  #####  ######
-  ~                                      ######
-  ~                               #############
-  ~                               ############
-  ~
-  ~ Adyen Payment Module
-  ~
-  ~ Copyright (c) 2018 Adyen B.V.
-  ~ This file is open source and available under the MIT license.
-  ~ See the LICENSE file for more info.
-  ~
-  ~ 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_pos_cloud" translate="label" type="text" sortOrder="350" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Point of Sale (POS) integration with Cloud API]]></label>
-        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-        <fieldset_css>adyen-method-adyen-cc</fieldset_css>
-        <comment>Process Point of Sales 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_pos_cloud/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_pos_cloud/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_pos_cloud/sort_order</config_path>
-        </field>
-        <field id="pos_merchant_account" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Merchant Account for Cloud API</label>
-            <can_be_empty>1</can_be_empty>
-            <tooltip>Please insert your Merchant Account name used by the Cloud API. Please leave it blank if the Merchant Account is the same as the one configured in the Required Settings</tooltip>
-            <config_path>payment/adyen_pos_cloud/pos_merchant_account</config_path>
-        </field>
-        <field id="pos_store_id" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Store ID for Cloud API</label>
-            <can_be_empty>1</can_be_empty>
-            <tooltip>Please insert your store ID used by the Cloud API. Please leave it blank if you want to retrieve all the terminals connected to your merchant account</tooltip>
-            <config_path>payment/adyen_pos_cloud/pos_store_id</config_path>
-        </field>
-        <field id="api_key_test" translate="label" type="obscure" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>API key for Cloud API TEST</label>
-            <tooltip>Copy this from the Test Adyen Customer Area => Settings => Users => System => [web service user]=> Checkout API Key.</tooltip>
-            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-            <config_path>payment/adyen_pos_cloud/api_key_test</config_path>
-            <comment model="Adyen\Payment\Model\Comment\ApiKeyEnding" />
-        </field>
-        <field id="api_key_live" translate="label" type="obscure" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>API key for Cloud API LIVE</label>
-            <tooltip>Copy this from the Live Adyen Customer Area => Settings => Users => System => [web service user]=> Checkout API Key.</tooltip>
-            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-            <config_path>payment/adyen_pos_cloud/api_key_live</config_path>
-            <comment model="Adyen\Payment\Model\Comment\ApiKeyEnding" />
-        </field>
-        <field id="capture_mode_pos" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Capture Delay</label>
-            <tooltip>Please set your Capture Delay for POS transactions. Immediate is the default. Set to manual if you want to perform the capture of funds manually later. You need to change this setting as well in Adyen Customer Area => Settings => Merchant Settings => POS Capture Delay. If you have selected a capture delay of a couple of days in Adyen keep it here on immediate</tooltip>
-            <source_model>Adyen\Payment\Model\Config\Source\CaptureMode</source_model>
-            <config_path>payment/adyen_pos_cloud/capture_mode_pos</config_path>
-        </field>
-        <field id="recurring_type" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Agreement Type</label>
-            <tooltip>You can set different value for POS because you have to have the permission of the customer</tooltip>
-            <source_model>Adyen\Payment\Model\Config\Source\RecurringType</source_model>
-            <config_path>payment/adyen_pos_cloud/recurring_type</config_path>
-            <comment>If you want to store the credentials for ONECLICK or RECURRING or combination of these two you need to contact support@adyen.com and ask if they can enable to store cards on company level. Changing this setting without doing this will lead to failed payments!</comment>
-        </field>
-        <field id="enable_installments" translate="label" type="select" sortOrder="219" showInDefault="1"
-               showInWebsite="1" showInStore="1">
-            <label>Enable Installments</label>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <tooltip>Enable installments for each credit card type.</tooltip>
-            <config_path>payment/adyen_pos_cloud/enable_installments</config_path>
-        </field>
-        <field id="installments" translate="label" sortOrder="220" showInDefault="1" showInWebsite="1"
-               showInStore="1">
-            <label>Installments</label>
-            <depends>
-                <field id="enable_installments">1</field>
-            </depends>
-            <tooltip>Configure your installment: Insert the minimum amount required to
-                make the configured installment available in the amount range column.
-                Example: if the amount range is configured to 100 and the number of installments to 4x, the shopper
-                will see the 4x option only if the payment total is higher or equal than 100.
-            </tooltip>
-            <frontend_model>Adyen\Payment\Block\Adminhtml\System\Config\Field\InstallmentsPosCloud</frontend_model>
-            <backend_model>Adyen\Payment\Model\Config\Backend\InstallmentsPosCloud</backend_model>
-            <config_path>payment/adyen_pos_cloud/installments</config_path>
-        </field>
-        <group id="adyen_pos_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="10" 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_pos_cloud/allowspecific</config_path>
-            </field>
-            <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" 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_pos_cloud/specificcountry</config_path>
-            </field>
-        </group>
-    </group>
-</include>
\ No newline at end of file

etc/adminhtml/system/adyen_required_settings.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_required_settings" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Required Settings]]></label>
-        <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-        <field id="merchant_account" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Merchant Account</label>
-            <config_path>payment/adyen_abstract/merchant_account</config_path>
-            <tooltip><![CDATA[The merchant account identifier you want to process the (transaction) request with. Find this at the top of the screen in the Adyen Customer Area, where you will see [YourCompanyAccount] > [YourMerchantAccount] . Please note that the merchant account is different from the company account; a company account can have one or more merchant accounts.]]></tooltip>
-            <comment><![CDATA[<a target="_blank" href="https://docs.adyen.com/developers/plugins/magento-2/set-up-the-plugin-in-magento#step3configuretheplugininmagento">Click here for explanation.</a>]]></comment>
-        </field>
-        <field id="demo_mode" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Test/Production Mode</label>
-            <source_model>Adyen\Payment\Model\Config\Source\DemoMode</source_model>
-            <config_path>payment/adyen_abstract/demo_mode</config_path>
-            <tooltip><![CDATA[ In the test mode you must use test cards. See section Documentation & Support for the link to the test cards]]></tooltip>
-        </field>
-        <field id="notification_username" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Notification User Name</label>
-            <config_path>payment/adyen_abstract/notification_username</config_path>
-            <tooltip>Set a user name of your choice here and copy it over to Adyen Customer Area => Settings => Server Communication => Standard Notification => User Name.</tooltip>
-        </field>
-        <field id="notification_password" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Notification Password</label>
-            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-            <config_path>payment/adyen_abstract/notification_password</config_path>
-            <tooltip>Set a password of your choice and copy it over to Adyen Customer Area => Settings => Server Communication => Standard Notification => Password.</tooltip>
-        </field>
-        <field id="api_key_test" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>API key for Test</label>
-            <tooltip>If you don't know your Api-Key, log in to your Test Customer Area. Navigate to Settings > Users > System, and click on your webservice user, normally this will be ws@Company.YourCompanyAccount. Under Checkout token is your API Key.</tooltip>
-            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-            <config_path>payment/adyen_abstract/api_key_test</config_path>
-            <comment model="Adyen\Payment\Model\Comment\ApiKeyEnding" />
-        </field>
-        <field id="api_key_live" translate="label" type="obscure" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>API key for Live</label>
-            <tooltip>If you don't know your Api-Key, log in to your Live Customer Area. Navigate to Settings > Users > System, and click on your webservice user, normally this will be ws@Company.YourCompanyAccount. Under Checkout token is your API Key.</tooltip>
-            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-            <config_path>payment/adyen_abstract/api_key_live</config_path>
-            <comment model="Adyen\Payment\Model\Comment\ApiKeyEnding" />
-        </field>
-        <field id="live_endpoint_url_prefix" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Live endpoint prefix</label>
-            <tooltip><![CDATA[e.g. if your live endpoint is: <br/> <i>https://1234a567bcd89ef0-MagentoCompany-checkout-live.adyenpayments.com</i> <br/> please type:  <strong>1234a567bcd89ef0-MagentoCompany</strong> in this field.]]></tooltip>
-            <comment><![CDATA[Provide the unique live url prefix: <strong>[random]-[company name]</strong> from the "API URLs and Response" menu in the Adyen Customer Area. For more information, please check <a href="https://docs.adyen.com/developers/development-resources/live-endpoints#checkoutendpoints">  our documentation</a>.]]></comment>
-            <config_path>payment/adyen_abstract/live_endpoint_url_prefix</config_path>
-        </field>
-
-        <field id="capture_mode" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Capture Delay</label>
-            <tooltip>Immediate is the default. Set to manual if you want to perform the capture of funds manually later (only affects credit cards and a few alternative payment methods). You need to change this setting as well in Adyen Customer Area => Settings => Merchant Settings => Capture Delay. If you have selected a capture delay of a couple of days in Adyen keep it here on immediate</tooltip>
-            <source_model>Adyen\Payment\Model\Config\Source\CaptureMode</source_model>
-            <config_path>payment/adyen_abstract/capture_mode</config_path>
-        </field>
-        <field id="order_status" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Order status: order creation</label>
-            <tooltip>Status given to newly created orders before payment result confirmation via server notifications from Adyen.</tooltip>
-            <source_model>Magento\Sales\Model\Config\Source\Order\Status\NewStatus</source_model>
-            <config_path>payment/adyen_abstract/order_status</config_path>
-        </field>
-        <field id="payment_pre_authorized" translate="label" type="select" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Order status: payment authorisation</label>
-            <tooltip>Status given to orders after authorisation confirmed by an AUTHORISATION notification from Adyen. Note: an authorisation status via the result URL does not yet trigger this status.</tooltip>
-            <source_model>Magento\Sales\Model\Config\Source\Order\Status\Newprocessing</source_model>
-            <config_path>payment/adyen_abstract/payment_pre_authorized</config_path>
-        </field>
-        <field id="payment_authorized" translate="label" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Order status: payment confirmed</label>
-            <tooltip>Status given to orders after capture result is confirmed by an AUTHORISATION notification (if capture mode = immediate) or a CAPTURE notification (if capture mode = manual capture) from Adyen.</tooltip>
-            <source_model>Magento\Sales\Model\Config\Source\Order\Status\Processing</source_model>
-            <config_path>payment/adyen_abstract/payment_authorized</config_path>
-        </field>
-        <field id="payment_cancelled" translate="label" type="select" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Order status: order cancellation</label>
-            <tooltip>Status given to orders after order cancellation is confirmed by a CANCEL_OR_REFUND notification from Adyen. If orders are already invoiced, they cannot be cancelled, but will be refunded instead.</tooltip>
-            <source_model>Adyen\Payment\Model\Config\Source\Cancelled</source_model>
-            <config_path>payment/adyen_abstract/payment_cancelled</config_path>
-        </field>
-        <field id="debug" translate="label" type="select" sortOrder="140" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Enable debug logging</label>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_abstract/debug</config_path>
-        </field>
-    </group>
-</include>

etc/adminhtml/system/developer_options/developer_options.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 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_file.xsd">
+    <label>Developer options</label>
+    <field id="debug" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Enable debug logging</label>
+        <comment><![CDATA[We recommend you leave this set to Yes. The log files can be found in <i>var/log/adyen/</i>]]></comment>
+        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+        <config_path>payment/adyen_abstract/debug</config_path>
+    </field>
+</include>

etc/adminhtml/system/adyen_billing_agreements.xml → etc/adminhtml/system/ecommerce_payments/advanced_options.xml

@@ -16,36 +16,28 @@
  *
  * Adyen Payment module (https://www.adyen.com/)
  *
- * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * Copyright (c) 2020 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_billing_agreements" translate="label" type="text" sortOrder="50" showInDefault="1"
-           showInWebsite="1" showInStore="1">
-        <label><![CDATA[Advanced: Billing Agreements]]></label>
-        <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-        <field id="enable_oneclick" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1"
-               showInStore="1">
-            <label>Enable OneClick</label>
-            <tooltip>The shopper opts in to storing their card details for future use. The shopper is present for the
-                subsequent transaction, for cards the security code (CVC/CVV) is required.
-            </tooltip>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_abstract/enable_oneclick</config_path>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Advanced options</label>
+    <field id="capture_mode" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Capture delay</label>
+        <source_model>Adyen\Payment\Model\Config\Source\CaptureMode</source_model>
+        <config_path>payment/adyen_abstract/capture_mode</config_path>
     </field>
-
-        <field id="enable_recurring" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1"
-               showInStore="1">
-            <label>Enable Recurring</label>
-            <tooltip>Payment details are stored for future use. For cards, the security
-                code (CVC/CVV) is not required for subsequent payments.
-            </tooltip>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_abstract/enable_recurring</config_path>
+    <field id="capture_mode_kar" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1"> <!--TODO: Combine fields 15 + 16 and aggregate fields into options-->
+        <label>Capture delay for Klarna, AfterPay, and RatePAY</label>
+        <!--source_model>Adyen\Payment\Model\Config\Source\KarCaptureMode?</source_model-->
+        <config_path>payment/adyen_abstract/kar_capture_mode</config_path>
+        <comment><![CDATA[This setting should only be changed when instructed by the Adyen <a href="https://support.adyen.com/hc/en-us/requests/new" target="_blank">support team</a>.]]></comment>
     </field>
-    </group>
-</include>
\ No newline at end of file
+    <field id="paypal_capture_mode" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Capture delay for PayPal</label>
+        <source_model>Adyen\Payment\Model\Config\Source\PaypalCaptureMode</source_model>
+        <config_path>payment/adyen_abstract/paypal_capture_mode</config_path>
+    </field>
+</config>

etc/adminhtml/system/adyen_getting_started.xml → etc/adminhtml/system/ecommerce_payments/ecommerce_payments.xml

@@ -16,29 +16,42 @@
  *
  * Adyen Payment module (https://www.adyen.com/)
  *
- * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * Copyright (c) 2020 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_getting_started" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Documentation & Support]]></label>
-        <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-        <comment><![CDATA[
-                            <ul class="adyen-list">
-                                <li><a target="_blank" href="https://docs.adyen.com/developers/plugins/magento-2">Manual for setting up the module</a></li>
-                                <li><a target="_blank" href="https://www.adyen.com/home/payment-services/plug-ins/magento#form"><strong>Sign</strong> up for a test account</a></li>
-                                <li>The latest version of the <a target="_blank" href="https://github.com/adyen/adyen-magento2/releases">Adyen Magento module is also available through GitHub</a>.</li>
-                            </ul>
-                            <p> In the test modus you need to use test cards. <a target="_blank" href="http://adyen.com/test-card-numbers">Test cards can be found here</a>
-                            <p>You can find this in the Adyen back-office. The Adyen back-office can be found on <a target="_blank" href="https://ca-test.adyen.com">https://ca-test.adyen.com</a> for test or <a target="_blank" href="https://ca-live.adyen.com">https://ca-live.adyen.com</a> for live.</p>
-                            <p>If you have any further questions, please visit the <a target="_blank" href="http://www.adyen.com">Adyen.com</a> website or email <a href="mailto:magento@adyen.com">magento@adyen.com</a>.</p>
-                            ]]></comment>
-        <field id="version" translate="label" type="label" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
-            <label>Extension version</label>
-            <frontend_model>\Adyen\Payment\Block\Adminhtml\System\Config\Field\Version</frontend_model>
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <comment><![CDATA[This information can be found in your <a href="https://ca-test.adyen.com/" target="_blank">Adyen Customer Area</a>.]]></comment>
+    <label>Adyen settings for ecommerce payments</label>
+    <field id="merchant_account" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Merchant Account</label>
+        <config_path>payment/adyen_abstract/merchant_account</config_path>
+    </field>
+    <field id="api_key_test" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>API key for test</label>
+        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+        <config_path>payment/adyen_abstract/api_key_test</config_path>
+        <comment model="Adyen\Payment\Model\Comment\ApiKeyEnding" />
+    </field>
+    <field id="api_key_live" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>API key for live</label>
+        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+        <config_path>payment/adyen_abstract/api_key_live</config_path>
+        <comment model="Adyen\Payment\Model\Comment\ApiKeyEnding" />
+    </field>
+    <field id="notification_username" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Username for standard notifications</label>
+        <config_path>payment/adyen_abstract/notification_username</config_path>
+    </field>
+    <field id="notification_password" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Password for standard notifications</label>
+        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+        <config_path>payment/adyen_abstract/notification_password</config_path>
+    </field>
+    <field id="live_endpoint_url_prefix" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Live endpoint URL prefix</label>
+        <config_path>payment/adyen_abstract/live_endpoint_url_prefix</config_path>
     </field>
-    </group>
 </include>

etc/adminhtml/system/ecommerce_payments/payment_links.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <comment><![CDATA[These settings are required if you want to use the payment links payment method.]]></comment>
+    <label>Settings for payment links</label>
+    <field id="skin_code" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Skin code</label>
+        <config_path>payment/adyen_pay_by_mail/skin_code</config_path>
+    </field>
+    <field id="hmac_test" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>HMAC Key for test</label>
+        <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="30" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>HMAC Key for live</label>
+        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+        <config_path>payment/adyen_pay_by_mail/hmac_live</config_path>
+    </field>
+</config>

etc/adminhtml/system/adyen_advanced_notifications.xml → etc/adminhtml/system/header.xml

@@ -16,21 +16,17 @@
  *
  * Adyen Payment module (https://www.adyen.com/)
  *
- * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * Copyright (c) 2020 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_advanced_notifications" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Advanced: Adyen Payment Notifications]]></label>
-        <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-        <field id="ignore_refund_notification" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Ignore refund notification</label>
-            <tooltip>If the refund is done on the Adyen Platform it will send a refund notification to Magento which automatically creates a credit memo. If you set this setting to 'Yes', this will not happen because it will not process any of the REFUND notification that is received.</tooltip>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/adyen_abstract/ignore_refund_notification</config_path>
-        </field>
-    </group>
+    <frontend_model>Adyen\Payment\Block\System\Config\Header</frontend_model>
+    <comment><![CDATA[
+    <p>Adyen all-in-one payments platform</p>
+    <p>Offer key payment methods anywhere in the world at the flick of a switch.</p>
+    <p>Easy integration with our in-house built Magento Plugin, no set-up fee.</p>
+    ]]></comment>
 </include>

etc/adminhtml/system/header_links.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 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">
+    <field id="adyen_header_links" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
+        <frontend_model>Adyen\Payment\Block\System\Config\Links</frontend_model>
+    </field>
+</include>

etc/adminhtml/system/adyen_split_payment.xml → etc/adminhtml/system/main.xml

@@ -16,30 +16,24 @@
  *
  * Adyen Payment module (https://www.adyen.com/)
  *
- * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * Copyright (c) 2020 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_split_payment" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Advanced: Split Payment]]></label>
-        <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-        <comment>
-            <![CDATA[
-                <p>
-                It is possible to do split payments with GiftCards please configure here what refund strategie you want to use
-                </p>
-            ]]>
-        </comment>
-
-        <field id="split_payments_refund_strategy" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Refund Strategy</label>
-            <tooltip>Only relevant if you accept giftcards on Adyen platform</tooltip>
-            <source_model>Adyen\Payment\Model\Config\Source\SplitPaymentRefundStrategy</source_model>
-            <config_path>payment/adyen_abstract/split_payments_refund_strategy</config_path>
+    <field id="demo_mode" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Environment</label>
+        <source_model>Adyen\Payment\Model\Config\Source\DemoMode</source_model>
+        <config_path>payment/adyen_abstract/demo_mode</config_path>
+    </field>
+    <field id="shopper_locale" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Locale</label>
+        <config_path>payment/adyen_hpp/shopper_locale</config_path>
+    </field>
+    <field id="version" translate="label" type="label" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Plugin version</label>
+        <frontend_model>\Adyen\Payment\Block\Adminhtml\System\Config\Field\Version</frontend_model>
     </field>
-
-    </group>
 </include>

etc/adminhtml/system/order_management/order_management.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 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_file.xsd">
+    <label>Magento order management</label>
+    <comment><![CDATA[Manage the status assigned to an order when there is an update in the payment process. To learn more about the different stages of the payment process, refer to <a href="https://docs.adyen.com/developers/plug-ins-and-partners/magento-2/order-management-in-magento" target="_blank">Adyen documentation</a>.]]></comment>
+    <field id="order_status" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Order creation</label>
+        <source_model>Magento\Sales\Model\Config\Source\Order\Status\NewStatus</source_model><!--TODO: Check source model for available options and plan migration script-->
+        <config_path>payment/adyen_abstract/order_status</config_path>
+    </field>
+    <field id="payment_pre_authorized" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Payment authorisation</label>
+        <source_model>Magento\Sales\Model\Config\Source\Order\Status\Newprocessing</source_model><!--TODO: Check source model for available options and plan migration script-->
+        <config_path>payment/adyen_abstract/payment_pre_authorized</config_path>
+    </field>
+    <field id="payment_authorized" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Payment capture</label>
+        <source_model>Magento\Sales\Model\Config\Source\Order\Status\Processing</source_model><!--TODO: Check source model for available options and plan migration script-->
+        <config_path>payment/adyen_abstract/payment_authorized</config_path>
+    </field>
+    <field id="payment_authorized_virtual" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Payment capture (virtual products)</label>
+        <source_model>Adyen\Payment\Model\Config\Source\Complete</source_model>
+        <config_path>payment/adyen_abstract/payment_authorized_virtual</config_path><!--TODO: Check source model for available options and plan migration script-->
+    </field>
+    <field id="payment_cancelled" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Order cancellation</label>
+        <source_model>Adyen\Payment\Model\Config\Source\Cancelled</source_model>
+        <config_path>payment/adyen_abstract/payment_cancelled</config_path><!--TODO: Check source model for available options and plan migration script-->
+    </field>
+    <field id="fraud_manual_review_status" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Under manual review</label>
+        <source_model>Magento\Sales\Model\Config\Source\Order\Status\NewStatus</source_model>
+        <config_path>payment/adyen_abstract/fraud_manual_review_status</config_path><!--TODO: Check source model for available options and plan migration script-->
+    </field>
+    <field id="fraud_manual_review_accept_status" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Manual review accepted</label>
+        <source_model>Magento\Sales\Model\Config\Source\Order\Status\Processing</source_model>
+        <config_path>payment/adyen_abstract/fraud_manual_review_accept_status</config_path><!--TODO: Check source model for available options and plan migration script-->
+    </field>
+    <field id="send_email_bank_sepa_on_pending" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Send order confirmation email for Bank Transfer/SEPA</label>
+        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+        <config_path>payment/adyen_abstract/send_email_bank_sepa_on_pending</config_path><!--TODO: Check source model for available options and plan migration script-->
+    </field>
+    <field id="ignore_refund_notification" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Ignore refund notification</label>
+        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+        <config_path>payment/adyen_abstract/ignore_refund_notification</config_path><!--TODO: Check source model for available options and plan migration script-->
+    </field>
+</include>

etc/adminhtml/system/payment_methods/apple_pay/apple_pay.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Apple Pay</label>
+    <comment><![CDATA[Accept Apple Pay payments from shoppers. To learn how to enable Apple Pay, read <a href="https://docs.adyen.com/payment-methods/apple-pay/enable-apple-pay" target="_blank">Adyen documentation</a>.]]></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_apple_pay/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_apple_pay/title</config_path>
+    </field>
+    <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Sort order</label>
+        <frontend_class>validate-number</frontend_class>
+        <config_path>payment/adyen_apple_pay/sort_order</config_path>
+    </field>
+    <field id="merchant_identifier_test" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Apple merchant identifier for test</label>
+        <config_path>payment/adyen_apple_pay/merchant_identifier_test</config_path>
+    </field>
+    <field id="full_path_location_pem_file_test" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>PEM file location for test</label>
+        <config_path>payment/adyen_apple_pay/full_path_location_pem_file_test</config_path>
+    </field>
+    <field id="merchant_identifier_live" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Apple merchant identifier for live</label>
+        <config_path>payment/adyen_apple_pay/merchant_identifier_live</config_path>
+    </field>
+    <field id="full_path_location_pem_file_live" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>PEM file location for live</label>
+        <config_path>payment/adyen_apple_pay/full_path_location_pem_file_live</config_path>
+    </field>
+</config>

etc/adminhtml/system/payment_methods/billing_agreements/billing_agreements.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Billing Agreements</label>
+    <comment><![CDATA[Accept one-click or recurring payments from shoppers' stored billing agreements.]]></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_oneclick/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_oneclick/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_oneclick/sort_order</config_path>
+    </field>
+    <field id="recurring_payment_type" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Accepted billing agreements</label>
+        <source_model>Adyen\Payment\Model\Config\Source\RecurringPaymentType</source_model>
+        <config_path>payment/adyen_oneclick/recurring_payment_type</config_path>
+    </field>
+</config>

etc/adminhtml/system/payment_methods/boleto/boleto.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Boleto</label>
+    <comment><![CDATA[Accept boleto payments from shoppers.]]></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_boleto/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_boleto/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_boleto/sort_order</config_path>
+    </field>
+    <field id="delivery_days" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Days for delivery and payment</label>
+        <frontend_class>validate-number</frontend_class>
+        <config_path>payment/adyen_boleto/delivery_days</config_path>
+    </field>
+    <field id="allowspecific_boleto" translate="label" type="allowspecific" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Applicable countries</label>
+        <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+        <config_path>payment/adyen_boleto/allowspecific</config_path>
+    </field>
+    <field id="specificcountry" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
+        <depends>
+            <field id="allowspecific_boleto">1</field>
+        </depends>
+        <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_boleto/specificcountry</config_path>
+    </field>
+</config>

etc/adminhtml/system/payment_methods/cards/advanced_options.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Advanced options</label>
+    <field id="enable_card_types" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Accepted card types</label>
+        <source_model>Adyen\Payment\Model\Config\Source\AcceptedCardTypes</source_model>
+        <config_path>payment/adyen_cc/enablecctypes</config_path>
+    </field>
+    <field id="cctypes" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
+        <depends>
+            <field id="enable_card_types">1</field>
+        </depends>
+        <label>Custom selection</label>
+        <source_model>Adyen\Payment\Model\Config\Source\CcType</source_model>
+        <config_path>payment/adyen_cc/cctypes</config_path>
+        <comment><![CDATA[The selected types need to be enabled on your merchant account.]]></comment>
+    </field>
+    <field id="title" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Share billing agreements between stores</label>
+        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+        <config_path>payment/adyen_oneclick/share_billing_agreement</config_path> <!--TODO: Check which is the correct config path. Duplicated field in prototype (43)-->
+    </field>
+    <field id="enable_installments" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Enable installments</label>
+        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+        <config_path>payment/adyen_cc/enable_installments</config_path>
+    </field>
+    <field id="installments" translate="label" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Installments</label>
+        <depends>
+            <field id="enable_installments">1</field>
+        </depends>
+        <tooltip>Configure your installment for each card type: Insert the minimum amount required to
+            make the configured installment available in the amount range column.
+            Example: if the amount range is configured to 100 and the number of installments to 4x, the shopper
+            will see the 4x option only if the payment total is higher or equal than 100.
+        </tooltip>
+        <frontend_model>Adyen\Payment\Block\Adminhtml\System\Config\Field\Installments</frontend_model>
+        <backend_model>Adyen\Payment\Model\Config\Backend\Installments</backend_model>
+        <config_path>payment/adyen_cc/installments</config_path>
+    </field>
+    <field id="allowspecific_cards" translate="label" type="allowspecific" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Applicable countries</label>
+        <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model><!--TODO: Replace with custom source model-->
+        <config_path>payment/adyen_cc/allowspecific</config_path>
+    </field>
+    <field id="specificcountry" translate="label" type="multiselect" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Custom selection</label>
+        <depends>
+            <field id="allowspecific_cards">1</field>
+        </depends>
+        <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+        <can_be_empty>1</can_be_empty>
+        <config_path>payment/adyen_cc/specificcountry</config_path>
+    </field>
+</config>

etc/adminhtml/system/payment_methods/cards/cards.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Cards</label>
+    <comment><![CDATA[Accept credit and debit card payments from shoppers.]]></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_cc/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_cc/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_cc/sort_order</config_path>
+    </field>
+</config>

etc/adminhtml/system/payment_methods/cards/stored_card_details.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Stored card details options</label>
+    <comment><![CDATA[Adyen can securely store shopper card details to enable recurring payments. See which cards support recurring on <a href="https://docs.adyen.com/payment-methods#credit-and-debit-cards" target="_blank">Adyen documentation</a>.]]]></comment>
+    <!--TODO: Define new fields about Store Recurring Contracts-->
+</config>

etc/adminhtml/system/payment_methods/google_pay/google_pay.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Google Pay</label>
+    <comment><![CDATA[Accept Google Pay payments from shoppers.]]></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_google_pay/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_google_pay/title</config_path>
+    </field>
+    <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Sort order</label>
+        <frontend_class>validate-number</frontend_class>
+        <config_path>payment/adyen_google_pay/sort_order</config_path>
+    </field>
+    <field id="merchant_identifier" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Google Merchant ID</label>
+        <config_path>payment/adyen_google_pay/merchant_identifier</config_path>
+    </field>
+</config>

etc/adminhtml/system/payment_methods/local_payment_methods/advanced_options.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Advanced options</label>
+    <field id="shopper_country" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Shopper country</label>
+        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+        <!--config_path></config_path--> <!--TODO: New field? Yes-->
+    </field>
+    <field id="ratepay_id" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>RatePAY Device Ident SId</label>
+        <tooltip>Unique RatePAY Id provided by RatePAY integration consultant</tooltip>
+        <config_path>payment/adyen_hpp/ratepay_id</config_path>
+    </field>
+    <field id="split_payments_refund_strategy" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Refunds that include gift cards</label>
+        <comment><![CDATA[Learn more about refunds that include gift cards on <a href="https://docs.adyen.com/plugins/magento-2/set-up-the-plugin-in-magento/#split-payment" target="_blank">Adyen documentation</a>.]]></comment>
+        <source_model>Adyen\Payment\Model\Config\Source\SplitPaymentRefundStrategy</source_model>
+        <config_path>payment/adyen_abstract/split_payments_refund_strategy</config_path>
+    </field>
+    <field id="allowspecific_local_payment_methods" translate="label" type="allowspecific" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Applicable countries</label>
+        <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+        <config_path>payment/adyen_hpp/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>
+        <depends>
+            <field id="allowspecific_local_payment_methods">1</field>
+        </depends>
+        <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+        <can_be_empty>1</can_be_empty>
+        <config_path>payment/adyen_hpp/specificcountry</config_path>
+    </field>
+</config>

etc/adminhtml/system/payment_methods/local_payment_methods/local_payment_methods.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Local payment methods</label>
+    <comment><![CDATA[Accept local payment methods from shoppers.]]></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_hpp/active</config_path>
+    </field>
+    <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Title</label>
+        <frontend_model>Adyen\Payment\Block\System\Config\LpmTitle</frontend_model>
+    </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_hpp/sort_order</config_path>
+    </field>
+</config>

etc/adminhtml/system/payment_methods/local_payment_methods/stored_payment_method_details.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Stored payment method details options</label>
+    <comment><![CDATA[Adyen can securely store shoppers' local payment method details to enable recurring payments. See which local payment methods support recurring on <a href="https://docs.adyen.com/payment-methods#cash-and-atm-payment-methods" target="_blank">Adyen documentation</a>.]]]></comment>
+    <!--TODO: GRANTC Define new fields about Store Recurring Payments-->
+</config>

etc/adminhtml/system/payment_methods/payment_links/payment_links.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Payment Links</label>
+    <comment><![CDATA[Create an order and send an Adyen payment link directly to the shopper. Make sure you have filled out the settings for payment links (under Adyen settings for ecommerce payments).]]></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>Days until link expires</label>
+        <config_path>payment/adyen_pay_by_mail/session_validity</config_path>
+    </field>
+    <field id="allowspecific_payment_links" translate="label" type="allowspecific" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>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">
+        <depends>
+            <field id="allowspecific_payment_links">1</field>
+        </depends>
+        <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>
+</config>

etc/adminhtml/system/payment_methods/payment_methods.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 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_file.xsd">
+    <label>Payment methods</label>
+</include>

etc/adminhtml/system/payment_methods/pos/advanced_options.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Advanced options</label>
+    <field id="allowspecific_pos" translate="label" type="allowspecific" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Applicable countries</label>
+        <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+        <config_path>payment/adyen_pos_cloud/allowspecific</config_path>
+    </field>
+    <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
+        <depends>
+            <field id="allowspecific_pos">1</field>
+        </depends>
+        <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_pos_cloud/specificcountry</config_path>
+    </field>
+</config>

etc/adminhtml/system/payment_methods/pos/pos.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Point of sale</label>
+    <comment><![CDATA[Accept point-of-sale payments from shoppers. Make sure you have filled out the Adyen settings for point-of-sale payments.]]></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_pos_cloud/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_pos_cloud/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_pos_cloud/sort_order</config_path>
+    </field>
+</config>

etc/adminhtml/system/payment_methods/pos/stored_payment_details.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Stored payment details options</label>
+    <comment><![CDATA[Adyen can securely store shoppers' payment details for recurring payments.]]></comment>
+    <field id="recurring_type" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Store for one-click payments</label>
+        <tooltip>One-click payments require the shopper to enter their security code (CVC, CVV, CID).</tooltip>
+        <source_model>Adyen\Payment\Model\Config\Source\RecurringType</source_model><!--TODO: Split original field-->
+        <config_path>payment/adyen_pos_cloud/recurring_type</config_path>
+    </field>
+    <field id="recurring_payments" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1"><!--TODO: new field? Yes-->
+        <label>Store for one-click payments</label>
+        <tooltip>One-click payments require the shopper to enter their security code (CVC, CVV, CID).</tooltip>
+        <source_model>Adyen\Payment\Model\Config\Source\RecurringType</source_model><!--TODO: Split original field-->
+        <!--config_path>payment/adyen_pos_cloud/recurring_type</config_path-->
+    </field>
+</config>

etc/adminhtml/system/pos_payments/advanced_options.xml

+<?xml version="1.0"?>
+<!--
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <label>Advanced options</label>
+    <field id="terminal_selection" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Terminal selection</label>
+        <source_model>Adyen\Payment\Model\Config\Source\TerminalSelection</source_model>
+        <config_path>payment/adyen_pos_cloud/terminal_selection</config_path>
+    </field>
+    <field id="pos_store_id" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+        <depends>
+            <field id="terminal_selection">store_level</field>
+        </depends>
+        <label>Store ID</label>
+        <config_path>payment/adyen_pos_cloud/pos_store_id</config_path>
+    </field>
+    <field id="capture_mode_pos" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>POS Capture Delay</label>
+        <source_model>Adyen\Payment\Model\Config\Source\PosCaptureMode</source_model>
+        <config_path>payment/adyen_pos_cloud/capture_mode_pos</config_path>
+    </field>
+</config>

etc/adminhtml/system/adyen_checkout_experience.xml → etc/adminhtml/system/pos_payments/pos_payments.xml

@@ -16,31 +16,30 @@
  *
  * Adyen Payment module (https://www.adyen.com/)
  *
- * Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
+ * Copyright (c) 2020 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_checkout_experience" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label><![CDATA[Advanced: Checkout Experience]]></label>
-        <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-        <comment>
-            <![CDATA[
-            ]]>
-        </comment>
-
-        <field id="title_renderer" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Payment method render method</label>
-            <tooltip>Determines whether the payment methods will be displayed with its logo or just the name.</tooltip>
-            <source_model>Adyen\Payment\Model\Config\Source\RenderMode</source_model>
-            <config_path>payment/adyen_abstract/title_renderer</config_path>
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <comment><![CDATA[This information can be found in your <a href="https://ca-test.adyen.com/" target="_blank">Adyen Customer Area</a>.]]></comment>
+    <label>Adyen settings for point-of-sale payments</label>
+    <field id="pos_merchant_account" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>Merchant account</label>
+        <can_be_empty>1</can_be_empty>
+        <config_path>payment/adyen_pos_cloud/pos_merchant_account</config_path>
     </field>
-        <field id="return_path" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-            <label>Checkout Return Path</label>
-            <config_path>payment/adyen_abstract/return_path</config_path>
-            <tooltip><![CDATA[The path the customer will be redirected to when payment was <b>not</b> successful. Default is <i>checkout/cart</i>.]]></tooltip>
+    <field id="api_key_test" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>API key for test</label>
+        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+        <config_path>payment/adyen_pos_cloud/api_key_test</config_path>
+        <comment model="Adyen\Payment\Model\Comment\ApiKeyEnding" />
+    </field>
+    <field id="api_key_live" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+        <label>API key for live</label>
+        <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+        <config_path>payment/adyen_pos_cloud/api_key_live</config_path>
+        <comment model="Adyen\Payment\Model\Comment\ApiKeyEnding" />
     </field>
-    </group>
 </include>

view/adminhtml/templates/form/cc.phtml

@@ -87,7 +87,7 @@ echo $code; ?>" style="display:none">
                 "Magento_Sales/order/create/form"
             ],
             function () {
-                var ccTypes = <?php echo json_encode($block->getCcAvailableTypesByAlt()); ?>;
+                var ccTypes = <?php echo json_encode($block->getCardAvailableTypes()); ?>;
 
                 //<![CDATA[
 

view/adminhtml/templates/system/config/adyen_header_links.phtml

+<?php
+/**
+ * @var Adyen\Payment\Block\System\Config\Links $block
+ */
+echo $block->outputLinks();
\ No newline at end of file

view/adminhtml/web/css/source/_module.less

+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2020 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+.adyen-config-column {
+  display: inline-block;
+  vertical-align: middle;
+  line-height: 1.5;
+  margin-bottom: .5em;
+  margin-top: 1rem;
+
+  &.adyen-config-logo {
+    width: 18%;
+    background-image: url("@{baseDir}Adyen_Payment/images/adyen-logo.png");
+    background-repeat: no-repeat;
+    height: 55px;
+    background-size: 110px;
+  }
+  &.adyen-config-comment{
+    width: 60%;
+  }
+  &.adyen-config-button{
+    width: 22%;
+    text-align: right;
+  }
+}
+
+.adyen-header-links{
+  clear: both;
+}
+
+.adyen-ecommerce-payments-config{
+  padding-top: 2rem;
+}