Merge pull request #628 from magento-mpi/MAGETWO-43092

[Merchant Beta][MPI] Bugfix

Author: Tymchynskyi, Viktor(vtymchynskyi)

app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml

@@ -92,6 +92,10 @@
                 </predicate>
             </event>
         </events>
+        <events selector="tr:has(> td > [data-enable='payment']) [type='checkbox']">
+            <event value="1" name="usedefault-on"/>
+            <event value="0" name="usedefault-off"/>
+        </events>
         <events selector="[data-enable='bml']">
             <event value="0" name="deactivate-bml"/>
             <event value="1" name="activate-bml"/>
@@ -108,6 +112,8 @@
         <relation target="payflow_link_us">
             <rule type="disable" event="activate-rule"/>
             <rule type="payflow/express/disable-conditional" event="deactivate-rule"/>
+            <rule type="payflow/express/usedefault-disable" event="usedefault-off"/>
+            <rule type="payflow/express/usedefault-enable" event="usedefault-on"/>
             <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>

app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/express/usedefault-disable.js

@@ -0,0 +1,15 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'Magento_Paypal/js/rules/payflow/express/enable'
+], function (enableExpress) {
+    "use strict";
+    return function ($target, $owner, data) {
+        $target.find('input[id="' + $target.find(data.enableExpress).attr('id') + '_inherit"]').prop('checked', false);
+        enableExpress($target, $owner, data);
+        $target.find(data.enableExpress).change();
+    };
+});
+

app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/express/usedefault-enable.js

@@ -0,0 +1,14 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'Magento_Paypal/js/rules/payflow/express/disable'
+], function (disableExpress) {
+    "use strict";
+    return function ($target, $owner, data) {
+        $target.find('input[id="' + $target.find(data.enableExpress).attr('id') + '_inherit"]').prop('checked', true);
+        disableExpress($target, $owner, data);
+        $target.find(data.enableExpress).change();
+    };
+});

app/code/Magento/Paypal/view/adminhtml/web/js/solution.js

@@ -64,7 +64,7 @@ define([
                     _.each(events, function (elementEvent, name) {
                         var predicate = elementEvent.predicate,
                             result = true;
-                        if ($(this).val() === elementEvent.value) {
+                        if (solution.getValue($(this)) === elementEvent.value) {
                             if (predicate.name) {
                                 require([
                                     'Magento_Paypal/js/predicate/' + predicate.name
@@ -85,6 +85,13 @@ define([
             }, this);
             return this;
         },
+
+        getValue: function ($element) {
+            if ($element.is(':checkbox')) {
+                return $element.prop('checked') ? '1' : '0';
+            }
+            return $element.val();
+        },
         /**
          * Adding event listeners
          */