Merge remote-tracking branch 'remotes/github/MC-10973' into EPAM-PR-41

Author: VeronikaYarats

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

@@ -1446,22 +1446,4 @@ function($attr) {
 
         return array_unique(array_merge($productAttributes, $requiredAttributes, $usedAttributes));
     }
-
-    /**
-     * Returns msrp for children products
-     *
-     * @param \Magento\Catalog\Model\Product $product
-     * @return int
-     */
-    public function getChildrenMsrp(\Magento\Catalog\Model\Product $product)
-    {
-        $prices = [];
-        foreach ($this->getUsedProducts($product) as $item) {
-            if ($item->getMsrp() !== null) {
-                $prices[] = $item->getMsrp();
-            }
-        }
-        return $prices ? max($prices) : 0;
-    }
-
 }

app/code/Magento/Msrp/Helper/Data.php

@@ -11,6 +11,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
  * Msrp data helper
@@ -158,11 +159,19 @@ public function isMinimalPriceLessMsrp($product)
         $msrp = $product->getMsrp();
         $price = $product->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE);
         if ($msrp === null) {
-            if ($product->getTypeId()       !== \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
-                && $product->getTypeId() !== \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE) {
-                return false;
-            } else {
+            if ($product->getTypeId() === \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
                 $msrp = $product->getTypeInstance()->getChildrenMsrp($product);
+            } elseif ($product->getTypeId() === Configurable::TYPE_CODE) {
+                $prices = [];
+                foreach ($product->getTypeInstance()->getUsedProducts($product) as $item) {
+                    if ($item->getMsrp() !== null) {
+                        $prices[] = $item->getMsrp();
+                    }
+                }
+
+                $msrp = $prices ? max($prices) : 0;
+            } else {
+                return false;
             }
         }
         if ($msrp) {

app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml

@@ -20,7 +20,21 @@ $priceType = $block->getPrice();
 /** @var $product \Magento\Catalog\Model\Product */
 $product = $block->getSaleableItem();
 $productId = $product->getId();
-$amount = $product->getMsrp() ?: $product->getTypeInstance()->getChildrenMsrp($product);
+
+$amount = 0;
+if ($product->getMsrp()) {
+    $amount = $product->getMsrp();
+} elseif ($product->getTypeId() === \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
+    $amount = $product->getTypeInstance()->getChildrenMsrp($product);
+} elseif ($product->getTypeId() === \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE) {
+    foreach ($product->getTypeInstance()->getUsedProducts($product) as $item) {
+        if ($item->getMsrp() !== null) {
+            $prices[] = $item->getMsrp();
+        }
+    }
+    $amount = $prices ? max($prices) : 0;
+}
+
 $msrpPrice = $block->renderAmount(
     $priceType->getCustomAmount($amount),
     [