Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-48516
Showing
- app/code/Magento/Bundle/view/base/web/js/price-bundle.js 4 additions, 0 deletionsapp/code/Magento/Bundle/view/base/web/js/price-bundle.js
- app/code/Magento/Catalog/Block/Product/AbstractProduct.php 1 addition, 1 deletionapp/code/Magento/Catalog/Block/Product/AbstractProduct.php
- app/code/Magento/Catalog/Model/Product/Type/AbstractType.php 11 additions, 0 deletionsapp/code/Magento/Catalog/Model/Product/Type/AbstractType.php
- app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php 2 additions, 2 deletions...gento/Catalog/Test/Unit/Block/Product/ListProductTest.php
- app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js 11 additions, 0 deletions...gento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
- app/code/Magento/Checkout/Controller/Cart/CouponPost.php 11 additions, 20 deletionsapp/code/Magento/Checkout/Controller/Cart/CouponPost.php
- app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php 16 additions, 0 deletions...nto/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
- app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php 15 additions, 0 deletions...o/ConfigurableProduct/Model/Product/Type/Configurable.php
- app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml 2 additions, 1 deletion...nd/templates/product/view/type/options/configurable.phtml
- app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js 43 additions, 37 deletions.../ConfigurableProduct/view/frontend/web/js/configurable.js
- app/code/Magento/Eav/Model/AttributeManagement.php 29 additions, 4 deletionsapp/code/Magento/Eav/Model/AttributeManagement.php
- app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php 18 additions, 0 deletions...e/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
- app/code/Magento/Sales/Model/Order/Payment.php 1 addition, 1 deletionapp/code/Magento/Sales/Model/Order/Payment.php
- app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php 1 addition, 1 deletionapp/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
- app/code/Magento/Swatches/Helper/Data.php 29 additions, 1 deletionapp/code/Magento/Swatches/Helper/Data.php
- app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php 20 additions, 2 deletionsapp/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
- app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml 12 additions, 10 deletions...es/view/frontend/templates/product/listing/renderer.phtml
- app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml 2 additions, 2 deletions...tches/view/frontend/templates/product/view/renderer.phtml
- app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js 17 additions, 0 deletions...ento/Swatches/view/frontend/web/js/catalog-add-to-cart.js
- app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js 53 additions, 20 deletions.../Magento/Swatches/view/frontend/web/js/swatch-renderer.js
Please register or sign in to comment