Merge remote-tracking branch 'mainline/develop' into MAGETWO-61531
Showing
- app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php 4 additions, 4 deletions...code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
- app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php 2 additions, 1 deletion...Magento/CatalogWidget/Block/Product/Widget/Conditions.php
- app/code/Magento/CatalogWidget/Test/Unit/Block/Product/Widget/ConditionsTest.php 113 additions, 0 deletions...gWidget/Test/Unit/Block/Product/Widget/ConditionsTest.php
- app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php 7 additions, 4 deletions...ento/OfflineShipping/Model/Quote/Address/FreeShipping.php
- app/code/Magento/OfflineShipping/Test/Unit/Model/Quote/Address/FreeShippingTest.php 111 additions, 0 deletions...ipping/Test/Unit/Model/Quote/Address/FreeShippingTest.php
- app/code/Magento/Sales/Block/Status/Grid/Column/State.php 2 additions, 1 deletionapp/code/Magento/Sales/Block/Status/Grid/Column/State.php
- app/code/Magento/Sales/Model/Order/Config.php 18 additions, 0 deletionsapp/code/Magento/Sales/Model/Order/Config.php
- app/code/Magento/Sales/Setup/UpgradeSchema.php 3 additions, 2 deletionsapp/code/Magento/Sales/Setup/UpgradeSchema.php
- app/code/Magento/Sales/Test/Unit/Block/Status/Grid/Column/StateTest.php 91 additions, 0 deletions...to/Sales/Test/Unit/Block/Status/Grid/Column/StateTest.php
- app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php 36 additions, 2 deletionsapp/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php
- app/code/Magento/Vault/Setup/UpgradeData.php 9 additions, 26 deletionsapp/code/Magento/Vault/Setup/UpgradeData.php
- dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml 17 additions, 0 deletions.../TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml
- dev/tests/functional/tests/app/Magento/Bundle/Test/etc/di.xml 13 additions, 0 deletions...tests/functional/tests/app/Magento/Bundle/Test/etc/di.xml
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Adminhtml/OrderCreateIndex.xml 5 additions, 5 deletions...figurableProduct/Test/Page/Adminhtml/OrderCreateIndex.xml
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCreditMemoEntityTest.xml 1 addition, 0 deletions...rableProduct/Test/TestCase/CreateCreditMemoEntityTest.xml
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml 16 additions, 0 deletions.../TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/di.xml 13 additions, 0 deletions...nal/tests/app/Magento/ConfigurableProduct/Test/etc/di.xml
- dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml 1 addition, 1 deletion...duct/Test/Block/Adminhtml/Product/Composite/Configure.xml
- dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertProductInItemsOrderedGrid.php 57 additions, 0 deletions...oduct/Test/Constraint/AssertProductInItemsOrderedGrid.php
- dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml 17 additions, 0 deletions.../TestCase/MoveRecentlyComparedProductsOnOrderPageTest.xml
Please register or sign in to comment