Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into bugfix (904747be) · Commits · KIII-12 / Magento

Commit 904747be authored 9 years ago by

Ievgen Shakhsuvarov

Browse files

Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into bugfix

parents d4017ada 72007663

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/App/BackendAppList.php 1 addition, 0 deletions

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

...code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php
app/code/Magento/Catalog/Plugin/Block/Topmenu.php 39 additions, 19 deletions

app/code/Magento/Catalog/Plugin/Block/Topmenu.php
app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php 8 additions, 20 deletions

...de/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
app/code/Magento/Catalog/etc/di.xml 3 additions, 0 deletions

app/code/Magento/Catalog/etc/di.xml
app/code/Magento/Catalog/etc/frontend/events.xml 0 additions, 3 deletions

app/code/Magento/Catalog/etc/frontend/events.xml
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

with 217 additions and 162 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into bugfix