Skip to content

A
Adyen Magento2

We will be off from 27/1 (Monday) to 31/1 (Friday) (GMT +7) for our Tet Holiday (Lunar New Year) in our country

Commit caa8550b authored by rikterbeek's avatar rikterbeek
Browse files
Options

fix length field holder name, result URl fix for logger, added some license... 

fix length field holder name, result URl fix for logger, added some license texts, cleanup code and remove die() statement in a catch statement
parent 71210b90
Hide whitespace changes
Inline Side-by-side
Showing with 262 additions and 139 deletions
Block/Form/Cc.php
View file @ caa8550b
...@@ -87,7 +87,6 @@ class Cc extends \Magento\Payment\Block\Form ...@@ -87,7 +87,6 @@ class Cc extends \Magento\Payment\Block\Form
} }
/** /**
* Retrieve availables credit card types * Retrieve availables credit card types
* *
...@@ -151,14 +150,6 @@ class Cc extends \Magento\Payment\Block\Form ...@@ -151,14 +150,6 @@ class Cc extends \Magento\Payment\Block\Form
public function hasVerification() public function hasVerification()
{ {
return true; return true;
// if ($this->getMethod()) {
// $configData = $this->getMethod()->getConfigData('useccv');
// if ($configData === null) {
// return true;
// }
// return (bool)$configData;
// }
// return true;
} }
/** /**
......
Block/Form/Oneclick.php
View file @ caa8550b
...@@ -29,7 +29,4 @@ class Oneclick extends \Adyen\Payment\Block\Form\Cc ...@@ -29,7 +29,4 @@ class Oneclick extends \Adyen\Payment\Block\Form\Cc
* @var string * @var string
*/ */
protected $_template = 'Adyen_Payment::form/oneclick.phtml'; protected $_template = 'Adyen_Payment::form/oneclick.phtml';
} }
\ No newline at end of file
Block/Info/AbstractInfo.php
View file @ caa8550b
...@@ -60,9 +60,4 @@ class AbstractInfo extends \Magento\Payment\Block\Info ...@@ -60,9 +60,4 @@ class AbstractInfo extends \Magento\Payment\Block\Info
$storeId = $this->getInfo()->getOrder()->getStoreId(); $storeId = $this->getInfo()->getOrder()->getStoreId();
return $this->_adyenHelper->getAdyenAbstractConfigDataFlag('demo_mode', $storeId); return $this->_adyenHelper->getAdyenAbstractConfigDataFlag('demo_mode', $storeId);
} }
} }
\ No newline at end of file
Block/Info/Cc.php
View file @ caa8550b
...@@ -31,15 +31,6 @@ class Cc extends AbstractInfo ...@@ -31,15 +31,6 @@ class Cc extends AbstractInfo
*/ */
protected $_template = 'Adyen_Payment::info/adyen_cc.phtml'; protected $_template = 'Adyen_Payment::info/adyen_cc.phtml';
/**
* @return string
*/
// public function toPdf()
// {
// $this->setTemplate('Magento_OfflinePayments::info/pdf/checkmo.phtml');
// return $this->toHtml();
// }
/** /**
* Return credit cart type * Return credit cart type
* *
......
Block/Info/Hpp.php
View file @ caa8550b
...@@ -25,7 +25,6 @@ namespace Adyen\Payment\Block\Info; ...@@ -25,7 +25,6 @@ namespace Adyen\Payment\Block\Info;
class Hpp extends AbstractInfo class Hpp extends AbstractInfo
{ {
/** /**
* @var string * @var string
*/ */
...@@ -35,5 +34,4 @@ class Hpp extends AbstractInfo ...@@ -35,5 +34,4 @@ class Hpp extends AbstractInfo
{ {
return $this->_adyenHelper->getAdyenHppConfigDataFlag('payment_selection_on_adyen'); return $this->_adyenHelper->getAdyenHppConfigDataFlag('payment_selection_on_adyen');
} }
} }
Block/Info/Oneclick.php
View file @ caa8550b
...@@ -26,17 +26,4 @@ namespace Adyen\Payment\Block\Info; ...@@ -26,17 +26,4 @@ namespace Adyen\Payment\Block\Info;
class Oneclick extends Cc class Oneclick extends Cc
{ {
/**
* @var string
*/
// protected $_template = 'Adyen_Payment::info/adyen_oneclick.phtml';
/**
* @return string
*/
// public function toPdf()
// {
// $this->setTemplate('Magento_OfflinePayments::info/pdf/checkmo.phtml');
// return $this->toHtml();
// }
} }
Controller/Process/Json.php
View file @ caa8550b
...@@ -133,8 +133,6 @@ class Json extends \Magento\Framework\App\Action\Action ...@@ -133,8 +133,6 @@ class Json extends \Magento\Framework\App\Action\Action
*/ */
protected function _processNotification($response, $notificationMode) protected function _processNotification($response, $notificationMode)
{ {
// TODO: log the response
// validate the notification // validate the notification
if($this->authorised($response)) if($this->authorised($response))
{ {
......
Controller/Process/Result.php
View file @ caa8550b
...@@ -130,10 +130,6 @@ class Result extends \Magento\Framework\App\Action\Action ...@@ -130,10 +130,6 @@ class Result extends \Magento\Framework\App\Action\Action
throw new \Magento\Framework\Exception\LocalizedException(__('Response is empty, please check your webserver that the result url accepts parameters')); throw new \Magento\Framework\Exception\LocalizedException(__('Response is empty, please check your webserver that the result url accepts parameters'));
} }
// Log the results in log file and adyen_debug table
$this->_adyenLogger->addAdyenResult($response);
// authenticate result url // authenticate result url
$authStatus = $this->_authenticate($response); $authStatus = $this->_authenticate($response);
if (!$authStatus) { if (!$authStatus) {
......
Logger/Handler/AdyenBase.php
View file @ caa8550b
...@@ -86,5 +86,4 @@ class AdyenBase extends StreamHandler ...@@ -86,5 +86,4 @@ class AdyenBase extends StreamHandler
{ {
return $record['level'] == $this->level; return $record['level'] == $this->level;
} }
}
} \ No newline at end of file
Model/AdyenHppConfigProvider.php
View file @ caa8550b
...@@ -176,7 +176,17 @@ class AdyenHppConfigProvider implements ConfigProviderInterface ...@@ -176,7 +176,17 @@ class AdyenHppConfigProvider implements ConfigProviderInterface
{ {
$paymentMethods = []; $paymentMethods = [];
$ccEnabled = $this->_config->getValue('payment/'.\Adyen\Payment\Model\Method\Cc::METHOD_CODE.'/active');
$ccTypes = array_keys($this->_adyenHelper->getCcTypesAltData());
foreach ($this->_fetchHppMethods($store) as $methodCode => $methodData) { foreach ($this->_fetchHppMethods($store) as $methodCode => $methodData) {
// skip payment methods if it is a creditcard that is enabled in adyen_cc
if ($ccEnabled
&& in_array($methodCode, $ccTypes)) {
continue;
}
$paymentMethods[$methodCode] = $methodData; $paymentMethods[$methodCode] = $methodData;
} }
...@@ -339,8 +349,7 @@ class AdyenHppConfigProvider implements ConfigProviderInterface ...@@ -339,8 +349,7 @@ class AdyenHppConfigProvider implements ConfigProviderInterface
// create and add signature // create and add signature
$requestParams["merchantSig"] = \Adyen\Util\Util::calculateSha256Signature($hmacKey, $requestParams); $requestParams["merchantSig"] = \Adyen\Util\Util::calculateSha256Signature($hmacKey, $requestParams);
// print_R($requestParams);die(); // initialize service
// intialize service
$service = new \Adyen\Service\DirectoryLookup($client); $service = new \Adyen\Service\DirectoryLookup($client);
try { try {
......
Model/Api/PaymentRequest.php
View file @ caa8550b
...@@ -484,7 +484,6 @@ class PaymentRequest extends DataObject ...@@ -484,7 +484,6 @@ class PaymentRequest extends DataObject
if(isset($result['response']) && $result['response'] == '[detail-successfully-disabled]') { if(isset($result['response']) && $result['response'] == '[detail-successfully-disabled]') {
return true; return true;
} else { } else {
echo 'hier';die();
throw new \Magento\Framework\Exception\LocalizedException(__('Failed to disable this contract')); throw new \Magento\Framework\Exception\LocalizedException(__('Failed to disable this contract'));
} }
} }
...@@ -499,7 +498,6 @@ class PaymentRequest extends DataObject ...@@ -499,7 +498,6 @@ class PaymentRequest extends DataObject
return $payment->getAdyenPspReference(); return $payment->getAdyenPspReference();
} }
/** /**
* Decrypt password * Decrypt password
* *
......
Model/Config/Converter.php
View file @ caa8550b
<?php <?php
/** /**
* Payment Config Converter * ######
* ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* Adyen Payment module (https://www.adyen.com/)
*
* Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
* See LICENSE.txt for license details.
* *
* Copyright © 2015 Magento. All rights reserved. * Author: Adyen <magento@adyen.com>
* See COPYING.txt for license details. */
/**
* Payment Config Converter
*/ */
namespace Adyen\Payment\Model\Config; namespace Adyen\Payment\Model\Config;
......
Model/Config/Reader.php
View file @ caa8550b
<?php <?php
/** /**
* Loads catalog attributes configuration from multiple XML files by merging them together * ######
* ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* Adyen Payment module (https://www.adyen.com/)
*
* Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
* See LICENSE.txt for license details.
* *
* Copyright © 2015 Magento. All rights reserved. * Author: Adyen <magento@adyen.com>
* See COPYING.txt for license details. */
/**
* Loads catalog attributes configuration from multiple XML files by merging them together
*/ */
namespace Adyen\Payment\Model\Config; namespace Adyen\Payment\Model\Config;
......
Model/Config/SchemaLocator.php
View file @ caa8550b
<?php <?php
/** /**
* Locator for payment config XSD schemas. * ######
* ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* Adyen Payment module (https://www.adyen.com/)
*
* Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
* See LICENSE.txt for license details.
* *
* Copyright © 2015 Magento. All rights reserved. * Author: Adyen <magento@adyen.com>
* See COPYING.txt for license details. */
/**
* Locator for payment config XSD schemas.
*/ */
namespace Adyen\Payment\Model\Config; namespace Adyen\Payment\Model\Config;
......
Model/Method/Cc.php
View file @ caa8550b
...@@ -273,11 +273,11 @@ class Cc extends \Magento\Payment\Model\Method\Cc ...@@ -273,11 +273,11 @@ class Cc extends \Magento\Payment\Model\Method\Cc
$errorMsg = __('The expiry month is not set. Please check your expiry month!'); $errorMsg = __('The expiry month is not set. Please check your expiry month!');
break; break;
default: default:
$errorMsg = __('The payment is REFUSED by Adyen.'); $errorMsg = __('The payment is REFUSED.');
break; break;
} }
} else { } else {
$errorMsg = __('The payment is REFUSED by Adyen.'); $errorMsg = __('The payment is REFUSED.');
} }
if ($errorMsg) { if ($errorMsg) {
......
Model/Method/Hpp.php
View file @ caa8550b
...@@ -47,7 +47,6 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa ...@@ -47,7 +47,6 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
*/ */
const GUEST_ID = 'customer_'; const GUEST_ID = 'customer_';
// protected $_formBlockType = 'Adyen\Payment\Block\Form\Hpp';
protected $_infoBlockType = 'Adyen\Payment\Block\Info\Hpp'; protected $_infoBlockType = 'Adyen\Payment\Block\Info\Hpp';
......
etc/adminhtml/system.xml
View file @ caa8550b
...@@ -24,19 +24,13 @@ ...@@ -24,19 +24,13 @@
--> -->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd"> <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
<system> <system>
<section id="payment" translate="label" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1"> <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="1" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Adyen All-in-One Payment Solutions</label> <label>Adyen All-in-One Payment Solutions</label>
<comment><![CDATA[Adyen All-in-One Payment Solutions]]></comment> <comment><![CDATA[Adyen All-in-One Payment Solutions]]></comment>
<attribute type="expanded">1</attribute> <attribute type="expanded">1</attribute>
<fieldset_css>complex</fieldset_css> <fieldset_css>complex</fieldset_css>
<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_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"/>
...@@ -45,12 +39,7 @@ ...@@ -45,12 +39,7 @@
<include path="Adyen_Payment::system/adyen_cc.xml"/> <include path="Adyen_Payment::system/adyen_cc.xml"/>
<include path="Adyen_Payment::system/adyen_oneclick.xml"/> <include path="Adyen_Payment::system/adyen_oneclick.xml"/>
<include path="Adyen_Payment::system/adyen_hpp.xml"/> <include path="Adyen_Payment::system/adyen_hpp.xml"/>
</group> </group>
<group id="test" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1"> <group id="test" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Test</label> <label>Test</label>
<field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0"> <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
......
etc/adminhtml/system/adyen_advanced_notifications.xml
View file @ caa8550b
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
<group id="adyen_advanced_notifications" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1"> <group id="adyen_advanced_notifications" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
<label><![CDATA[Advanced: Adyen Payment Notifications]]></label> <label><![CDATA[Advanced: Adyen Payment Notifications]]></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="ignore_refund_notification" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1"> <field id="ignore_refund_notification" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Ignore refund notification</label> <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> <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>
...@@ -40,6 +38,5 @@ ...@@ -40,6 +38,5 @@
<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/multiple_merchants</config_path> <config_path>payment/adyen_abstract/multiple_merchants</config_path>
</field> </field>
</group> </group>
</include> </include>
\ No newline at end of file
etc/adminhtml/system/adyen_advanced_order_processing.xml
View file @ caa8550b
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
<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"> <field id="paypal_capture_mode" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Use manual capture for PayPal</label> <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> <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>
......
etc/adminhtml/system/adyen_billing_agreements.xml
View file @ caa8550b
...@@ -50,7 +50,5 @@ ...@@ -50,7 +50,5 @@
<source_model>Adyen\Payment\Model\Config\Source\RecurringType</source_model> <source_model>Adyen\Payment\Model\Config\Source\RecurringType</source_model>
<config_path>payment/adyen_abstract/recurring_type</config_path> <config_path>payment/adyen_abstract/recurring_type</config_path>
</field> </field>
</group> </group>
</include> </include>
\ No newline at end of file
etc/adminhtml/system/adyen_cc.xml
View file @ caa8550b
...@@ -23,15 +23,11 @@ ...@@ -23,15 +23,11 @@
*/ */
--> -->
<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd"> <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"> <group id="adyen_cc" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
<label><![CDATA[CreditCard API integration]]></label> <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\Payment</frontend_model>
<fieldset_css>adyen-method-adyen-cc</fieldset_css> <fieldset_css>adyen-method-adyen-cc</fieldset_css>
<comment>Process creditcard payments inside your checkout.</comment> <comment>Process creditcard payments inside your checkout.</comment>
<field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1"> <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Enabled</label> <label>Enabled</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model> <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
...@@ -81,7 +77,5 @@ ...@@ -81,7 +77,5 @@
<config_path>payment/adyen_cc/specificcountry</config_path> <config_path>payment/adyen_cc/specificcountry</config_path>
</field> </field>
</group> </group>
</group> </group>
</include> </include>
\ No newline at end of file
etc/adminhtml/system/adyen_hpp.xml
View file @ caa8550b
...@@ -23,24 +23,16 @@ ...@@ -23,24 +23,16 @@
*/ */
--> -->
<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd"> <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"> <group id="adyen_hpp" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
<label><![CDATA[Hosted Payment Page (HPP) integration]]></label> <label><![CDATA[Hosted Payment Page (HPP) integration]]></label>
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model> <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
<fieldset_css>adyen-method-adyen-cc</fieldset_css> <fieldset_css>adyen-method-adyen-cc</fieldset_css>
<comment>Process alternative payments methods</comment> <comment>Process alternative payments methods</comment>
<field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1"> <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Enabled</label> <label>Enabled</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model> <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>payment/adyen_hpp/active</config_path> <config_path>payment/adyen_hpp/active</config_path>
</field> </field>
<field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Title</label>
<config_path>payment/adyen_hpp/title</config_path>
</field>
<field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0"> <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Sort Order</label> <label>Sort Order</label>
<frontend_class>validate-number</frontend_class> <frontend_class>validate-number</frontend_class>
...@@ -63,10 +55,19 @@ ...@@ -63,10 +55,19 @@
<backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model> <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
<config_path>payment/adyen_hpp/hmac_live</config_path> <config_path>payment/adyen_hpp/hmac_live</config_path>
</field> </field>
<group id="adyen_hpp_advanced_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="200"> <group id="adyen_hpp_advanced_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="200">
<label>Advanced Settings</label> <label>Advanced 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="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="delivery_days" translate="label" type="text" sortOrder="68" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Days to Delivery</label>
<tooltip>How many days to be added to the current date for delivery. ONLY whole numbers allowed.</tooltip>
<frontend_class>validate-number</frontend_class>
<config_path>payment/adyen_hpp/delivery_days</config_path>
</field>
<field id="payment_selection_on_adyen" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0"> <field id="payment_selection_on_adyen" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Payment method selection on Adyen Hosted Payment Page (HPP)</label> <label>Payment method selection on Adyen Hosted Payment Page (HPP)</label>
<tooltip>If you set this to 'Yes', payment methods in the checkout won't be displayed and you will be redirected to the Adyen HPP to make the selection.</tooltip> <tooltip>If you set this to 'Yes', payment methods in the checkout won't be displayed and you will be redirected to the Adyen HPP to make the selection.</tooltip>
...@@ -80,12 +81,6 @@ ...@@ -80,12 +81,6 @@
<depends><field id="payment_selection_on_adyen">1</field></depends> <depends><field id="payment_selection_on_adyen">1</field></depends>
<config_path>payment/adyen_hpp/payment_routine</config_path> <config_path>payment/adyen_hpp/payment_routine</config_path>
</field> </field>
<field id="delivery_days" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Days to Delivery</label>
<tooltip>How many days to be added to the current date for delivery. ONLY whole numbers allowed.</tooltip>
<frontend_class>validate-number</frontend_class>
<config_path>payment/adyen_hpp/delivery_days</config_path>
</field>
<field id="shopper_locale" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1"> <field id="shopper_locale" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Language locale (optional)</label> <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> <tooltip>This will override the default shopper locale of the Magento store (e.g. nl_NL). Leave empty to let Magento decide.</tooltip>
...@@ -97,7 +92,6 @@ ...@@ -97,7 +92,6 @@
<config_path>payment/adyen_hpp/country_code</config_path> <config_path>payment/adyen_hpp/country_code</config_path>
</field> </field>
</group> </group>
<group id="adyen_hpp_country_specific" translate="label" showInDefault="1" showInWebsite="1" sortOrder="210"> <group id="adyen_hpp_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>
...@@ -113,7 +107,5 @@ ...@@ -113,7 +107,5 @@
<config_path>payment/adyen_hpp/specificcountry</config_path> <config_path>payment/adyen_hpp/specificcountry</config_path>
</field> </field>
</group> </group>
</group> </group>
</include> </include>
\ No newline at end of file
etc/adminhtml/system/adyen_required_settings.xml
View file @ caa8550b
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
<field id="merchant_account" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0"> <field id="merchant_account" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Merchant Account</label> <label>Merchant Account</label>
<config_path>payment/adyen_abstract/merchant_account</config_path> <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/display/TD/Prepare+the+settings+in+the+Adyen+Customer+Area">Click here for explanation.</a>]]></comment>
</field> </field>
<field id="demo_mode" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1"> <field id="demo_mode" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Test/Production Mode</label> <label>Test/Production Mode</label>
......
etc/adyen_payment.xml
View file @ caa8550b
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- <!--
/** /**
* Copyright © 2015 Magento. All rights reserved. * ######
* See COPYING.txt for license details. * ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* 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>
*/ */
--> -->
<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
etc/adyen_payment.xsd
View file @ caa8550b
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
/** /**
* Copyright © 2015 Magento. All rights reserved. * ######
* See COPYING.txt for license details. * ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* 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>
*/ */
--> -->
<xs:schema elementFormDefault="qualified" <xs:schema elementFormDefault="qualified"
......
etc/adyen_payment_file.xsd
View file @ caa8550b
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
/** /**
* Copyright © 2015 Magento. All rights reserved. * ######
* See COPYING.txt for license details. * ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* 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>
*/ */
--> -->
<xs:schema elementFormDefault="qualified" <xs:schema elementFormDefault="qualified"
......
etc/di.xml
View file @ caa8550b
...@@ -68,8 +68,6 @@ ...@@ -68,8 +68,6 @@
</argument> </argument>
</arguments> </arguments>
</type> </type>
<type name="Adyen\Payment\Model\Config\Reader"> <type name="Adyen\Payment\Model\Config\Reader">
<arguments> <arguments>
<argument name="fileName" xsi:type="string">adyen_payment.xml</argument> <argument name="fileName" xsi:type="string">adyen_payment.xml</argument>
...@@ -84,29 +82,9 @@ ...@@ -84,29 +82,9 @@
<argument name="cacheId" xsi:type="string">adyen_payment_config</argument> <argument name="cacheId" xsi:type="string">adyen_payment_config</argument>
</arguments> </arguments>
</virtualType> </virtualType>
<!--<type name="Adyen\Payment\Helper\Data">-->
<!--<arguments>-->
<!--<argument name="dataStorage" xsi:type="object">Magento\Payment\Model\Config\Data</argument>-->
<!--</arguments>-->
<!--</type>-->
<type name="Adyen\Payment\Helper\Data"> <type name="Adyen\Payment\Helper\Data">
<arguments> <arguments>
<argument name="dataStorage" xsi:type="object">adyenPaymentConfigDataStorage</argument> <argument name="dataStorage" xsi:type="object">adyenPaymentConfigDataStorage</argument>
</arguments> </arguments>
</type> </type>
<!--<virtualType name="adyenPaymentConfigDataStorage" type="Magento\Framework\Config\Data">-->
<!--<arguments>-->
<!--<argument name="reader" xsi:type="object">Adyen\Payment\Model\Config\Reader</argument>-->
<!--<argument name="cacheId" xsi:type="string">adyen_payment_config</argument>-->
<!--</arguments>-->
<!--</virtualType>-->
<!--<type name="Adyen\Payment\Helper\Data">-->
<!--<arguments>-->
<!--<argument name="dataStorage" xsi:type="object">adyenPaymentConfigDataStorage</argument>-->
<!--</arguments>-->
<!--</type>-->
</config> </config>
\ No newline at end of file
etc/frontend/di.xml
View file @ caa8550b
...@@ -32,4 +32,4 @@ ...@@ -32,4 +32,4 @@
</argument> </argument>
</arguments> </arguments>
</type> </type>
</config> </config>
\ No newline at end of file
i18n/en_US.csv 0 → 100644
View file @ caa8550b
"Name on Card","Name on Card"
"Credit Card Information","Credit Card Information"
"Credit Card Type","Credit Card Type"
"Credit Card Number","Credit Card Number"
"Credit Card Owner","Credit Card Owner"
"Expiration Date","Expiration Date"
"Card Verification Number","Card Verification Number"
"--Please Select--","--Please Select--"
"What is this?","What is this?"
"Remember these details","Remember these details"
"Select your Bank","Select your Bank"
"You will be redirected to the Adyen website.","You will be redirected to the Adyen website."
"Update","Update"
"Place order","Place order"
"Continue to Adyen","Continue to Adyen"
"Unknown","Unknown"
"Mismatch between Live/Test modes of Magento store and the Adyen platform","Mismatch between Live/Test modes of Magento store and the Adyen platform"
"You have cancelled the order. Please try again","You have cancelled the order. Please try again"
"Your payment failed, Please try again later","Your payment failed, Please try again later"
"Response is empty, please check your webserver that the result url accepts parameters","Response is empty, please check your webserver that the result url accepts parameters"
"ResultUrl authentification failure","ResultUrl authentification failure"
"Order does not exists with increment_id: %1","Order does not exists with increment_id: %1"
"Empty merchantReference","Empty merchantReference"
"3D-secure validation was successful","3D-secure validation was successful"
"3D-secure validation was unsuccessful.","3D-secure validation was unsuccessful."
"Customer was redirected to bank for 3D-secure validation.","Customer was redirected to bank for 3D-secure validation."
"Used existing billing agreement #%s.","Used existing billing agreement #%s."
"Created billing agreement #%1.","Created billing agreement #%1."
"Failed to create billing agreement for this order.","Failed to create billing agreement for this order."
"Failed to create billing agreement for this order (listRecurringCall did not contain contract)","Failed to create billing agreement for this order (listRecurringCall did not contain contract)"
"Adyen Refund Successfully completed","Adyen Refund Successfully completed"
"Payment is pre authorised waiting for capture","Payment is pre authorised waiting for capture"
"Capture Mode set to Manual","Capture Mode set to Manual"
"Adyen Payment is in Manual Review check the Adyen platform","Adyen Payment is in Manual Review check the Adyen platform"
"Adyen Payment Successfully completed","Adyen Payment Successfully completed"
"Shipment created by Adyen","Shipment created by Adyen"
"3D secure failed","3D secure failed"
"The capture action failed","The capture action failed"
"The refund action failed","The refund action failed"
"Failed to disable this contract","Failed to disable this contract"
"Card encryption failed","Card encryption failed"
"The authorize action is not available.","The authorize action is not available."
"Empty result.","Empty result."
"3D secure is not valid","3D secure is not valid"
"The transaction is not permitted.","The transaction is not permitted."
"Declined due to the Card Security Code(CVC) being incorrect. Please check your CVC code!","Declined due to the Card Security Code(CVC) being incorrect. Please check your CVC code!"
"The card is restricted.","The card is restricted."
"The payment is REFUSED because the saved card is removed. Please try an other payment method.","The payment is REFUSED because the saved card is removed. Please try an other payment method."
"The expiry month is not set. Please check your expiry month!","The expiry month is not set. Please check your expiry month!"
"The payment is REFUSED","The payment is REFUSED"
"Failed to disable this contract","Failed to disable this contract"
\ No newline at end of file
registration.php
View file @ caa8550b
<?php <?php
/**
* ######
* ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* Adyen Payment module (https://www.adyen.com/)
*
* Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
* See LICENSE.txt for license details.
*
* Author: Adyen <magento@adyen.com>
*/
use \Magento\Framework\Component\ComponentRegistrar; use \Magento\Framework\Component\ComponentRegistrar;
......
view/adminhtml/templates/form/cc.phtml
View file @ caa8550b
<?php <?php
/** /**
* Copyright © 2015 Magento. All rights reserved. * ######
* See COPYING.txt for license details. * ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* Adyen Payment module (https://www.adyen.com/)
*
* Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
* See LICENSE.txt for license details.
*
* Author: Adyen <magento@adyen.com>
*/ */
// @codingStandardsIgnoreFile // @codingStandardsIgnoreFile
......
view/frontend/web/css/styles.css
View file @ caa8550b
/**
* ######
* ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* 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>
*/
.checkout-payment-method .ccard .changable-card-expiry { display:none; } .checkout-payment-method .ccard .changable-card-expiry { display:none; }
.checkout-payment-method .ccard .changable-card-expiry._active { display:block; } .checkout-payment-method .ccard .changable-card-expiry._active { display:block; }
.checkout-payment-method .ccard .expire-update._disable { display:none; } .checkout-payment-method .ccard .expire-update._disable { display:none; }
.checkout-payment-method .ccard .holdername .input-text { width: 225px; }
view/frontend/web/template/payment/cc-form.html
View file @ caa8550b
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
valueUpdate: 'keyup' "/> valueUpdate: 'keyup' "/>
</div> </div>
</div> </div>
<div class="field type required"> <div class="field holdername type required">
<label data-bind="attr: {for: getCode() + '_cc_owner'}" class="label"> <label data-bind="attr: {for: getCode() + '_cc_owner'}" class="label">
<span><!-- ko text: $t('Credit Card Owner')--><!-- /ko --></span> <span><!-- ko text: $t('Credit Card Owner')--><!-- /ko --></span>
</label> </label>
......
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