Merge remote-tracking branch 'origin/CatalogStaging' into CatalogStaging
Showing
- app/code/Magento/Bundle/Model/ResourceModel/Selection.php 3 additions, 2 deletionsapp/code/Magento/Bundle/Model/ResourceModel/Selection.php
- app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php 77 additions, 14 deletions...ode/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
- app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php 0 additions, 5 deletions...ontroller/Adminhtml/Product/Initialization/HelperTest.php
- 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 2 additions, 2 deletions...code/Magento/CatalogImportExport/Model/Import/Product.php
- app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php 22 additions, 4 deletions...atalogImportExport/Test/Unit/Model/Import/ProductTest.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 deletionsapp/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 deletionapp/code/Magento/CatalogInventory/Model/Stock/Item.php
- app/code/Magento/CatalogInventory/Model/StockIndex.php 3 additions, 15 deletionsapp/code/Magento/CatalogInventory/Model/StockIndex.php
- app/code/Magento/CatalogInventory/Model/StockManagement.php 12 additions, 23 deletionsapp/code/Magento/CatalogInventory/Model/StockManagement.php
- app/code/Magento/CatalogInventory/Model/StockRegistry.php 32 additions, 53 deletionsapp/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 deletionsapp/code/Magento/CatalogInventory/Model/StockResolver.php
- app/code/Magento/CatalogInventory/Model/StockState.php 8 additions, 24 deletionsapp/code/Magento/CatalogInventory/Model/StockState.php
Please register or sign in to comment