Skip to content

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

[PW-1677]UI changes and refactor for pw-1678 (#535) 

* UI changes for pw-1677, Refactor for pw-1678

* Add new logo, remove tooltips

* Remove files

* Remove wrong html file

* Change the section title
parent 03c73ce5
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 31 deletions
Block/Adminhtml/System/Config/Fieldset/Expanded.php 0 → 100644
View file @ ac1f9d92
<?php
/**
* ######
* ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* Adyen Payment module (https://www.adyen.com/)
*
* Copyright (c) 2019 Adyen BV (https://www.adyen.com/)
* See LICENSE.txt for license details.
*
* Author: Adyen <magento@adyen.com>
*/
namespace Adyen\Payment\Block\Adminhtml\System\Config\Fieldset;
/**
* Fieldset renderer which expanded by default
*/
class Expanded extends \Magento\Config\Block\System\Config\Form\Fieldset
{
/**
* Whether is collapsed by default
*
* @var bool
*/
protected $isCollapsedDefault = true;
}
etc/adminhtml/system.xml
View file @ ac1f9d92
......@@ -26,13 +26,14 @@
<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>
<label><![CDATA[<div class="adyen-payment-logo"></div><div class="adyen-payment-byline">All-in-one payments platform<br/></div>]]></label>
<comment><![CDATA[<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>
<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"/>
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
<include path="Adyen_Payment::system/adyen_global_settings.xml"/>
<include path="Adyen_Payment::system/adyen_getting_started.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_advanced_order_processing.xml"/>
......
etc/adminhtml/system/adyen_apple_pay.xml
View file @ ac1f9d92
......@@ -24,7 +24,7 @@
<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>
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</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">
......
etc/adminhtml/system/adyen_boleto.xml
View file @ ac1f9d92
......@@ -25,7 +25,7 @@
<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>
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</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">
......
etc/adminhtml/system/adyen_cc.xml
View file @ ac1f9d92
......@@ -27,7 +27,7 @@
<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>
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</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"
......
etc/adminhtml/system/adyen_global_settings.xml
View file @ ac1f9d92
......@@ -29,16 +29,16 @@
<label><![CDATA[Global Settings]]></label>
<comment><![CDATA[
<b>
<a target="_blank" href="https://docs.adyen.com/plugins/magento-2">Docs</a>|
<a target="_blank" href="https://support.adyen.com/hc/en-us/sections/360000809984-Plugins">FAQs</a>|
<a target="_blank" href="https://support.adyen.com/hc/en-us/requests/new">Support</a>|
<a target="_blank" href="https://www.adyen.com/status">Platform status</a>|
<a target="_blank" href="https://github.com/Adyen/adyen-magento2/releases">GitHub</a>|
<a target="_blank" href="https://marketplace.magento.com/adyen-module-payment.html">Magento Marketplace</a>|
<a target="_blank" href="https://docs.adyen.com/plugins/magento-2">Docs</a>&nbsp;|&nbsp;
<a target="_blank" href="https://support.adyen.com/hc/en-us/sections/360000809984-Plugins">FAQs</a>&nbsp;|&nbsp;
<a target="_blank" href="https://support.adyen.com/hc/en-us/requests/new">Support</a>&nbsp;|&nbsp;
<a target="_blank" href="https://www.adyen.com/status">Platform status</a>&nbsp;|&nbsp;
<a target="_blank" href="https://github.com/Adyen/adyen-magento2/releases">GitHub</a>&nbsp;|&nbsp;
<a target="_blank" href="https://marketplace.magento.com/adyen-module-payment.html">Magento Marketplace</a>
</b>
]]>
</comment>
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
<frontend_model>Adyen\Payment\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
<field id="demo_mode" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1"
showInStore="1">
<label>Environment</label>
......
etc/adminhtml/system/adyen_google_pay.xml
View file @ ac1f9d92
......@@ -24,7 +24,7 @@
<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>
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</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">
......
etc/adminhtml/system/adyen_hpp.xml
View file @ ac1f9d92
......@@ -25,7 +25,7 @@
<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>
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</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">
......
etc/adminhtml/system/adyen_oneclick.xml
View file @ ac1f9d92
......@@ -25,7 +25,7 @@
<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>
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</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>
......
etc/adminhtml/system/adyen_pay_by_mail.xml
View file @ ac1f9d92
......@@ -25,7 +25,7 @@
<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>
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</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">
......
etc/adminhtml/system/adyen_pos_cloud.xml
View file @ ac1f9d92
......@@ -24,7 +24,7 @@
<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>
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</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">
......
etc/adminhtml/system/adyen_settings_ecommerce_payments.xml
View file @ ac1f9d92
......@@ -38,8 +38,6 @@
<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"/>
......@@ -47,8 +45,6 @@
<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"/>
......@@ -69,6 +65,12 @@
<label>Live endpoint prefix</label>
<config_path>payment/adyen_abstract/live_endpoint_url_prefix</config_path>
</field>
<field id="capture_mode" translate="label" type="select" sortOrder="75" 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="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>
......@@ -79,12 +81,7 @@
<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>
......
view/adminhtml/web/images/adyen-logo.png 100755 → 100644
View replaced file @ 03c73ce5 View file @ ac1f9d92
view/adminhtml/web/images/adyen-logo.png

2 KB | W: | H:

view/adminhtml/web/images/adyen-logo.png

4.21 KB | W: | H:

view/adminhtml/web/images/adyen-logo.png
view/adminhtml/web/images/adyen-logo.png
view/adminhtml/web/images/adyen-logo.png
view/adminhtml/web/images/adyen-logo.png
  • 2-up
  • Swipe
  • Onion skin
view/adminhtml/web/styles.css
View file @ ac1f9d92
......@@ -19,6 +19,26 @@
*
* Author: Adyen <magento@adyen.com>
*/
.adyen-method-adyen-cc > .entry-edit-head > .config-heading .heading strong {
padding-left: 90px;
background: url(images/adyen-logo.png) no-repeat 0 0;
background-size: 83px 24px;
line-height: 23px;
}
.adyen-method-adyen-cc > .entry-edit-head > .config-heading .heading strong { padding-left:90px;background:url(images/adyen-logo.png) no-repeat 0 0; background-size: 83px 24px;line-height: 23px;}
ul.adyen-list { margin:0 20px 10px;}
\ No newline at end of file
ul.adyen-list {
margin: 0 20px 10px;
}
#payment_other_adyen_group_all_in_one_adyen_global_settings-head {
display: none;
}
#row_payment_other_adyen_group_all_in_one .heading {
background: url("images/adyen-logo.png") no-repeat 0 50% / 18rem auto;
padding-left: 20rem;
}
#row_payment_other_adyen_group_all_in_one .button-container {
float: right;
}
\ 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