diff --git a/app/code/Magento/Paypal/Block/Bml/Form.php b/app/code/Magento/Paypal/Block/Bml/Form.php
index ae480bef552174c2e8a65e09aa062360ee885531..81cdc979bac6d23d6a1a79b8a82dd1926071b64f 100644
--- a/app/code/Magento/Paypal/Block/Bml/Form.php
+++ b/app/code/Magento/Paypal/Block/Bml/Form.php
@@ -31,7 +31,7 @@ class Form extends Express\Form
'https://www.securecheckout.billmelater.com/paycapture-content/'
. 'fetch?hash=AU826TU8&content=/bmlweb/ppwpsiw.html'
)->setPaymentAcceptanceMarkSrc(
- 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-small.png'
+ 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-medium.png'
)->setPaymentWhatIs(__('See terms'));
$this->_initializeRedirectTemplateWithMark($mark);
diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
index 4eacc5284c807a1759e4c226ab3c0e7397f64d6a..36f4f9c2b0d508b959ae8e82ea645c6001ddd2bb 100644
--- a/app/code/Magento/Paypal/Model/AbstractConfig.php
+++ b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -47,7 +47,7 @@ abstract class AbstractConfig implements ConfigInterface
/**
* @var string
*/
- private $pathPattern;
+ protected $pathPattern;
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index d6cde85f3505aaced9da7f9d889c4a00841c115c..e894c5a39b65ded62840f8d08eedb3ca8ac0fb96 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -971,7 +971,7 @@ class Config extends AbstractConfig
case self::PAYMENT_MARK_LARGE:
break;
default:
- $staticSize = self::PAYMENT_MARK_SMALL;
+ $staticSize = self::PAYMENT_MARK_MEDIUM;
}
return sprintf(
diff --git a/app/code/Magento/Paypal/Model/PayflowConfig.php b/app/code/Magento/Paypal/Model/PayflowConfig.php
index 796227fcd153e5d65b024adbb5b0cb38e59664c1..257cb2075984d69000ed59f56e66dcd7ba0ba225 100644
--- a/app/code/Magento/Paypal/Model/PayflowConfig.php
+++ b/app/code/Magento/Paypal/Model/PayflowConfig.php
@@ -11,7 +11,7 @@ use Magento\Payment\Model\Method\AbstractMethod;
* Class PayflowConfig
* @todo ELiminate current configuration class
*/
-class PayflowConfig extends AbstractConfig
+class PayflowConfig extends Config
{
/**#@-*/
@@ -89,4 +89,19 @@ class PayflowConfig extends AbstractConfig
return parent::isMethodActive(Config::METHOD_PAYMENT_PRO)
|| parent::isMethodActive(Config::METHOD_PAYFLOWPRO);
}
+
+ /**
+ * Map any supported payment method into a config path by specified field name
+ *
+ * @param string $fieldName
+ * @return string|null
+ */
+ protected function _getSpecificConfigPath($fieldName)
+ {
+ if ($this->pathPattern) {
+ return sprintf($this->pathPattern, $this->_methodCode, $fieldName);
+ }
+
+ return "payment/{$this->_methodCode}/{$fieldName}";
+ }
}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
index 65f23998cce8d309126f5edbba2afb17ffd0e347..03df793c371cd4c2d5ae30ef88b411190daf93f2 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
@@ -347,7 +347,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
],
[
'en_US', null, null, Config::EC_FLAVOR_STATIC, false, Config::EC_BUTTON_TYPE_MARK,
- 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png'
+ 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png'
],
[
'en_US', null, null, Config::EC_FLAVOR_STATIC, true, Config::EC_BUTTON_TYPE_SHORTCUT,
@@ -413,8 +413,8 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
'https://fpdbs.paypal.com/dynamicimageweb?cmd=_dynamic-image&buttontype=ecmark&locale=en_GB'
],
[
- 'en_US', null, null, 'small', Config::EC_FLAVOR_STATIC, true,
- 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png'
+ 'en_US', null, null, 'medium', Config::EC_FLAVOR_STATIC, true,
+ 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png'
],
[
'en_US', null, null, 'medium', Config::EC_FLAVOR_STATIC, true,
@@ -426,7 +426,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
],
[
'en_GB', null, null, 'affected', Config::EC_FLAVOR_STATIC, true,
- 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png'
+ 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png'
],
];
}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/PayflowConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/PayflowConfigTest.php
index 76165512dd4d885781bac9eea8b22240784448cb..1b52d78fafff5463f9143736051c4834f177f422 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/PayflowConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/PayflowConfigTest.php
@@ -6,6 +6,7 @@
namespace Magento\Paypal\Test\Unit\Model;
use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Paypal\Model\PayflowConfig;
use Magento\Payment\Model\MethodInterface;
use Magento\Payment\Model\Method\AbstractMethod;
@@ -41,7 +42,13 @@ class PayflowConfigTest extends \PHPUnit_Framework_TestCase
$this->methodInterfaceMock = $this->getMockBuilder('Magento\Payment\Model\MethodInterface')
->getMockForAbstractClass();
- $this->config = new PayflowConfig($this->scopeConfigMock);
+ $om = new ObjectManager($this);
+ $this->config = $om->getObject(
+ 'Magento\Paypal\Model\PayflowConfig',
+ [
+ 'scopeConfig' => $this->scopeConfigMock
+ ]
+ );
}
/**
@@ -163,6 +170,11 @@ class PayflowConfigTest extends \PHPUnit_Framework_TestCase
{
$this->config->setStoreId(5);
+ $this->scopeConfigMock->expects($this->any())
+ ->method('getValue')
+ ->with('paypal/general/merchant_country')
+ ->will($this->returnValue('US'));
+
$i = 0;
foreach ($expectsMethods as $method => $isActive) {
$this->scopeConfigMock->expects($this->at($i++))
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml
index 5ea58d76f2d6720e8975f0add49abe86c63ce558..afc43cd0033d236ffb10bb22b733f6cf393da911 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml
@@ -10,11 +10,11 @@
<!--PayPal Website Payments Standard-->
<payment id="wps_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="paypal_payflowpro_au">paypal_payflowpro_au</argument>
<argument name="payments_pro_hosted_solution_au">payments_pro_hosted_solution_au</argument>
@@ -23,17 +23,17 @@
</event>
</events>
<relation target="paypal_payflowpro_au">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="payments_pro_hosted_solution_au">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="express_checkout_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="paypal_payflowpro_au">paypal_payflowpro_au</argument>
<argument name="payments_pro_hosted_solution_au">payments_pro_hosted_solution_au</argument>
@@ -44,11 +44,11 @@
<!--PayPal Payflow Pro-->
<payment id="paypal_payflowpro_au">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="payments_pro_hosted_solution_au">payments_pro_hosted_solution_au</argument>
<argument name="wps_other">wps_other</argument>
@@ -56,14 +56,14 @@
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="payments_pro_hosted_solution_au">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
<argument name="payments_pro_hosted_solution_au">payments_pro_hosted_solution_au</argument>
@@ -73,11 +73,11 @@
<!--PayPal Website Payments Pro Hosted Solution-->
<payment id="payments_pro_hosted_solution_au">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="paypal_payflowpro_au">paypal_payflowpro_au</argument>
<argument name="wps_other">wps_other</argument>
@@ -85,14 +85,14 @@
</event>
</events>
<relation target="paypal_payflowpro_au">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
<argument name="paypal_payflowpro_au">paypal_payflowpro_au</argument>
@@ -102,22 +102,22 @@
<!--PayPal Express Checkout-->
<payment id="express_checkout_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
</rule>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml
index 767235735a54e190420b96330fa38cc2280a76fa..7302ba739cbed5daa51c9dc158c558ed0c2a6b1a 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml
@@ -10,11 +10,11 @@
<!-- Website Payments Standard -->
<payment id="wps_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wpp_ca">wpp_ca</argument>
<argument name="paypal_payflowpro_ca">paypal_payflowpro_ca</argument>
@@ -24,20 +24,20 @@
</event>
</events>
<relation target="wpp_ca">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="paypal_payflowpro_ca">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="payflow_link_ca">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="express_checkout_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wpp_ca">wpp_ca</argument>
<argument name="paypal_payflowpro_ca">paypal_payflowpro_ca</argument>
@@ -49,11 +49,11 @@
<!-- Website Payments Pro -->
<payment id="wpp_ca">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
<argument name="paypal_payflowpro_ca">paypal_payflowpro_ca</argument>
@@ -62,17 +62,17 @@
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="paypal_payflowpro_ca">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="payflow_link_ca">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
<argument name="paypal_payflowpro_ca">paypal_payflowpro_ca</argument>
@@ -83,11 +83,11 @@
<!-- Payflow Pro -->
<payment id="paypal_payflowpro_ca">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
<argument name="wpp_ca">wpp_ca</argument>
@@ -96,17 +96,17 @@
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="wpp_ca">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="payflow_link_ca">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
<argument name="wpp_ca">wpp_ca</argument>
@@ -117,11 +117,11 @@
<!-- Payflow Link (Includes Express Checkout) -->
<payment id="payflow_link_ca">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
<argument name="wpp_ca">wpp_ca</argument>
@@ -130,31 +130,30 @@
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="wpp_ca">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="paypal_payflowpro_ca">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="express_checkout_other">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/disable" event="activate"/>
- <rule type="paypal/express/lock-configuration" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/disable" event="activate-rule"/>
+ <rule type="paypal/express/lock-configuration" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="payflow_link_ca">payflow_link_ca</argument>
</rule>
- <rule type="paypal/express/unlock-configuration" event="deactivate">
+ <rule type="paypal/express/unlock-configuration" event="deactivate-rule">
<argument name="payflow_link_ca">payflow_link_ca</argument>
</rule>
- <rule type="paypal/express/lock-configuration-conditional" event=":load"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
- <rule type="payflow/express/enable" event="activate"/>
- <rule type="payflow/express/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
+ <rule type="payflow/express/enable" event="activate-rule"/>
+ <rule type="payflow/express/disable" event="deactivate-rule"/>
<rule type="payflow/express/lock-conditional" event=":load"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
@@ -167,22 +166,22 @@
<!-- Express Checkout -->
<payment id="express_checkout_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="wps_other">wps_other</argument>
<argument name="payflow_link_ca">payflow_link_ca</argument>
</rule>
@@ -190,6 +189,9 @@
<argument name="wps_other">wps_other</argument>
<argument name="payflow_link_ca">payflow_link_ca</argument>
</rule>
+ <rule type="paypal/express/lock-configuration-conditional" event=":load">
+ <argument name="payflow_link_ca">payflow_link_ca</argument>
+ </rule>
</relation>
</payment>
</rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml
index 23805484711cbed522311e12f39ab146e8478083..82a093c1f412f8f25ecd6155557921b12b4d5dd0 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml
@@ -9,12 +9,12 @@
xsi:noNamespaceSchemaLocation="../../../../../../../app/code/Magento/Paypal/etc/rules.xsd">
<payment id="express_checkout_de">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate"/>
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule"/>
</events>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
</relation>
</payment>
</rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml
index ceac68e6c89efbb0d650a98eebc769b12dbf0303..17e5381648f1a5ee9b30d2e9a1ea73445b977a86 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml
@@ -10,22 +10,22 @@
<!-- Website Payments Pro Hosted Solution (Includes Express Checkout) -->
<payment id="payments_pro_hosted_solution_es">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
</rule>
@@ -34,11 +34,11 @@
<!-- Website Payments Standard -->
<payment id="wps_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="payments_pro_hosted_solution_es">payments_pro_hosted_solution_es</argument>
<argument name="express_checkout_other">express_checkout_other</argument>
@@ -46,14 +46,14 @@
</event>
</events>
<relation target="payments_pro_hosted_solution_es">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="express_checkout_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="payments_pro_hosted_solution_es">payments_pro_hosted_solution_es</argument>
<argument name="express_checkout_other">express_checkout_other</argument>
@@ -63,22 +63,22 @@
<!-- Express Checkout -->
<payment id="express_checkout_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="wps_other">wps_other</argument>
</rule>
<rule type="conflict" event=":load">
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml
index a1ccc8f5f657be767c8273cfbe41f8ab7a4e461a..29886c00ab57bb0a1d703ff52ac82dbfe55e5f38 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml
@@ -10,22 +10,22 @@
<!-- Website Payments Pro Hosted Solution (Includes Express Checkout) -->
<payment id="payments_pro_hosted_solution_fr">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
</rule>
@@ -34,11 +34,11 @@
<!-- Website Payments Standard -->
<payment id="wps_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="payments_pro_hosted_solution_fr">payments_pro_hosted_solution_fr</argument>
<argument name="express_checkout_other">express_checkout_other</argument>
@@ -46,14 +46,14 @@
</event>
</events>
<relation target="payments_pro_hosted_solution_fr">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="express_checkout_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="payments_pro_hosted_solution_fr">payments_pro_hosted_solution_fr</argument>
<argument name="express_checkout_other">express_checkout_other</argument>
@@ -63,22 +63,22 @@
<!-- Express Checkout -->
<payment id="express_checkout_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="wps_other">wps_other</argument>
</rule>
<rule type="conflict" event=":load">
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
index 6045bddce2e3962ed57d1d020bbc170553276997..b55168d882848958b79d474f4a308d88e542b08f 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
@@ -10,22 +10,22 @@
<!-- Website Payments Pro Hosted Solution (Includes Express Checkout) -->
<payment id="payments_pro_hosted_solution_with_express_checkout">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_express">wps_express</argument>
</predicate>
</event>
</events>
<relation target="wps_express">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_express">wps_express</argument>
</rule>
@@ -34,11 +34,11 @@
<!-- Website Payments Standard -->
<payment id="wps_express">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="payments_pro_hosted_solution_with_express_checkout">payments_pro_hosted_solution_with_express_checkout</argument>
<argument name="express_checkout_us">express_checkout_us</argument>
@@ -46,14 +46,14 @@
</event>
</events>
<relation target="payments_pro_hosted_solution_with_express_checkout">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="express_checkout_us">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="payments_pro_hosted_solution_with_express_checkout">payments_pro_hosted_solution_with_express_checkout</argument>
<argument name="express_checkout_us">express_checkout_us</argument>
@@ -63,22 +63,22 @@
<!-- Express Checkout -->
<payment id="express_checkout_us">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_express">wps_express</argument>
</predicate>
</event>
</events>
<relation target="wps_express">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="wps_express">wps_express</argument>
</rule>
<rule type="conflict" event=":load">
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml
index 974bcf8bfe756044d991285252960b873eeda6a4..0fdb5250d0c5042bafb98ef2f6963484060724a8 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml
@@ -10,22 +10,22 @@
<!-- Website Payments Pro Hosted Solution (Includes Express Checkout) -->
<payment id="payments_pro_hosted_solution_hk">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
</rule>
@@ -34,11 +34,11 @@
<!-- Website Payments Standard -->
<payment id="wps_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="payments_pro_hosted_solution_hk">payments_pro_hosted_solution_hk</argument>
<argument name="express_checkout_other">express_checkout_other</argument>
@@ -46,14 +46,14 @@
</event>
</events>
<relation target="payments_pro_hosted_solution_hk">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="express_checkout_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="payments_pro_hosted_solution_hk">payments_pro_hosted_solution_hk</argument>
<argument name="express_checkout_other">express_checkout_other</argument>
@@ -63,22 +63,22 @@
<!-- Express Checkout -->
<payment id="express_checkout_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="wps_other">wps_other</argument>
</rule>
<rule type="conflict" event=":load">
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml
index 4d88054b781efde268e9a86ee66b015fe74da04d..63ae9f5e02478a4e6aa6ef5c4ec28fbc36df0c0b 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml
@@ -10,22 +10,22 @@
<!-- Website Payments Pro Hosted Solution (Includes Express Checkout) -->
<payment id="payments_pro_hosted_solution_it">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
</rule>
@@ -34,11 +34,11 @@
<!-- Website Payments Standard -->
<payment id="wps_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="payments_pro_hosted_solution_it">payments_pro_hosted_solution_it</argument>
<argument name="express_checkout_other">express_checkout_other</argument>
@@ -46,14 +46,14 @@
</event>
</events>
<relation target="payments_pro_hosted_solution_it">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="express_checkout_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="payments_pro_hosted_solution_it">payments_pro_hosted_solution_it</argument>
<argument name="express_checkout_other">express_checkout_other</argument>
@@ -63,22 +63,22 @@
<!-- Express Checkout -->
<payment id="express_checkout_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="wps_other">wps_other</argument>
</rule>
<rule type="conflict" event=":load">
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml
index ac502c272186d20a9df4a64a25a90bd653fed02b..ca74b2579cbff1779468916b7be456986644a92b 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml
@@ -10,22 +10,22 @@
<!-- Website Payments Pro Hosted Solution (Includes Express Checkout) -->
<payment id="payments_pro_hosted_solution_jp">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
</rule>
@@ -34,11 +34,11 @@
<!-- Website Payments Standard -->
<payment id="wps_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="payments_pro_hosted_solution_jp">payments_pro_hosted_solution_jp</argument>
<argument name="express_checkout_other">express_checkout_other</argument>
@@ -46,14 +46,14 @@
</event>
</events>
<relation target="payments_pro_hosted_solution_jp">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="express_checkout_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="payments_pro_hosted_solution_jp">payments_pro_hosted_solution_jp</argument>
<argument name="express_checkout_other">express_checkout_other</argument>
@@ -63,22 +63,22 @@
<!-- Express Checkout -->
<payment id="express_checkout_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="wps_other">wps_other</argument>
</rule>
<rule type="conflict" event=":load">
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml
index 4c0f0af0a8eccfa9eee6a8120f496a69d60297b6..8833c4f7edf3b761e54f1d0f60cc0109bb942761 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml
@@ -10,22 +10,22 @@
<!-- Website Payments Pro Hosted Solution (Includes Express Checkout) -->
<payment id="paypal_payflowpro_nz">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
</rule>
@@ -34,11 +34,11 @@
<!-- Website Payments Standard -->
<payment id="wps_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="paypal_payflowpro_nz">paypal_payflowpro_nz</argument>
<argument name="express_checkout_other">express_checkout_other</argument>
@@ -46,14 +46,14 @@
</event>
</events>
<relation target="paypal_payflowpro_nz">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="express_checkout_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="paypal_payflowpro_nz">paypal_payflowpro_nz</argument>
<argument name="express_checkout_other">express_checkout_other</argument>
@@ -63,22 +63,22 @@
<!-- Express Checkout -->
<payment id="express_checkout_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="wps_other">wps_other</argument>
</rule>
<rule type="conflict" event=":load">
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml
index e5b0f41cc5fab6a71e8ae8dee086135b5e3bdb5d..df49f08a3b89bae10bacb756e6880d6d312fc264 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml
@@ -10,22 +10,22 @@
<!-- Website Payments Standard -->
<payment id="wps_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="express_checkout_other">express_checkout_other</argument>
</predicate>
</event>
</events>
<relation target="express_checkout_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="express_checkout_other">express_checkout_other</argument>
</rule>
@@ -34,22 +34,22 @@
<!-- Express Checkout -->
<payment id="express_checkout_other">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_other">wps_other</argument>
</predicate>
</event>
</events>
<relation target="wps_other">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
<rule type="conflict" event=":load">
<argument name="wps_other">wps_other</argument>
</rule>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml
index 8a8ea7c31cb1a225de0e972749d4b75f8da85da4..65ec357646179c5a1910a008c7bfd754154baec4 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml
@@ -10,11 +10,11 @@
<!-- PayPal Payments Advanced (Includes Express Checkout) -->
<payment id="payflow_advanced">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wpp_usuk">wpp_usuk</argument>
<argument name="wps_express">wps_express</argument>
@@ -28,45 +28,43 @@
<event value="1" name="activate-bml"/>
</events>
<relation target="wpp_usuk">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="wps_express">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="paypal_payflowpro_with_express_checkout">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="payflow_link_us">
- <rule type="disable" event="activate"/>
- <rule type="payflow/express/disable-conditional" event="deactivate"/>
- <rule type="payflow/bml/disable-conditional" event="deactivate"/>
+ <rule type="disable" event="activate-rule"/>
+ <rule type="payflow/express/disable-conditional" event="deactivate-rule"/>
+ <rule type="payflow/bml/disable-conditional" event="deactivate-rule"/>
<rule type="payflow/bml/enable-conditional" event="activate-bml">
<argument name="payflow_advanced">payflow_advanced</argument>
</rule>
<rule type="payflow/bml/disable-conditional" event="deactivate-bml"/>
</relation>
<relation target="express_checkout_us">
- <rule type="paypal/express/disable" event="activate"/>
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/lock-configuration" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="paypal/express/disable" event="activate-rule"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/lock-configuration" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="wpp_usuk">wpp_usuk</argument>
<argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
<argument name="payflow_link_us">payflow_link_us</argument>
</rule>
- <rule type="paypal/express/unlock-configuration" event="deactivate">
+ <rule type="paypal/express/unlock-configuration" event="deactivate-rule">
<argument name="wpp_usuk">wpp_usuk</argument>
<argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
<argument name="payflow_link_us">payflow_link_us</argument>
</rule>
- <rule type="paypal/express/mark-enable" event=":load"/>
- <rule type="paypal/express/lock-configuration-conditional" event=":load"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="payflow/bml/enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
- <rule type="payflow/bml/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="payflow/bml/enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
+ <rule type="payflow/bml/disable" event="deactivate-rule"/>
<rule type="payflow/express/disable-conditional" event=":load"/>
<rule type="payflow/bml/disable-conditional" event=":load"/>
<rule type="conflict" event=":load">
@@ -81,11 +79,11 @@
<!-- PayPal Payments Pro (Includes Express Checkout) -->
<payment id="wpp_usuk">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="wps_express">wps_express</argument>
@@ -99,45 +97,43 @@
<event value="1" name="activate-bml"/>
</events>
<relation target="payflow_advanced">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="wps_express">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="paypal_payflowpro_with_express_checkout">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="payflow_link_us">
- <rule type="disable" event="activate"/>
- <rule type="payflow/express/disable-conditional" event="deactivate"/>
- <rule type="payflow/bml/disable-conditional" event="deactivate"/>
+ <rule type="disable" event="activate-rule"/>
+ <rule type="payflow/express/disable-conditional" event="deactivate-rule"/>
+ <rule type="payflow/bml/disable-conditional" event="deactivate-rule"/>
<rule type="payflow/bml/enable-conditional" event="activate-bml">
<argument name="wpp_usuk">wpp_usuk</argument>
</rule>
<rule type="payflow/bml/disable-conditional" event="deactivate-bml"/>
</relation>
<relation target="express_checkout_us">
- <rule type="paypal/express/disable" event="activate"/>
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/lock-configuration" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="paypal/express/disable" event="activate-rule"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/lock-configuration" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
<argument name="payflow_link_us">payflow_link_us</argument>
</rule>
- <rule type="paypal/express/unlock-configuration" event="deactivate">
+ <rule type="paypal/express/unlock-configuration" event="deactivate-rule">
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
<argument name="payflow_link_us">payflow_link_us</argument>
</rule>
- <rule type="paypal/express/mark-enable" event=":load"/>
- <rule type="paypal/express/lock-configuration-conditional" event=":load"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="payflow/bml/enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
- <rule type="payflow/bml/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="payflow/bml/enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
+ <rule type="payflow/bml/disable" event="deactivate-rule"/>
<rule type="payflow/express/disable-conditional" event=":load"/>
<rule type="payflow/bml/disable-conditional" event=":load"/>
<rule type="conflict" event=":load">
@@ -152,11 +148,11 @@
<!-- PayPal Payments Standard -->
<payment id="wps_express">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="wpp_usuk">wpp_usuk</argument>
@@ -167,25 +163,25 @@
</event>
</events>
<relation target="payflow_advanced">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="wpp_usuk">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="paypal_payflowpro_with_express_checkout">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="payflow_link_us">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="express_checkout_us">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/bml/enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
- <rule type="paypal/bml/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/bml/enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
+ <rule type="paypal/bml/disable" event="deactivate-rule"/>
<rule type="paypal/bml/disable-conditional" event=":load"/>
<rule type="conflict" event=":load">
<argument name="payflow_advanced">payflow_advanced</argument>
@@ -199,11 +195,11 @@
<!-- PayPal Payflow Pro (Includes Express Checkout) -->
<payment id="paypal_payflowpro_with_express_checkout">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="wpp_usuk">wpp_usuk</argument>
@@ -217,45 +213,43 @@
<event value="1" name="activate-bml"/>
</events>
<relation target="payflow_advanced">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="wpp_usuk">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="wps_express">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="payflow_link_us">
- <rule type="disable" event="activate"/>
- <rule type="payflow/express/disable-conditional" event="deactivate"/>
- <rule type="payflow/bml/disable-conditional" event="deactivate"/>
+ <rule type="disable" event="activate-rule"/>
+ <rule type="payflow/express/disable-conditional" event="deactivate-rule"/>
+ <rule type="payflow/bml/disable-conditional" event="deactivate-rule"/>
<rule type="payflow/bml/enable-conditional" event="activate-bml">
<argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
</rule>
<rule type="payflow/bml/disable-conditional" event="deactivate-bml"/>
</relation>
<relation target="express_checkout_us">
- <rule type="paypal/express/disable" event="activate"/>
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/lock-configuration" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="paypal/express/disable" event="activate-rule"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/lock-configuration" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="wpp_usuk">wpp_usuk</argument>
<argument name="payflow_link_us">payflow_link_us</argument>
</rule>
- <rule type="paypal/express/unlock-configuration" event="deactivate">
+ <rule type="paypal/express/unlock-configuration" event="deactivate-rule">
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="wpp_usuk">wpp_usuk</argument>
<argument name="payflow_link_us">payflow_link_us</argument>
</rule>
- <rule type="paypal/express/mark-enable" event=":load"/>
- <rule type="paypal/express/lock-configuration-conditional" event=":load"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="payflow/bml/enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
- <rule type="payflow/bml/disable" event="deactivate"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="payflow/bml/enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
+ <rule type="payflow/bml/disable" event="deactivate-rule"/>
<rule type="payflow/express/disable-conditional" event=":load"/>
<rule type="payflow/bml/disable-conditional" event=":load"/>
<rule type="conflict" event=":load">
@@ -270,11 +264,11 @@
<!-- PayPal Payflow Link (Includes Express Checkout) -->
<payment id="payflow_link_us">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="wpp_usuk">wpp_usuk</argument>
@@ -288,44 +282,43 @@
<event value="1" name="activate-express"/>
</events>
<relation target="payflow_advanced">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="wpp_usuk">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="wps_express">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="paypal_payflowpro_with_express_checkout">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target="express_checkout_us">
- <rule type="paypal/express/disable" event="activate"/>
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/express/lock-configuration" event="activate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="paypal/express/disable" event="activate-rule"/>
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/express/lock-configuration" event="activate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="wpp_usuk">wpp_usuk</argument>
<argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
</rule>
- <rule type="paypal/express/unlock-configuration" event="deactivate">
+ <rule type="paypal/express/unlock-configuration" event="deactivate-rule">
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="wpp_usuk">wpp_usuk</argument>
<argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
</rule>
- <rule type="paypal/express/lock-configuration-conditional" event=":load"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="payflow/express/enable" event="activate"/>
- <rule type="payflow/bml/enable" event="activate"/>
- <rule type="simple/disable" event="deactivate"/>
- <rule type="payflow/express/enable-conditional" event="deactivate">
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="payflow/express/enable" event="activate-rule"/>
+ <rule type="payflow/bml/enable" event="activate-rule"/>
+ <rule type="simple/disable" event="deactivate-rule"/>
+ <rule type="payflow/express/enable-conditional" event="deactivate-rule">
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="wpp_usuk">wpp_usuk</argument>
<argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
</rule>
- <rule type="payflow/bml/enable-conditional" event="deactivate">
+ <rule type="payflow/bml/enable-conditional" event="deactivate-rule">
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="wpp_usuk">wpp_usuk</argument>
<argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
@@ -346,24 +339,24 @@
<!-- PayPal Express Checkout -->
<payment id="express_checkout_us">
<events selector="[data-enable='payment']">
- <event value="0" name="deactivate"/>
- <event value="1" name="activate">
+ <event value="0" name="deactivate-rule"/>
+ <event value="1" name="activate-rule">
<predicate name="confirm"
message="There is already another PayPal solution enabled. Enable this solution instead?"
- event="deactivate"
+ event="deactivate-rule"
>
<argument name="wps_express">wps_express</argument>
</predicate>
</event>
</events>
<relation target="wps_express">
- <rule type="disable" event="activate"/>
+ <rule type="disable" event="activate-rule"/>
</relation>
<relation target=":self">
- <rule type="simple/mark-enable" event="activate"/>
- <rule type="paypal/bml/enable" event="activate"/>
- <rule type="paypal/bml/disable" event="deactivate"/>
- <rule type="paypal/express/mark-disable" event="deactivate">
+ <rule type="simple/mark-enable" event="activate-rule"/>
+ <rule type="paypal/bml/enable" event="activate-rule"/>
+ <rule type="paypal/bml/disable" event="deactivate-rule"/>
+ <rule type="paypal/express/mark-disable" event="deactivate-rule">
<argument name="payflow_advanced">payflow_advanced</argument>
<argument name="wpp_usuk">wpp_usuk</argument>
<argument name="wps_express">wps_express</argument>
@@ -378,6 +371,12 @@
<argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
<argument name="payflow_link_us">payflow_link_us</argument>
</rule>
+ <rule type="paypal/express/lock-configuration-conditional" event=":load">
+ <argument name="payflow_advanced">payflow_advanced</argument>
+ <argument name="wpp_usuk">wpp_usuk</argument>
+ <argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
+ <argument name="payflow_link_us">payflow_link_us</argument>
+ </rule>
</relation>
</payment>
</rules>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
index c26ae17b00038e1544a6a0d484d4587897c7c6b9..93da7852446f5d15e71288e0afc275c9d12b9006 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
@@ -23,7 +23,7 @@
?>
<script>
require(['jquery', 'prototype'], function(jQuery){
- paypalToggleSolution = function(id, url) {
+ window.paypalToggleSolution = function (id, url) {
var doScroll = false;
Fieldset.toggleCollapse(id, url);
if ($(this).hasClassName("open")) {
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js b/app/code/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js
index 783c841a05c7e4d1e1f11f0b1e8b1d78784d0059..98c79243d483266581e0d52bc1d1041fc9b4ce7a 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js
+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js
@@ -22,7 +22,11 @@
if (!isDisabled && !executed) {
executed = true;
- alert("The following error(s) occured:\n\rSome PayPal solutions conflict.\n\rPlease re-enable the previously enabled payment solutions.");
+ alert(
+ "The following error(s) occured:\n\r"
+ + "Some PayPal solutions conflict.\n\r"
+ + "Please re-enable the previously enabled payment solutions."
+ );
}
}
};
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/lock-configuration-conditional.js b/app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/lock-configuration-conditional.js
index c5f3b9d101d5a98afc15a2d141d4d938e16abd7c..bd2c2f62a29f5b20a08910fdf3e2504c584bfdff 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/lock-configuration-conditional.js
+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/lock-configuration-conditional.js
@@ -7,7 +7,19 @@ define([
], function (lockConfiguration) {
"use strict";
return function ($target, $owner, data) {
- if ($owner.find(data.enableButton).val() == 1) {
+ var isDisabled = true;
+
+ _.every(data.argument, function (name) {
+ if (data.solutionsElements[name]
+ && data.solutionsElements[name].find(data.enableButton).val() == 1
+ ) {
+ isDisabled = false;
+ return isDisabled;
+ }
+ return isDisabled;
+ }, this);
+
+ if (!isDisabled) {
lockConfiguration($target, $owner, data);
}
};
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/mark-enable.js b/app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/mark-enable.js
deleted file mode 100644
index 658f4924aeea49961d64aa135211de9394c3ddf4..0000000000000000000000000000000000000000
--- a/app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/express/mark-enable.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-define([
- 'Magento_Paypal/js/rules/simple/mark-enable'
-], function (markEnable) {
- "use strict";
- return function ($target, $owner, data) {
- if ($owner.find(data.enableButton).val() == 1) {
- markEnable($target, $owner, data);
- }
- };
-});
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js b/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
index 63265c889f9b670d08de1e63b962f50a608f2361..a5a98e899e9d46ac3d07c66f28990226468900e2 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
@@ -6,10 +6,9 @@ define([
"jquery",
"Magento_Ui/js/lib/class",
"Magento_Paypal/js/rule",
- "Magento_Paypal/js/rules/disable",
"mageUtils",
"underscore"
-], function ($, Class, Rule, disableSolution, utils, _) {
+], function ($, Class, Rule, utils, _) {
"use strict";
return Class.extend({
defaults: {
@@ -56,15 +55,15 @@ define([
* Initialization events
*/
initEvents: function () {
-
_.each(this.config.events, function (elementEvents, selector) {
var solution = this,
selectorButton = solution.$self.find(selector),
- $self = solution.$self;
- _.each(elementEvents, function (elementEvent, name) {
- selectorButton.on(this.systemEvent, function(event) {
- var predicate = elementEvent.predicate;
- var result = true;
+ $self = solution.$self,
+ events = elementEvents;
+ selectorButton.on(solution.systemEvent, function (event) {
+ _.each(events, function (elementEvent, name) {
+ var predicate = elementEvent.predicate,
+ result = true;
if ($(this).val() === elementEvent.value) {
if (predicate.name) {
require([
@@ -80,11 +79,10 @@ define([
} else {
$self.trigger(name);
}
- }
+ }
+ }, this);
});
- }, this);
}, this);
-
return this;
},
/**
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
index 313e700845e6358cef5db7f84d9d4444c792a93e..47cecc72a36b89a9abb29b1b04e0f4d305a28fce 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
@@ -12,7 +12,7 @@
data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
<label data-bind="attr: {'for': getCode()}" class="label">
<!-- PayPal Logo -->
- <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-small.png"
+ <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-medium.png"
data-bind="attr: {alt: $t('Acceptance Mark')}"
class="payment-icon"/>
<!-- PayPal Logo -->
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
index 313e700845e6358cef5db7f84d9d4444c792a93e..47cecc72a36b89a9abb29b1b04e0f4d305a28fce 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
@@ -12,7 +12,7 @@
data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
<label data-bind="attr: {'for': getCode()}" class="label">
<!-- PayPal Logo -->
- <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-small.png"
+ <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-medium.png"
data-bind="attr: {alt: $t('Acceptance Mark')}"
class="payment-icon"/>
<!-- PayPal Logo -->