Merge remote-tracking branch 'mainline/develop' into pull-primary

Author: Oleksandr Dubovyk

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php

@@ -48,6 +48,11 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
      */
     private $selectedOptions = [];
 
+    /**
+     * @var \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
+     */
+    private $catalogRuleProcessor;
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
@@ -77,6 +82,20 @@ public function __construct(
         );
     }
 
+    /**
+     * @deprecated
+     * @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
+     */
+    private function getCatalogRuleProcessor()
+    {
+        if ($this->catalogRuleProcessor === null) {
+            $this->catalogRuleProcessor = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor::class);
+        }
+
+        return $this->catalogRuleProcessor;
+    }
+
     /**
      * Returns the bundle product options
      * Will return cached options data if the product options are already initialized
@@ -89,6 +108,7 @@ public function getOptions($stripSelection = false)
     {
         if (!$this->options) {
             $product = $this->getProduct();
+            /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
             $typeInstance = $product->getTypeInstance();
             $typeInstance->setStoreFilter($product->getStoreId(), $product);
 
@@ -98,6 +118,8 @@ public function getOptions($stripSelection = false)
                 $typeInstance->getOptionsIds($product),
                 $product
             );
+            $this->getCatalogRuleProcessor()->addPriceData($selectionCollection);
+            $selectionCollection->addTierPriceData();
 
             $this->options = $optionCollection->appendSelections(
                 $selectionCollection,

app/code/Magento/Bundle/Model/Product/Type.php

@@ -9,6 +9,7 @@
 namespace Magento\Bundle\Model\Product;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
@@ -42,6 +43,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Cache key for Selections Collection
      *
      * @var string
+     * @deprecated
      */
     protected $_keySelectionsCollection = '_cache_instance_selections_collection';
 
