MAGETWO-72582: Configurable product displays the price of "out of stock" configuration

Author: Dmytro Voskoboinikov

app/code/Magento/ConfigurableProduct/Model/Product/Pricing/Renderer/SalableResolver.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Plugin\Catalog\Model\Product\Pricing\Renderer;
+
+use Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProviderInterface;
+
+/**
+ * A plugin for a salable resolver.
+ */
+class SalableResolver
+{
+    /**
+     * @var LowestPriceOptionsProviderInterface
+     */
+    private $lowestPriceOptionsProvider;
+
+    /**
+     * @param LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
+     */
+    public function __construct(
+        LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
+    ) {
+        $this->lowestPriceOptionsProvider = $lowestPriceOptionsProvider;
+    }
+
+    /**
+     * Performs an additional check whether given configurable product has
+     * at least one configuration in-stock.
+     *
+     * @param \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver $subject
+     * @param bool $result
+     * @param \Magento\Framework\Pricing\SaleableInterface $salableItem
+     *
+     * @return bool
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterIsSalable(
+        \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver $subject,
+        $result,
+        \Magento\Framework\Pricing\SaleableInterface $salableItem
+    ) {
+        if ($salableItem->getTypeId() == 'configurable' && $result) {
+            if (!$this->lowestPriceOptionsProvider->getProducts($salableItem)) {
+                $result = false;
+            }
+        }
+
+        return $result;
+    }
+}

app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php

@@ -206,9 +206,7 @@
             <argument name="baseSelectProcessor" xsi:type="object">Magento\ConfigurableProduct\Model\ResourceModel\Product\StockStatusBaseSelectProcessor</argument>
         </arguments>
     </type>
-    <type name="Magento\ConfigurableProduct\Pricing\Render\FinalPriceBox">
-        <arguments>
-            <argument name="salableResolver" xsi:type="object">Magento\ConfigurableProduct\Model\Product\Pricing\Renderer\SalableResolver</argument>
-        </arguments>
+    <type name="Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver">
+        <plugin name="configurable" type="Magento\ConfigurableProduct\Plugin\Catalog\Model\Product\Pricing\Renderer\SalableResolver" />
     </type>
 </config>

app/code/Magento/ConfigurableProduct/etc/di.xml

@@ -78,9 +78,4 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\Wishlist\Pricing\Render\Configurable\ConfiguredPriceBox" type="Magento\Wishlist\Pricing\Render\ConfiguredPriceBox">
-        <arguments>
-            <argument name="salableResolver" xsi:type="object">Magento\ConfigurableProduct\Model\Product\Pricing\Renderer\SalableResolver</argument>
-        </arguments>
-    </virtualType>
 </config>

app/code/Magento/Wishlist/etc/di.xml

@@ -16,13 +16,6 @@
                     </item>
                 </item>
             </argument>
-            <argument name="configurable" xsi:type="array">
-                <item name="prices" xsi:type="array">
-                    <item name="wishlist_configured_price" xsi:type="array">
-                        <item name="render_class" xsi:type="string">Magento\Wishlist\Pricing\Render\Configurable\ConfiguredPriceBox</item>
-                    </item>
-                </item>
-            </argument>
         </arguments>
     </referenceBlock>
 </layout>

app/code/Magento/Wishlist/view/base/layout/catalog_product_prices.xml

@@ -30,16 +30,25 @@ protected function verify()
     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}.";
+        if ($fixturePrice === null) {
+            if ($priceBlock->isVisible()) {
+                return "Price block for '{$this->product->getName()}' product' is visible.";
+            }
+        } else {
+            if (!$priceBlock->isVisible()) {
+                return "Price block for '{$this->product->getName()}' product' is not visible.";
+            }
+
+            $formPrice = $priceBlock->isOldPriceVisible() ? $priceBlock->getOldPrice() : $priceBlock->getPrice();
+
+            if ($fixturePrice != $formPrice) {
+                return "Displayed product price on product page (front-end) not equals passed from fixture. "
+                    . "Actual: {$formPrice}, expected: {$fixturePrice}.";
+            }
         }
+
         return null;
     }