MAGETWO-64996: Out of stock configurable product displays with zero price

Author: Eric Bohanon

app/code/Magento/CatalogInventory/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php

@@ -22,6 +22,11 @@ class StockStatusBaseSelectProcessor implements BaseSelectProcessorInterface
      */
     private $resource;
 
+    /**
+     * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
+     */
+    private $stockConfig;
+
     /**
      * @var \Magento\Indexer\Model\ResourceModel\FrontendResource
      */
@@ -30,14 +35,18 @@ class StockStatusBaseSelectProcessor implements BaseSelectProcessorInterface
     /**
      * @param ResourceConnection $resource
      * @param null|\Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource
+     * @param \Magento\CatalogInventory\Api\StockConfigurationInterface|null $stockConfig
      */
     public function __construct(
         ResourceConnection $resource,
-        \Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource = null
+        \Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource = null,
+        \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfig = null
     ) {
         $this->resource = $resource;
         $this->indexerStockFrontendResource = $indexerStockFrontendResource ?: ObjectManager::getInstance()
             ->get(\Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\FrontendResource::class);
+        $this->stockConfig = $stockConfig ?: ObjectManager::getInstance()
+            ->get(\Magento\CatalogInventory\Api\StockConfigurationInterface::class);
     }
 
     /**
@@ -50,13 +59,15 @@ public function process(Select $select)
     {
         $stockStatusTable = $this->indexerStockFrontendResource->getMainTable();
 
-        /** @var Select $select */
-        $select->join(
-            ['stock' => $stockStatusTable],
-            sprintf('stock.product_id = %s.entity_id', BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS),
-            []
-        )
-            ->where('stock.stock_status = ?', Stock::STOCK_IN_STOCK);
+        if (!$this->stockConfig->isShowOutOfStock()) {
+            /** @var Select $select */
+            $select->join(
+                ['stock' => $stockStatusTable],
+                sprintf('stock.product_id = %s.entity_id', BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS),
+                []
+            )->where('stock.stock_status = ?', Stock::STOCK_IN_STOCK);
+        }
+
         return $select;
     }
 }

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductOutOfStockPriceDisplays.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ConfigurableProduct\Test\Constraint;
+
+use Magento\Catalog\Test\Constraint\AssertProductPage;
+
+class AssertConfigurableProductOutOfStockPage extends AssertProductPage
+{
+    /**
+     * Verifies that all relevant product data will be shown for an out of stock configurable product.
+     *
+     * @return array
+     */
+    protected function verify()
+    {
+        $errors = parent::verify();
+
+        return array_filter($errors);
+    }
+
+    /**
+     * Verify displayed product price on product page (front-end) equals passed from fixture
+     *
+     * @return string|null
+     */
+    protected function verifyPrice()
+    {
+        $priceBlock = $this->productView->getPriceBlock();
+        if (!$priceBlock->isVisible()) {
+            return "Price block for '{$this->product->getName()}' product' is not visible.";
+        }
+        $formPrice = $priceBlock->isOldPriceVisible() ? $priceBlock->getOldPrice() : $priceBlock->getPrice();
+        $fixturePrice = $this->getLowestConfigurablePrice();
+
+        if ($fixturePrice != $formPrice) {
+            return "Displayed product price on product page (front-end) not equals passed from fixture. "
+                . "Actual: {$formPrice}, expected: {$fixturePrice}.";
+        }
+        return null;
+    }
+
+    /**
+     * Returns lowest possible price of configurable product.
+     *
+     * @return string
+     */
+    protected function getLowestConfigurablePrice()
+    {
+        $price = null;
+        $priceDataConfig = $this->product->getDataFieldConfig('price');
+        if (isset($priceDataConfig['source'])) {
+            $priceData = $priceDataConfig['source']->getPriceData();
+            if (isset($priceData['price_from'])) {
+                $price = $priceData['price_from'];
+            }
+        }
+
+        if (null === $price) {
+            $configurableOptions = $this->product->getConfigurableAttributesData();
+            foreach ($configurableOptions['matrix'] as $option) {
+                $price = $price === null ? $option['price'] : $price;
+                if ($price > $option['price']) {
+                    $price = $option['price'];
+                }
+            }
+        }
+        return $price;
+    }
+}

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml

@@ -186,6 +186,7 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableAttributesBlockIsAbsentOnProductPage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
+            <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductOutOfStockPage" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation12" summary="Create Configurable Product with disabled child" ticketId="MAGETWO-65661">
             <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>