Merge pull request #4725 from magento-chaika/Chaika-PR-2019-09-03-2.2

Chaika-PR-2019-09-03-2.2

Author: dhorytskyi

app/code/Magento/Sales/Block/Adminhtml/Order/View.php

@@ -466,6 +466,8 @@ public function getReviewPaymentUrl($action)
     }
 
     /**
+     * Get edit message
+     *
      * @param \Magento\Sales\Model\Order $order
      * @return \Magento\Framework\Phrase
      */
@@ -486,6 +488,8 @@ protected function getEditMessage($order)
     }
 
     /**
+     * Get non editable types
+     *
      * @param \Magento\Sales\Model\Order $order
      * @return array
      */

app/code/Magento/Tax/Block/Checkout/Discount.php

@@ -39,6 +39,8 @@ public function __construct(
     }
 
     /**
+     * Get display including and excluding tax config
+     *
      * @return bool
      */
     public function displayBoth()

app/code/Magento/Tax/Block/Checkout/Subtotal.php

@@ -46,6 +46,8 @@ public function __construct(
     }
 
     /**
+     * Get display including and excluding tax config
+     *
      * @return bool
      */
     public function displayBoth()

app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php

@@ -6,7 +6,11 @@
 namespace Magento\Wishlist\Model\ResourceModel\Item;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+use Magento\CatalogInventory\Model\Stock;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Sales\Model\Config;
 
 /**
  * Wishlist item collection
@@ -144,6 +148,16 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      */
     protected $metadataPool;
 
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
+    /**
+     * @var Config
+     */
+    private $salesConfig;
+
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
@@ -163,6 +177,8 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Wishlist\Model\ResourceModel\Item $resource
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
+     * @param TableMaintainer|null $tableMaintainer
+     * @param  Config|null $salesConfig
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -184,7 +200,9 @@ public function __construct(
         \Magento\Catalog\Model\Entity\AttributeFactory $catalogAttrFactory,
         \Magento\Wishlist\Model\ResourceModel\Item $resource,
         \Magento\Framework\App\State $appState,
-        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null
+        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
+        TableMaintainer $tableMaintainer = null,
+        Config $salesConfig = null
     ) {
         $this->stockConfiguration = $stockConfiguration;
         $this->_adminhtmlSales = $adminhtmlSales;
@@ -199,6 +217,8 @@ public function __construct(
         $this->_catalogAttrFactory = $catalogAttrFactory;
         $this->_appState = $appState;
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
+        $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
+        $this->salesConfig = $salesConfig ?: ObjectManager::getInstance()->get(Config::class);
     }
 
     /**
@@ -330,6 +350,53 @@ protected function _assignProducts()
         return $this;
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected function _renderFiltersBefore()
+    {
+        parent::_renderFiltersBefore();
+
+        $mainTableName = 'main_table';
+        $connection = $this->getConnection();
+
+        if ($this->_productInStock && !$this->stockConfiguration->isShowOutOfStock()) {
+            $inStockConditions = [
+                "stockItem.product_id =  {$mainTableName}.product_id",
+                $connection->quoteInto('stockItem.stock_status = ?', Stock::STOCK_IN_STOCK),
+            ];
+            $this->getSelect()->join(
+                ['stockItem' => $this->getTable('cataloginventory_stock_status')],
+                join(' AND ', $inStockConditions),
+                []
+            );
+        }
+
+        if ($this->_productVisible) {
+            $rootCategoryId = $this->_storeManager->getStore()->getRootCategoryId();
+            $visibleInSiteIds = $this->_productVisibility->getVisibleInSiteIds();
+            $visibilityConditions = [
+                "cat_index.product_id = {$mainTableName}.product_id",
+                $connection->quoteInto('cat_index.category_id = ?', $rootCategoryId),
+                $connection->quoteInto('cat_index.visibility IN (?)', $visibleInSiteIds)
+            ];
+            $this->getSelect()->join(
+                ['cat_index' => $this->tableMaintainer->getMainTable($this->_storeManager->getStore()->getId())],
+                join(' AND ', $visibilityConditions),
+                []
+            );
+        }
+
+        if ($this->_productSalable) {
+            $availableProductTypes = $this->salesConfig->getAvailableProductTypes();
+            $this->getSelect()->join(
+                ['cat_prod' => $this->getTable('catalog_product_entity')],
+                $this->getConnection()->quoteInto('cat_prod.type_id IN (?)', $availableProductTypes),
+                []
+            );
+        }
+    }
+
     /**
      * Add filter by wishlist object
      *