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

- fixed Viewed Widget for Grouped Product
- Fixed price in <meta property="product:price:amount" for Grouped Product
- clear constants that are not used
- replace PRICE_CODE through a constant

Author: shmVan

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

@@ -11,8 +11,11 @@
 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
@@ -22,18 +25,6 @@
  */
 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
      */
@@ -84,31 +75,38 @@ 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('final_price')
+                ->getPrice(FinalPrice::PRICE_CODE)
                 ->getAmount()
                 ->getValue()
         );
         $priceInfo->setMinimalPrice(
             $product
                 ->getPriceInfo()
-                ->getPrice('final_price')
+                ->getPrice(FinalPrice::PRICE_CODE)
                 ->getMinimalPrice()
                 ->getValue()
         );
         $priceInfo->setRegularPrice(
             $product
                 ->getPriceInfo()
-                ->getPrice('regular_price')
+                ->getPrice(RegularPrice::PRICE_CODE)
                 ->getAmount()
                 ->getValue()
         );
         $priceInfo->setMaxPrice(
             $product
                 ->getPriceInfo()
-                ->getPrice('final_price')
+                ->getPrice(FinalPrice::PRICE_CODE)
                 ->getMaximalPrice()
                 ->getValue()
         );

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

@@ -4,21 +4,47 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Product\View */
+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
+ */
 ?>
 
 <meta property="og:type" content="product" />
 <meta property="og:title"
-      content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())) ?>" />
+      content="<?= $escaper->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())) ?>" />
 <meta property="og:image"
-      content="<?= $block->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>" />
+      content="<?= $escaper->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>"
+/>
 <meta property="og:description"
-      content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
+      content="<?= $escaper->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
 <meta property="og:url" content="<?= $block->escapeUrl($block->getProduct()->getProductUrl()) ?>" />
-<?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
+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 endif;?>

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

@@ -0,0 +1,6 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->

app/code/Magento/GroupedProduct/view/frontend/ui_component/widget_recently_viewed.xml

@@ -17,6 +17,9 @@
                                     <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>