Merge pull request #512 from magento-dragons/MAGETWO-52717 (ed5eefb2) · Commits · KIII-12 / Magento

Commit ed5eefb2 authored 8 years ago by

Sviatoslav Mankivskyi Committed by GitHub 8 years ago

Merge pull request #512 from magento-dragons/MAGETWO-52717

[DRAGONS] Bugs fixing (P0)
- MAGETWO-52717 [GitHub] Configurable product disabling lowest price associated product still shows its price #4419
- MAGETWO-59315 Non consistent save Product Stock Item via Web API and repository directly

parents 8d0dc6f5 c9213659

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Stock.php 1 addition, 1 deletion

...Magento/Catalog/Model/Product/Attribute/Backend/Stock.php
app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php 26 additions, 0 deletions

...el/ResourceModel/Product/BaseSelectProcessorInterface.php
app/code/Magento/Catalog/Model/ResourceModel/Product/CompositeBaseSelectProcessor.php 49 additions, 0 deletions

...el/ResourceModel/Product/CompositeBaseSelectProcessor.php
app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php 21 additions, 8 deletions

...roduct/Indexer/LinkedProductSelectBuilderByIndexPrice.php
app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php 16 additions, 5 deletions

...ceModel/Product/LinkedProductSelectBuilderByBasePrice.php
app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php 19 additions, 5 deletions

...odel/Product/LinkedProductSelectBuilderBySpecialPrice.php
app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php 16 additions, 6 deletions

...ceModel/Product/LinkedProductSelectBuilderByTierPrice.php
app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php 61 additions, 0 deletions

...Model/ResourceModel/Product/StatusBaseSelectProcessor.php
app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/StockTest.php 13 additions, 0 deletions

...g/Test/Unit/Model/Product/Attribute/Backend/StockTest.php
app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CompositeBaseSelectProcessorTest.php 54 additions, 0 deletions

...esourceModel/Product/CompositeBaseSelectProcessorTest.php
app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php 102 additions, 0 deletions

...l/ResourceModel/Product/StatusBaseSelectProcessorTest.php
app/code/Magento/Catalog/etc/di.xml 8 additions, 0 deletions

app/code/Magento/Catalog/etc/di.xml
app/code/Magento/CatalogInventory/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php 51 additions, 0 deletions

.../ResourceModel/Product/StockStatusBaseSelectProcessor.php
app/code/Magento/CatalogInventory/Test/Unit/Model/ResourceModel/Product/StockStatusBaseSelectProcessorTest.php 69 additions, 0 deletions

...ourceModel/Product/StockStatusBaseSelectProcessorTest.php
app/code/Magento/CatalogInventory/etc/di.xml 7 additions, 0 deletions

app/code/Magento/CatalogInventory/etc/di.xml
app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php 31 additions, 18 deletions

.../Product/LinkedProductSelectBuilderByCatalogRulePrice.php
app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php 2 additions, 35 deletions

...ableProduct/Pricing/Price/ConfigurableOptionsProvider.php
app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProviderInterface.php 1 addition, 0 deletions

...ct/Pricing/Price/ConfigurableOptionsProviderInterface.php
app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php 8 additions, 18 deletions

...urableProduct/Pricing/Price/ConfigurablePriceResolver.php
app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php 13 additions, 5 deletions

...gurableProduct/Pricing/Price/ConfigurableRegularPrice.php

with 568 additions and 101 deletions

Please register or to comment

Admin message

Merge pull request #512 from magento-dragons/MAGETWO-52717