Merge branch 'develop' into bugfixes
Showing
- app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml 1 addition, 1 deletion...inhtml/templates/system/shipping/applicable_country.phtml
- app/code/Magento/Braintree/Model/Report/Row/TransactionMap.php 4 additions, 0 deletions...ode/Magento/Braintree/Model/Report/Row/TransactionMap.php
- app/code/Magento/Braintree/Model/Ui/ConfigProvider.php 0 additions, 1 deletionapp/code/Magento/Braintree/Model/Ui/ConfigProvider.php
- app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionMapTest.php 61 additions, 1 deletion...o/Braintree/Test/Unit/Model/Report/TransactionMapTest.php
- app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php 38 additions, 0 deletions...ree/Test/Unit/Model/Report/TransactionsCollectionTest.php
- app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php 0 additions, 1 deletion...gento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
- app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php 251 additions, 0 deletions...t/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php
- app/code/Magento/Braintree/Ui/Component/Report/Filters/Type/DateRange.php 19 additions, 0 deletions.../Braintree/Ui/Component/Report/Filters/Type/DateRange.php
- app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/PaymentType.php 6 additions, 6 deletions...intree/Ui/Component/Report/Listing/Column/PaymentType.php
- app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/Status.php 14 additions, 14 deletions...o/Braintree/Ui/Component/Report/Listing/Column/Status.php
- app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/TransactionType.php 2 additions, 2 deletions...ee/Ui/Component/Report/Listing/Column/TransactionType.php
- app/code/Magento/Braintree/composer.json 1 addition, 0 deletionsapp/code/Magento/Braintree/composer.json
- app/code/Magento/Braintree/etc/adminhtml/system.xml 2 additions, 1 deletionapp/code/Magento/Braintree/etc/adminhtml/system.xml
- app/code/Magento/Braintree/i18n/en_US.csv 25 additions, 3 deletionsapp/code/Magento/Braintree/i18n/en_US.csv
- app/code/Magento/Braintree/view/adminhtml/ui_component/braintree_report.xml 16 additions, 3 deletions...raintree/view/adminhtml/ui_component/braintree_report.xml
- app/code/Magento/Braintree/view/frontend/web/js/view/payment/braintree.js 1 addition, 15 deletions.../Braintree/view/frontend/web/js/view/payment/braintree.js
- app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js 23 additions, 22 deletions...w/frontend/web/js/view/payment/method-renderer/cc-form.js
- app/code/Magento/Payment/Model/MethodList.php 1 addition, 0 deletionsapp/code/Magento/Payment/Model/MethodList.php
- app/code/Magento/Payment/Test/Unit/Model/MethodListTest.php 8 additions, 2 deletionsapp/code/Magento/Payment/Test/Unit/Model/MethodListTest.php
- app/code/Magento/Paypal/Setup/InstallSchema.php 1 addition, 1 deletionapp/code/Magento/Paypal/Setup/InstallSchema.php
Please register or sign in to comment