Merge branch 'develop' of github.com:magento-qmt/magento2ce into MTA-3984 (8dd24e02) · Commits · KIII-12 / Magento

Commit 8dd24e02 authored 8 years ago by

Roman Liukshyn

Merge branch 'develop' of github.com:magento-qmt/magento2ce into MTA-3984

# Conflicts:
#	dev/tests/functional/tests/app/Magento/Checkout/Test/etc/di.xml

parents 56fb5a15 5a0cc81d

Branches

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php 26 additions, 6 deletions

...Model/ResourceModel/Product/StatusBaseSelectProcessor.php
app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php 37 additions, 10 deletions

...l/ResourceModel/Product/StatusBaseSelectProcessorTest.php
app/code/Magento/CatalogRule/Model/Rule.php 2 additions, 8 deletions

app/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/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php 49 additions, 8 deletions

...odel/ResourceModel/Product/Indexer/Price/Configurable.php
app/code/Magento/Customer/Model/Address/AbstractAddress.php 11 additions, 8 deletions

app/code/Magento/Customer/Model/Address/AbstractAddress.php
app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php 6 additions, 66 deletions

...agento/Customer/Model/ResourceModel/AddressRepository.php
app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php 7 additions, 7 deletions

.../Customer/Test/Unit/Model/Address/AbstractAddressTest.php
app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressRepositoryTest.php 15 additions, 156 deletions

...r/Test/Unit/Model/ResourceModel/AddressRepositoryTest.php
app/code/Magento/Review/etc/di.xml 5 additions, 0 deletions

app/code/Magento/Review/etc/di.xml
app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js 9 additions, 0 deletions

.../Magento/Swatches/view/frontend/web/js/swatch-renderer.js
app/code/Magento/Usps/Model/Carrier.php 22 additions, 19 deletions

app/code/Magento/Usps/Model/Carrier.php
dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php 1 addition, 1 deletion

...est/Block/Adminhtml/Product/Attribute/CustomAttribute.php
dev/tests/functional/tests/app/Magento/Catalog/Test/etc/di.xml 1 addition, 1 deletion

...ests/functional/tests/app/Magento/Catalog/Test/etc/di.xml
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

with 206 additions and 330 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.com:magento-qmt/magento2ce into MTA-3984