Merge pull request #2437 from magento-tango/MAGETWO-70329-2

MAGETWO-70329 [GITHUB] The rich snippets are giving a warning for the element price #7173

Author: dhorytskyi

app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml

@@ -22,15 +22,11 @@
         class="price-wrapper <?php /* @escapeNotVerified */ echo $block->getPriceWrapperCss(); ?>">
         <?php /* @noEscape */ echo $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
     </span>
-    <?php if ($block->getSchema()): ?>
-        <span class="_hidden" itemprop="price">
-            <?php /* @noEscape */ echo $block->getDisplayValue()  ?>
-        </span>
-    <?php endif; ?>
     <?php if ($block->hasAdjustmentsHtml()): ?>
         <?php echo $block->getAdjustmentsHtml() ?>
     <?php endif; ?>
     <?php if ($block->getSchema()): ?>
+        <meta itemprop="price" content="<?php /* @noEscape */ echo $block->getDisplayValue(); ?>" />
         <meta itemprop="priceCurrency" content="<?php /* @escapeNotVerified */ echo $block->getDisplayCurrencyCode()?>" />
     <?php endif; ?>
 </span>

app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml

@@ -17,13 +17,19 @@ $minProduct = $block->getSaleableItem()
     ->getMinProduct();
 
 if ($minProduct) {
+    $finalPrice = $minProduct->getPriceInfo()->getPrice('final_price');
+    $finalPriceValue = $finalPrice->getAmount();
     $amountRender = $block->getRendererPool()
         ->createAmountRender(
-            $minProduct->getPriceInfo()->getPrice('final_price')->getAmount(),
+            $finalPriceValue,
             $minProduct,
-            $minProduct->getPriceInfo()->getPrice('final_price'),
+            $finalPrice,
             ['include_container' => true]
         );
+    $currencyCode = $amountRender->getDisplayCurrencyCode();
+} else {
+    $finalPriceValue = 0;
+    $currencyCode = '';
 }
 ?>
 <div class="price-box" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
@@ -32,4 +38,6 @@ if ($minProduct) {
         <span class="price-label"><?php /* @escapeNotVerified */ echo __('Starting at')?></span><?php echo $amountRender->toHtml();?>
     </p>
     <?php endif ?>
+    <meta itemprop="price" content="<?php /* @noEscape */ echo $finalPriceValue; ?>" />
+    <meta itemprop="priceCurrency" content="<?php /* @noEscape */ echo $currencyCode; ?>" />
 </div>

app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less

@@ -189,10 +189,6 @@
                         &:last-child {
                             margin-bottom: 0;
                         }
-
-                        &._hidden {
-                            display: none;
-                        }
                     }
                 }
             }