Merge remote-tracking branch 'origin/develop' into PR (1c0684f9) · Commits · KIII-12 / Magento

Commit 1c0684f9 authored 8 years ago by

Ievgen Kolesov

Browse files

Merge remote-tracking branch 'origin/develop' into PR

parents 15b62162 8d0dc6f5

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
app/code/Magento/Braintree/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php 84 additions, 0 deletions

...ee/Model/Ui/Adminhtml/PayPal/TokenUiComponentProvider.php
app/code/Magento/Braintree/Model/Ui/Adminhtml/TokenUiComponentProvider.php 1 addition, 0 deletions

...Braintree/Model/Ui/Adminhtml/TokenUiComponentProvider.php
app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/PayPal/TokenUiComponentProviderTest.php 114 additions, 0 deletions

...odel/Ui/Adminhtml/PayPal/TokenUiComponentProviderTest.php
app/code/Magento/Braintree/Test/Unit/Model/Ui/Adminhtml/TokenUiComponentProviderTest.php 4 additions, 3 deletions

.../Unit/Model/Ui/Adminhtml/TokenUiComponentProviderTest.php
app/code/Magento/Braintree/etc/adminhtml/di.xml 1 addition, 0 deletions

app/code/Magento/Braintree/etc/adminhtml/di.xml
app/code/Magento/Braintree/etc/config.xml 2 additions, 1 deletion

app/code/Magento/Braintree/etc/config.xml
app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_index.xml 4 additions, 0 deletions

...intree/view/adminhtml/layout/sales_order_create_index.xml
app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml 4 additions, 0 deletions

...l/layout/sales_order_create_load_block_billing_method.xml
app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml 30 additions, 0 deletions

...raintree/view/adminhtml/templates/form/paypal/vault.phtml
app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml 2 additions, 1 deletion

...gento/Braintree/view/adminhtml/templates/form/vault.phtml
app/code/Magento/Braintree/view/adminhtml/web/js/vault.js 22 additions, 12 deletions

app/code/Magento/Braintree/view/adminhtml/web/js/vault.js
app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js 7 additions, 0 deletions

.../Checkout/view/frontend/web/js/model/address-converter.js
app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js 2 additions, 2 deletions

...eckout/view/frontend/web/js/model/new-customer-address.js
app/code/Magento/Checkout/view/frontend/web/js/model/payment/method-group.js 31 additions, 0 deletions

...eckout/view/frontend/web/js/model/payment/method-group.js
app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js 1 addition, 1 deletion

...ut/view/frontend/web/js/model/shipping-rates-validator.js
app/code/Magento/Checkout/view/frontend/web/js/view/payment/list.js 113 additions, 28 deletions

...agento/Checkout/view/frontend/web/js/view/payment/list.js
app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html 15 additions, 5 deletions

...kout/view/frontend/web/template/payment-methods/list.html
app/code/Magento/Checkout/view/frontend/web/template/payment.html 0 additions, 1 deletion

.../Magento/Checkout/view/frontend/web/template/payment.html
app/code/Magento/Paypal/Model/Payflow/Transparent.php 1 addition, 0 deletions

app/code/Magento/Paypal/Model/Payflow/Transparent.php

with 440 additions and 54 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/develop' into PR