@@ -449,30 +451,24 @@ public function getOptionsCollection($product)
      */
     public function getSelectionsCollection($optionIds, $product)
     {
-        $keyOptionIds = is_array($optionIds) ? implode('_', $optionIds) : '';
-        $key = $this->_keySelectionsCollection . $keyOptionIds;
-        if (!$product->hasData($key)) {
-            $storeId = $product->getStoreId();
-            $selectionsCollection = $this->_bundleCollection->create()
-                ->addAttributeToSelect($this->_config->getProductAttributes())
-                ->addAttributeToSelect('tax_class_id')//used for calculation item taxes in Bundle with Dynamic Price
-                ->setFlag('product_children', true)
-                ->setPositionOrder()
-                ->addStoreFilter($this->getStoreFilter($product))
-                ->setStoreId($storeId)
-                ->addFilterByRequiredOptions()
-                ->setOptionIdsFilter($optionIds);
-
-            if (!$this->_catalogData->isPriceGlobal() && $storeId) {
-                $websiteId = $this->_storeManager->getStore($storeId)
-                    ->getWebsiteId();
-                $selectionsCollection->joinPrices($websiteId);
-            }
-
-            $product->setData($key, $selectionsCollection);
+        $storeId = $product->getStoreId();
+        $selectionsCollection = $this->_bundleCollection->create()
+            ->addAttributeToSelect($this->_config->getProductAttributes())
+            ->addAttributeToSelect('tax_class_id') //used for calculation item taxes in Bundle with Dynamic Price
+            ->setFlag('product_children', true)
+            ->setPositionOrder()
+            ->addStoreFilter($this->getStoreFilter($product))
+            ->setStoreId($storeId)
+            ->addFilterByRequiredOptions()
+            ->setOptionIdsFilter($optionIds);
+
+        if (!$this->_catalogData->isPriceGlobal() && $storeId) {
+            $websiteId = $this->_storeManager->getStore($storeId)
+                ->getWebsiteId();
+            $selectionsCollection->joinPrices($websiteId);
         }
 
-        return $product->getData($key);
+        return $selectionsCollection;
     }
 
     /**
@@ -543,42 +539,33 @@ public function isSalable($product)
             return $product->getData('all_items_salable');
         }
 
-        $optionCollection = $this->getOptionsCollection($product);
-
-        if (!count($optionCollection->getItems())) {
-            return false;
-        }
+        $isSalable = false;
+        foreach ($this->getOptionsCollection($product)->getItems() as $option) {
+            $hasSalable = false;
 
-        $requiredOptionIds = [];
+            $selectionsCollection = $this->_bundleCollection->create();
+            $selectionsCollection->addAttributeToSelect('status');
+            $selectionsCollection->addQuantityFilter();
+            $selectionsCollection->addFilterByRequiredOptions();
+            $selectionsCollection->setOptionIdsFilter([$option->getId()]);
 
-        foreach ($optionCollection->getItems() as $option) {
-            if ($option->getRequired()) {
-                $requiredOptionIds[$option->getId()] = 0;
+            foreach ($selectionsCollection as $selection) {
+                if ($selection->isSalable()) {
+                    $hasSalable = true;
+                    break;
+                }
             }
-        }
 
-        $selectionCollection = $this->getSelectionsCollection($optionCollection->getAllIds(), $product);
+            if ($hasSalable) {
+                $isSalable = true;
+            }
 
-        if (!count($selectionCollection->getItems())) {
-            return false;
-        }
-        $salableSelectionCount = 0;
-
-        foreach ($selectionCollection as $selection) {
-            /* @var $selection \Magento\Catalog\Model\Product */
-            if ($selection->isSalable()) {
-                $selectionEnoughQty = $this->_stockRegistry->getStockItem($selection->getId())
-                    ->getManageStock()
-                    ? $selection->getSelectionQty() <= $this->_stockState->getStockQty($selection->getId())
-                    : $selection->isInStock();
-
-                if (!$selection->hasSelectionQty() || $selection->getSelectionCanChangeQty() || $selectionEnoughQty) {
-                    $requiredOptionIds[$selection->getOptionId()] = 1;
-                    $salableSelectionCount++;
-                }
+            if (!$hasSalable && $option->getRequired()) {
+                $isSalable = false;
+                break;
             }
         }
-        $isSalable = array_sum($requiredOptionIds) == count($requiredOptionIds) && $salableSelectionCount;
+
         $product->setData('all_items_salable', $isSalable);
 
         return $isSalable;

app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php

@@ -5,10 +5,12 @@
  */
 namespace Magento\Bundle\Model\ResourceModel\Selection;
 
+use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\DB\Select;
+
 /**
  * Bundle Selections Resource Collection
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -19,6 +21,23 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     protected $_selectionTable;
 
+    /**
+     * @var DataObject
+     */
+    private $itemPrototype = null;
+
+    /**
+     * @var \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
+     */
+    private $catalogRuleProcessor = null;
+
+    /**
+     * Is website scope prices joined to collection
+     *
+     * @var bool
+     */
+    private $websiteScopePriceJoined = false;
+
     /**
      * Initialize collection
      *
@@ -90,6 +109,8 @@ public function joinPrices($websiteId)
                 'price_scope' => 'price.website_id'
             ]
         );
+        $this->websiteScopePriceJoined = true;
+
         return $this;
     }
 
@@ -131,4 +152,105 @@ public function setPositionOrder()
         $this->getSelect()->order('selection.position asc')->order('selection.selection_id asc');
         return $this;
     }
+
+    /**
+     * Add filtering of product then havent enoght stock
+     *
+     * @return $this
+     */
+    public function addQuantityFilter()
+    {
+        $this->getSelect()
+            ->joinInner(
+                ['stock' => $this->getTable('cataloginventory_stock_status')],
+                'selection.product_id = stock.product_id',
+                []
+            )
+            ->where(
+                '(selection.selection_can_change_qty or selection.selection_qty <= stock.qty) and stock.stock_status'
+            );
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getNewEmptyItem()
+    {
+        if (null === $this->itemPrototype) {
+            $this->itemPrototype = parent::getNewEmptyItem();
+        }
+        return clone $this->itemPrototype;
+    }
+
+    /**
+     * Add filter by price
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @param bool $searchMin
+     * @param bool $useRegularPrice
+     *
+     * @return $this
+     */
+    public function addPriceFilter($product, $searchMin, $useRegularPrice = false)
+    {
+        if ($product->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC) {
+            $this->addPriceData();
+            if ($useRegularPrice) {
+                $minimalPriceExpression = 'price';
+            } else {
+                $this->getCatalogRuleProcessor()->addPriceData($this, 'selection.product_id');
+                $minimalPriceExpression = 'LEAST(minimal_price, IFNULL(catalog_rule_price, minimal_price))';
+            }
+            $orderByValue = new \Zend_Db_Expr(
+                '(' .
+                $minimalPriceExpression .
+                ' * selection.selection_qty' .
+                ')'
+            );
+        } else {
+            $connection = $this->getConnection();
+            $priceType = $connection->getIfNullSql(
+                'price.selection_price_type',
+                'selection.selection_price_type'
+            );
+            $priceValue = $connection->getIfNullSql(
+                'price.selection_price_value',
+                'selection.selection_price_value'
+            );
+            if (!$this->websiteScopePriceJoined) {
+                $websiteId = $this->_storeManager->getStore()->getWebsiteId();
+                $this->getSelect()->joinLeft(
+                    ['price' => $this->getTable('catalog_product_bundle_selection_price')],
+                    'selection.selection_id = price.selection_id AND price.website_id = ' . (int)$websiteId,
+                    []
+                );
+            }
+            $price = $connection->getCheckSql(
+                $priceType . ' = 1',
+                (float) $product->getPrice() . ' * '. $priceValue . ' / 100',
+                $priceValue
+            );
+            $orderByValue = new \Zend_Db_Expr('('. $price. ' * '. 'selection.selection_qty)');
+        }
+
+        $this->getSelect()->reset(Select::ORDER);
+        $this->getSelect()->order($orderByValue . ($searchMin ? Select::SQL_ASC : Select::SQL_DESC));
+        $this->getSelect()->limit(1);
+        return $this;
+    }
+
+    /**
+     * @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
+     * @deprecated
+     */
+    private function getCatalogRuleProcessor()
+    {
+        if (null === $this->catalogRuleProcessor) {
+            $this->catalogRuleProcessor = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor::class);
+        }
+
+        return $this->catalogRuleProcessor;
+    }
 }