diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php index 0474515b954b7a4afd2f988bd5bc4300fde1d851..8a227f53ebc1fce93a93a809ab5a0c1e887c06c4 100644 --- a/app/code/Magento/CatalogInventory/Helper/Stock.php +++ b/app/code/Magento/CatalogInventory/Helper/Stock.php @@ -69,12 +69,12 @@ class Stock * Assign stock status information to product * * @param Product $product - * @param int $stockStatus + * @param int $status * @return void */ - public function assignStatusToProduct(Product $product, $stockStatus = null) + public function assignStatusToProduct(Product $product, $status = null) { - if ($stockStatus === null) { + if ($status === null) { $websiteId = $product->getStore()->getWebsiteId(); $stockStatus = $this->stockRegistryProvider->getStockStatus($product->getId(), $websiteId); $status = $stockStatus->getStockStatus(); diff --git a/app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php b/app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php index 402807a624217f3989c2adc6f6371c1f3b05cb68..2e9ce4a393fab4de8e9ce06f8cc163aea9a10658 100644 --- a/app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php +++ b/app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php @@ -34,10 +34,7 @@ class AddInventoryDataObserver implements ObserverInterface { $product = $observer->getEvent()->getProduct(); if ($product instanceof \Magento\Catalog\Model\Product) { - $this->stockHelper->assignStatusToProduct( - $product, - $product->getStockStatus() - ); + $this->stockHelper->assignStatusToProduct($product); } } } diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Observer/AddInventoryDataObserverTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Observer/AddInventoryDataObserverTest.php index 9688a418119027ae889d39a296aa861fc2f27d5d..68a73ac1eecaae3c6a075d73697a402b3b9a37c8 100644 --- a/app/code/Magento/CatalogInventory/Test/Unit/Observer/AddInventoryDataObserverTest.php +++ b/app/code/Magento/CatalogInventory/Test/Unit/Observer/AddInventoryDataObserverTest.php @@ -57,24 +57,17 @@ class AddInventoryDataObserverTest extends \PHPUnit_Framework_TestCase public function testAddInventoryData() { - $stockStatus = true; - $product = $this->getMockBuilder('Magento\Catalog\Model\Product') ->disableOriginalConstructor() - ->setMethods(['getStockStatus']) ->getMock(); - $product->expects($this->once()) - ->method('getStockStatus') - ->will($this->returnValue($stockStatus)); - $this->event->expects($this->once()) ->method('getProduct') ->will($this->returnValue($product)); $this->stockHelper->expects($this->once()) ->method('assignStatusToProduct') - ->with($product, $stockStatus) + ->with($product) ->will($this->returnSelf()); $this->observer->execute($this->eventObserver); diff --git a/app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js b/app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js index 12521c18ca6c17c335f758c82311832dcc6ef2ae..e8e61c26b49cfb7e318d712e65b05f920c0a0f73 100644 --- a/app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js +++ b/app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js @@ -65,7 +65,10 @@ define([ if (productType.type.current === 'downloadable') { weight.change(false); weight.$weightSwitcher().one('change', function () { - $(document).trigger('setTypeProduct', null); + $(document).trigger( + 'setTypeProduct', + productType.type.init === 'downloadable' ? 'virtual' : productType.type.init + ); }); this.show(); } else { diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml index 5c27c009b445158c3714fb1464a0c68234537211..420638d5a8ea77aa27b603ba4f8fcdc9d6f4db76 100644 --- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml +++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml @@ -13,14 +13,14 @@ <div class="content" style="clear: both;"> <input type="hidden" name="categories" id="product_categories" value="" /> <?php if ($block->getRoot()): ?> - <div data-mage-init='<?php + <div data-mage-init="<?php echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([ 'categoryTree' => [ 'data' => $block->getTreeArray(null), 'url' => $block->getLoadTreeUrl(), ], ])); - ?>' class="jstree-default"></div> + ?>" class="jstree-default"></div> <?php endif; ?> </div> </fieldset>