Merge remote-tracking branch 'mainline/develop' into MAGETWO-56675 (a02f2b8c) · Commits · KIII-12 / Magento

There was an error fetching the commit references. Please try again later.

Commit a02f2b8c authored 8 years ago by

Oleksandr Shmyheliuk

Browse files

Merge remote-tracking branch 'mainline/develop' into MAGETWO-56675

parents c723d36b b56df96c

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Bundle/view/base/web/js/price-bundle.js 4 additions, 0 deletions

app/code/Magento/Bundle/view/base/web/js/price-bundle.js
app/code/Magento/Catalog/Block/Product/AbstractProduct.php 1 addition, 1 deletion

app/code/Magento/Catalog/Block/Product/AbstractProduct.php
app/code/Magento/Catalog/Model/Product/Type/AbstractType.php 11 additions, 0 deletions

app/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 deletions

app/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/Eav/Model/AttributeManagement.php 29 additions, 4 deletions

app/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 deletion

app/code/Magento/Sales/Model/Order/Payment.php
app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php 1 addition, 1 deletion

app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
app/code/Magento/Swatches/Helper/Data.php 29 additions, 1 deletion

app/code/Magento/Swatches/Helper/Data.php
app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php 20 additions, 2 deletions

app/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/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 17 additions, 1 deletion

.../Magento/Swatches/view/frontend/web/js/swatch-renderer.js
app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php 4 additions, 0 deletions

...t/Model/ResourceModel/Widget/Instance/Options/ThemeId.php
app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Themes.php 41 additions, 0 deletions

...et/Model/ResourceModel/Widget/Instance/Options/Themes.php
app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Widget/Instance/Options/ThemesTest.php 55 additions, 0 deletions

...odel/ResourceModel/Widget/Instance/Options/ThemesTest.php

with 315 additions and 43 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into MAGETWO-56675