Merge remote-tracking branch 'mainline/develop' into MAGETWO-56989
Showing
- app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php 20 additions, 11 deletionsapp/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
- app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php 24 additions, 2 deletions...figurableProduct/Block/Product/View/Type/Configurable.php
- app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php 25 additions, 0 deletions...gento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
- app/code/Magento/ConfigurableProduct/view/base/layout/catalog_product_prices.xml 4 additions, 0 deletions...urableProduct/view/base/layout/catalog_product_prices.xml
- app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml 26 additions, 0 deletions...roduct/view/base/templates/product/price/tier_price.phtml
- app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js 33 additions, 2 deletions.../ConfigurableProduct/view/frontend/web/js/configurable.js
- app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js 31 additions, 3 deletions.../Magento/Swatches/view/frontend/web/js/swatch-renderer.js
- dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php 6 additions, 0 deletions...app/Magento/Catalog/Test/Constraint/AssertProductPage.php
- dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple/CheckoutData.xml 8 additions, 0 deletions...log/Test/Repository/CatalogProductSimple/CheckoutData.xml
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php 54 additions, 13 deletions...leProduct/Test/Block/Product/View/ConfigurableOptions.php
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductTierPriceOnProductPage.php 47 additions, 0 deletions...t/Test/Constraint/AssertProductTierPriceOnProductPage.php
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Page/Product/CatalogProductView.xml 1 addition, 1 deletion...figurableProduct/Test/Page/Product/CatalogProductView.xml
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/CheckoutData.xml 16 additions, 0 deletions...duct/Test/Repository/ConfigurableProduct/CheckoutData.xml
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/ConfigurableAttributesData.xml 36 additions, 0 deletions...sitory/ConfigurableProduct/ConfigurableAttributesData.xml
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml 14 additions, 0 deletions...uct/Test/TestCase/CreateConfigurableProductEntityTest.xml
Please register or sign in to comment