Skip to content

A
Adyen Magento2
Commit 03c73ce5 authored by Alexandros Moraitis's avatar Alexandros Moraitis Committed by acampos1916
Browse files
Options

[PW-1680] Update admin UI: Adyen settings for ecommerce payments (#527) 

* Update admin UI: Adyen settings for ecommerce payments

* Update admin UI: Add file Adyen settings ecommerce payments

* Correct typo

* Change the sord order number of items
parent 458cab3d
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 77 deletions
etc/adminhtml/system.xml
View file @ 03c73ce5
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model> <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_getting_started.xml"/>
<include path="Adyen_Payment::system/adyen_global_settings.xml"/> <include path="Adyen_Payment::system/adyen_global_settings.xml"/>
<include path="Adyen_Payment::system/adyen_settings_ecommerce_payments.xml"/>
<include path="Adyen_Payment::system/adyen_required_settings.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_order_processing.xml"/>
<include path="Adyen_Payment::system/adyen_advanced_notifications.xml"/> <include path="Adyen_Payment::system/adyen_advanced_notifications.xml"/>
......
etc/adminhtml/system/adyen_advanced_order_processing.xml
View file @ 03c73ce5
...@@ -26,24 +26,12 @@ ...@@ -26,24 +26,12 @@
<group id="adyen_advanced_order_processing" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1"> <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> <label><![CDATA[Advanced: Magento Order Processing]]></label>
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model> <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"> <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> <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> <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> <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>payment/adyen_abstract/capture_on_shipment</config_path> <config_path>payment/adyen_abstract/capture_on_shipment</config_path>
</field> </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"> <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> <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> <tooltip>(optional) Select only status assigned to state complete. Leave empty to use the same as normal products</tooltip>
......
etc/adminhtml/system/adyen_global_settings.xml
View file @ 03c73ce5
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* *
* Adyen Payment module (https://www.adyen.com/) * Adyen Payment module (https://www.adyen.com/)
* *
* Copyright (c) 2015 Adyen BV (https://www.adyen.com/) * Copyright (c) 2019 Adyen BV (https://www.adyen.com/)
* See LICENSE.txt for license details. * See LICENSE.txt for license details.
* *
* Author: Adyen <magento@adyen.com> * Author: Adyen <magento@adyen.com>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
]]> ]]>
</comment> </comment>
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model> <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
<field id="demo_mode" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" <field id="demo_mode" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1"
showInStore="1"> showInStore="1">
<label>Environment</label> <label>Environment</label>
<source_model>Adyen\Payment\Model\Config\Source\DemoMode</source_model> <source_model>Adyen\Payment\Model\Config\Source\DemoMode</source_model>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<tooltip> <tooltip>
<![CDATA[ In the test mode you must use test cards. See section Documentation & Support for the link to the test cards]]></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>
<field id="shopper_locale" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" <field id="shopper_locale" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1"
showInStore="1"> showInStore="1">
<label>Locale</label> <label>Locale</label>
<tooltip>This will override the default shopper locale of the Magento store (e.g. nl_NL). Leave empty to let <tooltip>This will override the default shopper locale of the Magento store (e.g. nl_NL). Leave empty to let
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<source_model>Magento\Config\Model\Config\Source\Locale</source_model> <source_model>Magento\Config\Model\Config\Source\Locale</source_model>
<backend_model>Adyen\Payment\Model\Config\Backend\Locale</backend_model> <backend_model>Adyen\Payment\Model\Config\Backend\Locale</backend_model>
</field> </field>
<field id="version" translate="label" type="label" sortOrder="40" showInDefault="1" showInWebsite="1" <field id="version" translate="label" type="label" sortOrder="30" showInDefault="1" showInWebsite="1"
showInStore="1"> showInStore="1">
<label>Plugin version</label> <label>Plugin version</label>
<frontend_model>\Adyen\Payment\Block\Adminhtml\System\Config\Field\Version</frontend_model> <frontend_model>\Adyen\Payment\Block\Adminhtml\System\Config\Field\Version</frontend_model>
......
etc/adminhtml/system/adyen_pay_by_mail.xml
View file @ 03c73ce5
...@@ -47,23 +47,6 @@ ...@@ -47,23 +47,6 @@
<tooltip>How many days do you want this payment page to be active</tooltip> <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> <config_path>payment/adyen_pay_by_mail/session_validity</config_path>
</field> </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"> <group id="adyen_pay_by_mail_country_specific" translate="label" showInDefault="1" showInWebsite="1" sortOrder="210">
<label>Country Specific Settings</label> <label>Country Specific Settings</label>
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model> <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
......
etc/adminhtml/system/adyen_required_settings.xml
View file @ 03c73ce5
...@@ -26,50 +26,6 @@ ...@@ -26,50 +26,6 @@
<group id="adyen_required_settings" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1"> <group id="adyen_required_settings" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label><![CDATA[Required Settings]]></label> <label><![CDATA[Required Settings]]></label>
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model> <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="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"> <field id="order_status" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Order status: order creation</label> <label>Order status: order creation</label>
<tooltip>Status given to newly created orders before payment result confirmation via server notifications from Adyen.</tooltip> <tooltip>Status given to newly created orders before payment result confirmation via server notifications from Adyen.</tooltip>
......
etc/adminhtml/system/adyen_settings_ecommerce_payments.xml 0 → 100644
View file @ 03c73ce5
<?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_settings_ecommerce_payments" translate="label" type="text" sortOrder="10" showInDefault="1"
showInWebsite="1"
showInStore="1">
<label><![CDATA[Adyen settings for ecommerce payments]]></label>
<comment><![CDATA[These settings need to be copied over from your Adyen Customer Area]]></comment>
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
<field id="merchant_account" translate="label" type="text" sortOrder="20" 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="30" showInDefault="1" showInWebsite="1"
showInStore="0">
<label>API key for Test</label>
<tooltip>If value exists, display: "Key stored ending in ****", showing the last 4 values of the stored 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="40" showInDefault="1" showInWebsite="1"
showInStore="0">
<label>API key for Live</label>
<tooltip>If value exists, display: "Key stored ending in ****", showing the last 4 values of the stored 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="notification_username" translate="label" type="text" sortOrder="50" showInDefault="1"
showInWebsite="1" showInStore="0">
<label>Standard notification username</label>
<config_path>payment/adyen_abstract/notification_username</config_path>
</field>
<field id="notification_password" translate="label" type="obscure" sortOrder="60" showInDefault="1"
showInWebsite="1" showInStore="0">
<label>Standard notification password</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="70" showInDefault="1"
showInWebsite="1" showInStore="0">
<label>Live endpoint prefix</label>
<config_path>payment/adyen_abstract/live_endpoint_url_prefix</config_path>
</field>
<field id="advanced_settings" translate="label" sortOrder="80" showInDefault="1" showInWebsite="1">
<label>Advanced settings</label>
<frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
<attribute type="shared">1</attribute>
</field>
<field id="support_link" translate="label" sortOrder="90" showInDefault="1" showInWebsite="1">
<label><![CDATA[Before changing these settings, make sure to contact our <a target="_blank" href="https://support.adyen.com/hc/en-us/requests/new">support team</a>]]></label>
<frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
<attribute type="shared">0</attribute>
</field>
<field id="capture_mode" translate="label" type="select" sortOrder="100" 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="auto_capture_openinvoice" translate="label" type="select" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Open invoice capture delay</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>payment/adyen_abstract/auto_capture_openinvoice</config_path>
</field>
<field id="paypal_capture_mode" translate="label" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
<label>PayPal capture delay</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>payment/adyen_abstract/paypal_capture_mode</config_path>
</field>
<field id="payment_link_settings" translate="label" sortOrder="130" showInDefault="1" showInWebsite="1">
<label>Payment link settings</label>
<frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
<attribute type="shared">1</attribute>
</field>
<field id="payment_link_settings_subtitle" translate="label" sortOrder="130" showInDefault="1" showInWebsite="1">
<label>These settings are required if you want to use the Payment link payment method.</label>
<frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
<attribute type="shared">0</attribute>
</field>
<field id="skin_code" translate="label" type="text" sortOrder="140" 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="150" 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="160" 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>
</group>
</include>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment