Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-89417

Author: adifucan

app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php

@@ -14,6 +14,9 @@
 use Magento\Backend\Block\Widget\Grid;
 use Magento\Backend\Block\Widget\Grid\Column;
 use Magento\Backend\Block\Widget\Grid\Extended;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\App\ObjectManager;
 
 class Product extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -29,22 +32,38 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Extended
      */
     protected $_productFactory;
 
+    /**
+     * @var Status
+     */
+    private $status;
+
+    /**
+     * @var Visibility
+     */
+    private $visibility;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
+     * @param Visibility|null $visibility
+     * @param Status|null $status
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
         \Magento\Catalog\Model\ProductFactory $productFactory,
         \Magento\Framework\Registry $coreRegistry,
-        array $data = []
+        array $data = [],
+        Visibility $visibility = null,
+        Status $status = null
     ) {
         $this->_productFactory = $productFactory;
         $this->_coreRegistry = $coreRegistry;
+        $this->visibility = $visibility ?: ObjectManager::getInstance()->get(Visibility::class);
+        $this->status = $status ?: ObjectManager::getInstance()->get(Status::class);
         parent::__construct($context, $backendHelper, $data);
     }
 
@@ -102,6 +121,10 @@ protected function _prepareCollection()
             'name'
         )->addAttributeToSelect(
             'sku'
+        )->addAttributeToSelect(
+            'visibility'
+        )->addAttributeToSelect(
+            'status'
         )->addAttributeToSelect(
             'price'
         )->joinField(
@@ -159,6 +182,28 @@ protected function _prepareColumns()
         );
         $this->addColumn('name', ['header' => __('Name'), 'index' => 'name']);
         $this->addColumn('sku', ['header' => __('SKU'), 'index' => 'sku']);
+        $this->addColumn(
+            'visibility',
+            [
+                'header' => __('Visibility'),
+                'index' => 'visibility',
+                'type' => 'options',
+                'options' => $this->visibility->getOptionArray(),
+                'header_css_class' => 'col-visibility',
+                'column_css_class' => 'col-visibility'
+            ]
+        );
+
+        $this->addColumn(
+            'status',
+            [
+                'header' => __('Status'),
+                'index' => 'status',
+                'type' => 'options',
+                'options' => $this->status->getOptionArray()
+            ]
+        );
+
         $this->addColumn(
             'price',
             [

app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php

@@ -115,47 +115,6 @@ public function execute()
         return $this;
     }
 
-    /**
-     * Return select for remove unnecessary data
-     *
-     * @return \Magento\Framework\DB\Select
-     *
-     * @deprecated Not used anymore.
-     * @see clearCurrentTable()
-     */
-    protected function getSelectUnnecessaryData()
-    {
-        return $this->connection->select()->from(
-            $this->getMainTable(),
-            []
-        )->joinLeft(
-            ['t' => $this->getMainTable()],
-            $this->getMainTable() .
-            '.category_id = t.category_id AND ' .
-            $this->getMainTable() .
-            '.store_id = t.store_id AND ' .
-            $this->getMainTable() .
-            '.product_id = t.product_id',
-            []
-        )->where(
-            't.category_id IS NULL'
-        );
-    }
-
-    /**
-     * Remove unnecessary data
-     *
-     * @return void
-     *
-     * @deprecated Not used anymore.
-     * @see clearCurrentTable()
-     */
-    protected function removeUnnecessaryData()
-    {
-        //Called for backward compatibility.
-        $this->getSelectUnnecessaryData();
-    }
-
     /**
      * Publish data from tmp to index
      *
@@ -254,8 +213,6 @@ private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSe
                 )
             );
             $this->publishData();
-            //Called for backward compatibility.
-            $this->removeUnnecessaryData();
         }
     }
 }

app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml

@@ -40,22 +40,10 @@
     </div>
 </div>
 <?php endif; ?>
-<?php if ($block->isRedirectToCartEnabled()) : ?>
-<script type="text/x-magento-init">
-    {
-        "#product_addtocart_form": {
-            "Magento_Catalog/product/view/validation": {
-                "radioCheckboxClosest": ".nested"
-            }
-        }
-    }
-</script>
-<?php else : ?>
 <script type="text/x-magento-init">
     {
         "#product_addtocart_form": {
             "Magento_Catalog/js/validate-product": {}
         }
     }
 </script>
-<?php endif; ?>

app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php

@@ -104,8 +104,7 @@ public function validate(Observer $observer)
         $quoteItem = $observer->getEvent()->getItem();
         if (!$quoteItem ||
             !$quoteItem->getProductId() ||
-            !$quoteItem->getQuote() ||
-            $quoteItem->getQuote()->getIsSuperMode()
+            !$quoteItem->getQuote()
         ) {
             return;
         }
@@ -118,6 +117,18 @@ public function validate(Observer $observer)
             throw new LocalizedException(__('The Product stock item is invalid. Verify the stock item and try again.'));
         }
 
+        if (($options = $quoteItem->getQtyOptions()) && $qty > 0) {
+            foreach ($options as $option) {
+                $this->optionInitializer->initialize($option, $quoteItem, $qty);
+            }
+        } else {
+            $this->stockItemInitializer->initialize($stockItem, $quoteItem, $qty);
+        }
+
+        if ($quoteItem->getQuote()->getIsSuperMode()) {
+            return;
+        }
+
         /* @var \Magento\CatalogInventory\Api\Data\StockStatusInterface $stockStatus */
         $stockStatus = $this->stockRegistry->getStockStatus($product->getId(), $product->getStore()->getWebsiteId());
 
@@ -160,7 +171,7 @@ public function validate(Observer $observer)
         /**
          * Check item for options
          */
-        if (($options = $quoteItem->getQtyOptions()) && $qty > 0) {
+        if ($options) {
             $qty = $product->getTypeInstance()->prepareQuoteItemQty($qty, $product);
             $quoteItem->setData('qty', $qty);
             if ($stockStatus) {
@@ -194,7 +205,7 @@ public function validate(Observer $observer)
             $removeError = true;
 
             foreach ($options as $option) {
-                $result = $this->optionInitializer->initialize($option, $quoteItem, $qty);
+                $result = $option->getStockStateResult();
                 if ($result->getHasError()) {
                     $option->setHasError(true);
                     //Setting this to false, so no error statuses are cleared
@@ -207,7 +218,7 @@ public function validate(Observer $observer)
             }
         } else {
             if ($quoteItem->getParentItem() === null) {
-                $result = $this->stockItemInitializer->initialize($stockItem, $quoteItem, $qty);
+                $result = $quoteItem->getStockStateResult();
                 if ($result->getHasError()) {
                     $this->addErrorInfoToQuote($result, $quoteItem);
                 } else {

app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php

@@ -133,6 +133,8 @@ public function initialize(
 
         $stockItem->unsIsChildItem();
 
+        $option->setStockStateResult($result);
+
         return $result;
     }
 }

app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php

@@ -135,6 +135,8 @@ public function initialize(
             $quoteItem->setBackorders($result->getItemBackorders());
         }
 
+        $quoteItem->setStockStateResult($result);
+
         return $result;
     }
 }

app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QuantityValidatorTest.php

@@ -278,8 +278,11 @@ public function testValidateWithOptions()
     {
         $optionMock = $this->getMockBuilder(OptionItem::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setHasError'])
+            ->setMethods(['setHasError', 'getStockStateResult'])
             ->getMock();
+        $optionMock->expects($this->once())
+            ->method('getStockStateResult')
+            ->willReturn($this->resultMock);
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
@@ -316,14 +319,17 @@ public function testValidateWithOptionsAndError()
     {
         $optionMock = $this->getMockBuilder(OptionItem::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setHasError'])
+            ->setMethods(['setHasError', 'getStockStateResult'])
             ->getMock();
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
         $this->stockRegistryMock->expects($this->at(1))
             ->method('getStockStatus')
             ->willReturn($this->stockStatusMock);
+        $optionMock->expects($this->once())
+            ->method('getStockStateResult')
+            ->willReturn($this->resultMock);
         $options = [$optionMock];
         $this->createInitialStub(1);
         $this->setUpStubForQuantity(1, true);
@@ -354,12 +360,15 @@ public function testValidateAndRemoveErrorsFromQuote()
     {
         $optionMock = $this->getMockBuilder(OptionItem::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setHasError'])
+            ->setMethods(['setHasError', 'getStockStateResult'])
             ->getMock();
         $quoteItem = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
             ->setMethods(['getItemId', 'getErrorInfos'])
             ->getMock();
+        $optionMock->expects($this->once())
+            ->method('getStockStateResult')
+            ->willReturn($this->resultMock);
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);

app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/StockItemTest.php

@@ -84,6 +84,7 @@ public function testInitializeWithSubitem()
                     'setMessage',
                     'setBackorders',
                     '__wakeup',
+                    'setStockStateResult'
                 ]
             )
             ->disableOriginalConstructor()
@@ -178,6 +179,7 @@ public function testInitializeWithSubitem()
         $quoteItem->expects($this->once())->method('setMessage')->with('message')->will($this->returnSelf());
         $result->expects($this->exactly(2))->method('getItemBackorders')->will($this->returnValue('backorders'));
         $quoteItem->expects($this->once())->method('setBackorders')->with('backorders')->will($this->returnSelf());
+        $quoteItem->expects($this->once())->method('setStockStateResult')->with($result)->will($this->returnSelf());
 
         $this->model->initialize($stockItem, $quoteItem, $qty);
     }

app/code/Magento/CatalogSearch/Model/Fulltext.php

@@ -73,6 +73,8 @@ protected function _construct()
      * Reset search results cache
      *
      * @return $this
+     * @deprecated Not used anymore
+     * @see \Magento\CatalogSearch\Model\ResourceModel\Fulltext::resetSearchResultsByStore
      */
     public function resetSearchResults()
     {