Revert "#35881: Final Price for grouped products does not include tax in the Recently Viewed Widget and Meta price"

This reverts commit 0bb2e31.

Author: engcom-Echo

app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Price.php

@@ -11,11 +11,8 @@
 use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductRenderInterface;
 use Magento\Catalog\Model\ProductRender\FormattedPriceInfoBuilder;
-use Magento\Catalog\Pricing\Price\FinalPrice;
-use Magento\Catalog\Pricing\Price\RegularPrice;
 use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\GroupedProduct\Model\Product\Type\Grouped;
 
 /**
  * Collect information about base prices of products
@@ -25,6 +22,18 @@
  */
 class Price implements ProductRenderCollectorInterface
 {
+    /** FInal Price key */
+    const KEY_FINAL_PRICE = "final_price";
+
+    /** Minimal Price key */
+    const KEY_MINIMAL_PRICE = "minimal_price";
+
+    /** Regular Price key */
+    const KEY_REGULAR_PRICE = "regular_price";
+
+    /** Max Price key */
+    const KEY_MAX_PRICE = "max_price";
+
     /**
      * @var PriceCurrencyInterface
      */
@@ -75,38 +84,31 @@ public function collect(ProductInterface $product, ProductRenderInterface $produ
             $priceInfo = $this->priceInfoFactory->create();
         }
 
-        if ($product->getTypeId() === Grouped::TYPE_CODE) {
-            $product = $product
-                ->getPriceInfo()
-                ->getPrice(FinalPrice::PRICE_CODE)
-                ->getMinProduct();
-        }
-
         $priceInfo->setFinalPrice(
             $product
                 ->getPriceInfo()
-                ->getPrice(FinalPrice::PRICE_CODE)
+                ->getPrice('final_price')
                 ->getAmount()
                 ->getValue()
         );
         $priceInfo->setMinimalPrice(
             $product
                 ->getPriceInfo()
-                ->getPrice(FinalPrice::PRICE_CODE)
+                ->getPrice('final_price')
                 ->getMinimalPrice()
                 ->getValue()
         );
         $priceInfo->setRegularPrice(
             $product
                 ->getPriceInfo()
-                ->getPrice(RegularPrice::PRICE_CODE)
+                ->getPrice('regular_price')
                 ->getAmount()
                 ->getValue()
         );
         $priceInfo->setMaxPrice(
             $product
                 ->getPriceInfo()
-                ->getPrice(FinalPrice::PRICE_CODE)
+                ->getPrice('final_price')
                 ->getMaximalPrice()
                 ->getValue()
         );

app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml

@@ -4,47 +4,21 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Catalog\Block\Product\View;
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Pricing\Price\FinalPrice;
-use Magento\Framework\Escaper;
-use Magento\GroupedProduct\Model\Product\Type\Grouped;
-
-/**
- * @var View $block
- * @var Escaper $escaper
- */
+/** @var $block \Magento\Catalog\Block\Product\View */
 ?>
 
 <meta property="og:type" content="product" />
 <meta property="og:title"
-      content="<?= $escaper->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())) ?>" />
+      content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())) ?>" />
 <meta property="og:image"
-      content="<?= $escaper->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>"
-/>
+      content="<?= $block->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>" />
 <meta property="og:description"
-      content="<?= $escaper->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
+      content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
 <meta property="og:url" content="<?= $block->escapeUrl($block->getProduct()->getProductUrl()) ?>" />
-<?php
-if ($block->getProduct()->getTypeId() === Grouped::TYPE_CODE):
-    /** @var Product $minProduct */
-    $minProduct = $block->getProduct()
-        ->getPriceInfo()
-        ->getPrice(FinalPrice::PRICE_CODE)
-        ->getMinProduct();
-
-    $priceAmount = $minProduct->getPriceInfo()
-        ->getPrice(FinalPrice::PRICE_CODE)
-        ->getAmount();
-else:
-    $priceAmount = $block->getProduct()
-        ->getPriceInfo()
-        ->getPrice(FinalPrice::PRICE_CODE)
-        ->getAmount();
-endif;
-?>
-
-<?php if ($priceAmount !== null): ?>
-        <meta property="product:price:amount" content="<?= $block->escapeHtmlAttr($priceAmount) ?>"/>
-        <?= $block->getChildHtml('meta.currency') ?>
+<?php if ($priceAmount = $block->getProduct()
+          ->getPriceInfo()
+          ->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)
+          ->getAmount()):?>
+    <meta property="product:price:amount" content="<?= $block->escapeHtmlAttr($priceAmount) ?>"/>
+    <?= $block->getChildHtml('meta.currency') ?>
 <?php endif;?>

app/code/Magento/GroupedProduct/view/base/web/template/product/price/special_price.html

@@ -17,9 +17,6 @@
                                     <item name="regular_price" xsi:type="array">
                                         <item name="bodyTmpl" xsi:type="string">Magento_GroupedProduct/product/price/regular_price</item>
                                     </item>
-                                    <item name="special_price" xsi:type="array">
-                                        <item name="bodyTmpl" xsi:type="string">Magento_GroupedProduct/product/price/special_price</item>
-                                    </item>
                                     <item name="minimal_price" xsi:type="array">
                                         <item name="label" xsi:type="string" translate="true">Starting at</item>
                                         <item name="bodyTmpl" xsi:type="string">Magento_GroupedProduct/product/price/minimal_price</item>