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

Dmytro Voskoboinikov · Dmytro Voskoboinikov · commit 7ab0846d8616 · 2017-10-04T14:12:39.000+03:00
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml
@@ -3,11 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-
 <?php
 /** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
 /** @var \Magento\Catalog\Pricing\Price\ConfiguredPrice $configuredPrice */
@@ -18,13 +14,11 @@ $priceLabel = ($block->getPriceLabel() !== null)
     : '';
 ?>
 <p class="price-as-configured">
-    <?php if($configuredPrice->getAmount()->getValue() !== null): ?>
-        <?= /* @noEscape */ $block->renderAmount($configuredPrice->getAmount(), [
-            'display_label'     => $priceLabel,
-            'price_id'          => $block->getPriceId('product-price-'),
-            'price_type'        => 'finalPrice',
-            'include_container' => true,
-            'schema' => $schema
-        ]); ?>
-    <?php endif; ?>
+    <?= /* @escapeNotVerified */ $block->renderAmount($configuredPrice->getAmount(), [
+        'display_label'     => $priceLabel,
+        'price_id'          => $block->getPriceId('product-price-'),
+        'price_type'        => 'finalPrice',
+        'include_container' => true,
+        'schema' => $schema
+    ]); ?>
 </p>
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Pricing/Renderer/SalableResolver.php b/app/code/Magento/ConfigurableProduct/Model/Product/Pricing/Renderer/SalableResolver.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Model\Product\Pricing\Renderer;
+
+use Magento\Framework\Pricing\SaleableInterface;
+use Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolverInterface;
+use Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProviderInterface;
+
+/**
+ * A decorator for a salable resolver.
+ *
+ * Extends functionality of the salable resolver by performing the additional check
+ * which is related to configurable products.
+ */
+class SalableResolver implements SalableResolverInterface
+{
+    /**
+     * @var SalableResolverInterface
+     */
+    private $salableResolver;
+
+    /**
+     * @var LowestPriceOptionsProviderInterface
+     */
+    private $lowestPriceOptionsProvider;
+
+    /**
+     * @param SalableResolverInterface $salableResolver
+     * @param LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
+     */
+    public function __construct(
+        SalableResolverInterface $salableResolver,
+        LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
+    ) {
+        $this->salableResolver = $salableResolver;
+        $this->lowestPriceOptionsProvider = $lowestPriceOptionsProvider;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isSalable(SaleableInterface $salableItem)
+    {
+        if ($this->lowestPriceOptionsProvider->getProducts($salableItem)) {
+            return $this->salableResolver->isSalable($salableItem);
+        }
+
+        return false;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php
@@ -55,7 +55,8 @@ public function __construct(
 
     /**
      * @param \Magento\Framework\Pricing\SaleableInterface|\Magento\Catalog\Model\Product $product
-     * @return float|null
+     * @return float
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $product)
     {
@@ -66,6 +67,6 @@ public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $produ
             $price = $price ? min($price, $productPrice) : $productPrice;
         }
 
-        return $price === null ? null : (float)$price;
+        return (float)$price;
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -206,4 +206,9 @@
             <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>
 </config>
diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
@@ -38,7 +38,7 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
             'skip_adjustments'  => true
         ]); ?>
     </span>
-<?php elseif($finalPriceModel->getAmount()->getValue() !== null): ?>
+<?php else: ?>
     <?php /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), [
         'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
         'price_type'        => 'finalPrice',
diff --git a/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php b/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php
@@ -26,7 +26,7 @@ public function getValue()
         $product = $customOption ? $customOption->getProduct() : $this->getProduct();
         $price = $product->getPriceInfo()->getPrice(self::PRICE_CODE)->getValue();
 
-        return $price === null ? null : max(0, $price);
+        return max(0, $price);
     }
 
     /**
diff --git a/app/code/Magento/Wishlist/etc/di.xml b/app/code/Magento/Wishlist/etc/di.xml
@@ -78,4 +78,9 @@
             </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>
diff --git a/app/code/Magento/Wishlist/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Wishlist/view/base/layout/catalog_product_prices.xml
@@ -16,6 +16,13 @@
                     </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>

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ public function __construct(`
`55`	`55`
`56`	`56`	`/**`
`57`	`57`	`* @param \Magento\Framework\Pricing\SaleableInterface\|\Magento\Catalog\Model\Product $product`
`58`		`- * @return float\|null`
	`58`	`+ * @return float`
	`59`	`+ * @throws \Magento\Framework\Exception\LocalizedException`
`59`	`60`	`*/`
`60`	`61`	`public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $product)`
`61`	`62`	`{`
`@@ -66,6 +67,6 @@ public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $produ`
`66`	`67`	`$price = $price ? min($price, $productPrice) : $productPrice;`
`67`	`68`	`}`
`68`	`69`
`69`		`- return $price === null ? null : (float)$price;`
	`70`	`+ return (float)$price;`
`70`	`71`	`}`
`71`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function getValue()`
`26`	`26`	`$product = $customOption ? $customOption->getProduct() : $this->getProduct();`
`27`	`27`	`$price = $product->getPriceInfo()->getPrice(self::PRICE_CODE)->getValue();`
`28`	`28`
`29`		`- return $price === null ? null : max(0, $price);`
	`29`	`+ return max(0, $price);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`