Merge branch 'MAGETWO-44098' into MAGETWO-44446 (c7144cd6) · Commits · KIII-12 / Magento

Commit c7144cd6 authored 9 years ago by

Ievgen Sentiabov

Browse files

Merge branch 'MAGETWO-44098' into MAGETWO-44446

parents 48c63054 32d81c26

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Paypal/Model/Config/Rules/Converter.php 8 additions, 23 deletions

app/code/Magento/Paypal/Model/Config/Rules/Converter.php
app/code/Magento/Paypal/Test/Unit/Model/Config/Rules/ConverterTest.php 36 additions, 18 deletions

...nto/Paypal/Test/Unit/Model/Config/Rules/ConverterTest.php
app/code/Magento/Paypal/Test/Unit/Model/Config/Rules/ConvertibleContent/rules.xml 4 additions, 0 deletions

...Test/Unit/Model/Config/Rules/ConvertibleContent/rules.xml
app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml 3 additions, 0 deletions

app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml
app/code/Magento/Paypal/view/adminhtml/web/js/predicate/confirm.js 9 additions, 6 deletions

...Magento/Paypal/view/adminhtml/web/js/predicate/confirm.js
app/code/Magento/Paypal/view/adminhtml/web/js/rule.js 10 additions, 4 deletions

app/code/Magento/Paypal/view/adminhtml/web/js/rule.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js 21 additions, 11 deletions

...de/Magento/Paypal/view/adminhtml/web/js/rules/conflict.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/disable.js 2 additions, 1 deletion

...ode/Magento/Paypal/view/adminhtml/web/js/rules/disable.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/bml/disable-conditional-express.js 3 additions, 2 deletions

...l/web/js/rules/payflow/bml/disable-conditional-express.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/bml/disable-conditional.js 3 additions, 2 deletions

...adminhtml/web/js/rules/payflow/bml/disable-conditional.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/bml/disable.js 2 additions, 1 deletion

...Paypal/view/adminhtml/web/js/rules/payflow/bml/disable.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/bml/enable-conditional.js 7 additions, 4 deletions

.../adminhtml/web/js/rules/payflow/bml/enable-conditional.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/bml/enable.js 2 additions, 1 deletion

.../Paypal/view/adminhtml/web/js/rules/payflow/bml/enable.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/bml/lock-conditional.js 3 additions, 2 deletions

...ew/adminhtml/web/js/rules/payflow/bml/lock-conditional.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/express/disable-conditional.js 3 additions, 2 deletions

...nhtml/web/js/rules/payflow/express/disable-conditional.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/express/disable.js 2 additions, 1 deletion

...al/view/adminhtml/web/js/rules/payflow/express/disable.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/express/enable-conditional.js 7 additions, 4 deletions

...inhtml/web/js/rules/payflow/express/enable-conditional.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/express/enable.js 2 additions, 1 deletion

...pal/view/adminhtml/web/js/rules/payflow/express/enable.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/payflow/express/lock-conditional.js 3 additions, 2 deletions

...dminhtml/web/js/rules/payflow/express/lock-conditional.js
app/code/Magento/Paypal/view/adminhtml/web/js/rules/paypal/bml/disable-conditional.js 3 additions, 2 deletions

.../adminhtml/web/js/rules/paypal/bml/disable-conditional.js

with 133 additions and 87 deletions

Please register or to comment

Admin message

Merge branch 'MAGETWO-44098' into MAGETWO-44446