Merge remote-tracking branch 'origin/CatalogStaging' into CatalogStaging (dd0128b1) · Commits · KIII-12 / Magento

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

Commit dd0128b1 authored 9 years ago by

Nadiya Syvokonenko

Browse files

Merge remote-tracking branch 'origin/CatalogStaging' into CatalogStaging

parents df7646d1 91c4281d

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml 1 addition, 1 deletion

...dminhtml/templates/catalog/category/checkboxes/tree.phtml
app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml 1 addition, 1 deletion

...ew/adminhtml/templates/catalog/category/widget/tree.phtml
app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml 1 addition, 1 deletion

...inhtml/templates/catalog/product/attribute/set/main.phtml
app/code/Magento/CatalogImportExport/Model/Import/Product.php 1 addition, 1 deletion

...code/Magento/CatalogImportExport/Model/Import/Product.php
app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php 2 additions, 2 deletions

...e/Magento/CatalogInventory/Api/StockRegistryInterface.php
app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php 4 additions, 4 deletions

...nto/CatalogInventory/Api/StockStatusCriteriaInterface.php
app/code/Magento/CatalogInventory/Helper/Stock.php 7 additions, 18 deletions

app/code/Magento/CatalogInventory/Helper/Stock.php
app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php 6 additions, 6 deletions

...logInventory/Model/Spi/StockRegistryProviderInterface.php
app/code/Magento/CatalogInventory/Model/Spi/StockResolverInterface.php 0 additions, 19 deletions

...nto/CatalogInventory/Model/Spi/StockResolverInterface.php
app/code/Magento/CatalogInventory/Model/Stock/Item.php 1 addition, 1 deletion

app/code/Magento/CatalogInventory/Model/Stock/Item.php
app/code/Magento/CatalogInventory/Model/StockIndex.php 3 additions, 15 deletions

app/code/Magento/CatalogInventory/Model/StockIndex.php
app/code/Magento/CatalogInventory/Model/StockManagement.php 12 additions, 23 deletions

app/code/Magento/CatalogInventory/Model/StockManagement.php
app/code/Magento/CatalogInventory/Model/StockRegistry.php 32 additions, 53 deletions

app/code/Magento/CatalogInventory/Model/StockRegistry.php
app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php 19 additions, 35 deletions

.../Magento/CatalogInventory/Model/StockRegistryProvider.php
app/code/Magento/CatalogInventory/Model/StockResolver.php 0 additions, 25 deletions

app/code/Magento/CatalogInventory/Model/StockResolver.php
app/code/Magento/CatalogInventory/Model/StockState.php 8 additions, 24 deletions

app/code/Magento/CatalogInventory/Model/StockState.php
app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php 1 addition, 4 deletions

...to/CatalogInventory/Observer/AddInventoryDataObserver.php
app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php 2 additions, 12 deletions

...o/CatalogInventory/Observer/SaveInventoryDataObserver.php
app/code/Magento/CatalogInventory/Test/Unit/Api/StockRegistryTest.php 1 addition, 2 deletions

...ento/CatalogInventory/Test/Unit/Api/StockRegistryTest.php
app/code/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php 6 additions, 34 deletions

...e/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php

with 108 additions and 281 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/CatalogStaging' into CatalogStaging