Merge branch 'develop' of https://github.com/Adyen/adyen-magento2 into develop

composer.json

@@ -2,7 +2,7 @@
   "name": "adyen/module-payment",
   "description": "Official Magento2 Plugin to connect to Payment Service Provider Adyen.",
   "type": "magento2-module",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

etc/adminhtml/system.xml

@@ -25,7 +25,7 @@
 <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="1" 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>

etc/di.xml

@@ -597,7 +597,7 @@
     </virtualType>
     <virtualType name="AdyenOneclickCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
         <arguments>
-            <argument name="config" xsi:type="object">AdyenPaymentOneClickConfig</argument>
+            <argument name="config" xsi:type="object">AdyenPaymentOneclickConfig</argument>
         </arguments>
     </virtualType>
 

etc/events.xml

@@ -27,7 +27,7 @@
         <observer name="adyen_cc_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenCcDataAssignObserver" />
     </event>
     <event name="payment_method_assign_data_adyen_oneclick">
-        <observer name="adyen_cc_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenOneclickDataAssignObserver" />
+        <observer name="adyen_oneclick_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenOneclickDataAssignObserver" />
     </event>
     <event name="payment_method_assign_data_adyen_hpp">
         <observer name="adyen_hpp_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenHppDataAssignObserver" />

etc/module.xml

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

etc/payment.xml

@@ -33,6 +33,9 @@
         <method name="adyen_cc">
             <allow_multiple_address>1</allow_multiple_address>
         </method>
+        <method name="adyen_oneclick">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
         <method name="adyen_hpp">
             <allow_multiple_address>0</allow_multiple_address>
         </method>

etc/webrestrictions.xml

+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_WebsiteRestriction:etc/webrestrictions.xsd">
+    <action path="adyen_process_json" type="generic" />
+</config>
\ No newline at end of file