Merge remote-tracking branch 'upstream/develop' into MAGETWO-58455-n-MAGETWO-58463
Showing
- app/code/Magento/CatalogRule/Model/Rule.php 2 additions, 8 deletionsapp/code/Magento/CatalogRule/Model/Rule.php
- app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php 1 addition, 1 deletion...code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
- app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html 1 addition, 32 deletions...eckout/view/frontend/web/template/summary/cart-items.html
- app/code/Magento/Paypal/Model/Express/Checkout.php 25 additions, 1 deletionapp/code/Magento/Paypal/Model/Express/Checkout.php
- app/code/Magento/Usps/Model/Carrier.php 22 additions, 19 deletionsapp/code/Magento/Usps/Model/Carrier.php
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php 1 addition, 0 deletions...out/Test/TestCase/AddProductsToShoppingCartEntityTest.php
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml 8 additions, 7 deletions...out/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php 1 addition, 0 deletions...t/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml 2 additions, 0 deletions...t/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php 1 addition, 0 deletions...kout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml 8 additions, 2 deletions...kout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.php 4 additions, 0 deletions...heckout/Test/TestCase/OnePageCheckoutJsValidationTest.php
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml 1 addition, 0 deletions...heckout/Test/TestCase/OnePageCheckoutJsValidationTest.xml
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php 1 addition, 0 deletions...pp/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml 16 additions, 6 deletions...pp/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php 1 addition, 0 deletions.../TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml 5 additions, 5 deletions.../TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php 1 addition, 0 deletions...Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml 2 additions, 0 deletions...Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml
- dev/tests/functional/tests/app/Magento/Checkout/Test/etc/di.xml 134 additions, 4 deletions...sts/functional/tests/app/Magento/Checkout/Test/etc/di.xml
Please register or sign in to comment