Merge remote-tracking branch 'goinc/MAGETWO-50893' into pr-515 (936efb12) · Commits · KIII-12 / Magento

Commit 936efb12 authored 9 years ago by

Andrii Lugovyi

Browse files

Merge remote-tracking branch 'goinc/MAGETWO-50893' into pr-515

parents 876aafdc b798c852

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php 10 additions, 42 deletions

...code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php
app/code/Magento/CatalogInventory/Helper/Stock.php 23 additions, 2 deletions

app/code/Magento/CatalogInventory/Helper/Stock.php
app/code/Magento/CatalogInventory/Model/Config/Backend/Backorders.php 0 additions, 1 deletion

...ento/CatalogInventory/Model/Config/Backend/Backorders.php
app/code/Magento/CatalogInventory/Model/Config/Backend/Managestock.php 0 additions, 1 deletion

...nto/CatalogInventory/Model/Config/Backend/Managestock.php
app/code/Magento/CatalogInventory/Model/Configuration.php 3 additions, 1 deletion

app/code/Magento/CatalogInventory/Model/Configuration.php
app/code/Magento/CatalogInventory/Model/Plugin/AroundProductRepositorySave.php 2 additions, 1 deletion

...logInventory/Model/Plugin/AroundProductRepositorySave.php
app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php 30 additions, 24 deletions

...entory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php 7 additions, 3 deletions

...de/Magento/CatalogInventory/Model/ResourceModel/Stock.php
app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php 4 additions, 4 deletions

...gento/CatalogInventory/Model/ResourceModel/Stock/Item.php
app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteriaMapper.php 28 additions, 1 deletion

...odel/ResourceModel/Stock/Item/StockItemCriteriaMapper.php
app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php 26 additions, 3 deletions

...nto/CatalogInventory/Model/ResourceModel/Stock/Status.php
app/code/Magento/CatalogInventory/Model/StockIndex.php 2 additions, 0 deletions

app/code/Magento/CatalogInventory/Model/StockIndex.php
app/code/Magento/CatalogInventory/Model/StockState.php 14 additions, 14 deletions

app/code/Magento/CatalogInventory/Model/StockState.php
app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php 1 addition, 7 deletions

...o/CatalogInventory/Observer/SaveInventoryDataObserver.php
app/code/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php 16 additions, 16 deletions

...e/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php
app/code/Magento/CatalogInventory/Test/Unit/Model/Config/Backend/ManagestockTest.php 53 additions, 0 deletions

...entory/Test/Unit/Model/Config/Backend/ManagestockTest.php
app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php 1 addition, 11 deletions

...to/CatalogInventory/Test/Unit/Model/ConfigurationTest.php
app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AroundProductRepositorySaveTest.php 3 additions, 13 deletions

...est/Unit/Model/Plugin/AroundProductRepositorySaveTest.php
app/code/Magento/CatalogInventory/Test/Unit/Observer/SaveInventoryDataObserverTest.php 0 additions, 95 deletions

...tory/Test/Unit/Observer/SaveInventoryDataObserverTest.php
app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php 24 additions, 6 deletions

app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php

with 247 additions and 245 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'goinc/MAGETWO-50893' into pr-515