Merge remote-tracking branch 'falcons/MAGETWO-60299' into MAGETWO-61201
Showing
- app/code/Magento/Catalog/Block/Product/View.php 12 additions, 18 deletionsapp/code/Magento/Catalog/Block/Product/View.php
- app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml 3 additions, 3 deletions...alog/view/frontend/templates/product/view/addtocart.phtml
- app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml 7 additions, 1 deletion...w/frontend/templates/cart/item/configure/updatecart.phtml
- app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml 0 additions, 1 deletion.../Checkout/view/frontend/templates/cart/item/default.phtml
- app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html 1 addition, 2 deletions...out/view/frontend/web/template/minicart/item/default.html
- app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php 12 additions, 0 deletions...figurableProduct/Block/Product/View/Type/Configurable.php
- app/code/Magento/Customer/view/frontend/web/js/model/customer-addresses.js 5 additions, 2 deletions...Customer/view/frontend/web/js/model/customer-addresses.js
- app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php 131 additions, 50 deletions.../Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
- app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php 54 additions, 43 deletionsapp/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
- app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php 25 additions, 11 deletions...est/Unit/Model/Entity/Attribute/AbstractAttributeTest.php
- app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml 2 additions, 2 deletions...t/view/frontend/templates/product/view/type/grouped.phtml
- app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php 1 addition, 1 deletion...ode/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
- app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js 1 addition, 1 deletionapp/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
- dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml 17 additions, 0 deletions...Magento/Catalog/Test/Repository/Product/CustomOptions.xml
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php 77 additions, 0 deletions...est/Constraint/AssertCurrencyRateAppliedOnProductPage.php
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCurrencyRateTest.xml 28 additions, 0 deletions...figurableProduct/Test/TestCase/CreateCurrencyRateTest.xml
- dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Repository/ConfigData.xml 12 additions, 0 deletions...app/Magento/CurrencySymbol/Test/Repository/ConfigData.xml
- dev/tests/functional/tests/app/Magento/Directory/Test/Constraint/AssertCurrencyRateAppliedOnProductPage.php 62 additions, 0 deletions...est/Constraint/AssertCurrencyRateAppliedOnProductPage.php
- dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml 33 additions, 0 deletions...ests/app/Magento/Directory/Test/Repository/ConfigData.xml
- dev/tests/functional/tests/app/Magento/Directory/Test/TestCase/CreateCurrencyRateTest.php 22 additions, 8 deletions...agento/Directory/Test/TestCase/CreateCurrencyRateTest.php
Please register or sign in to comment