From 3d34309061797e8788f8f4ba8a0cecebb1e40b84 Mon Sep 17 00:00:00 2001
From: SMP <sam@mageplaza.com>
Date: Tue, 9 Aug 2016 10:58:30 +0700
Subject: [PATCH] Fix broken "}" tag Update review value

---
 .../page/head/opengraph/product.phtml         | 48 +++++++++----------
 .../richsnippets/jsonld/breadcrumb.phtml      |  2 +-
 .../richsnippets/jsonld/product.phtml         | 43 +++++++++--------
 .../richsnippets/microdata/product.phtml      | 28 -----------
 4 files changed, 48 insertions(+), 73 deletions(-)
 delete mode 100644 view/frontend/templates/richsnippets/microdata/product.phtml

diff --git a/view/frontend/templates/page/head/opengraph/product.phtml b/view/frontend/templates/page/head/opengraph/product.phtml
index e213578..dee57e5 100644
--- a/view/frontend/templates/page/head/opengraph/product.phtml
+++ b/view/frontend/templates/page/head/opengraph/product.phtml
@@ -1,28 +1,28 @@
 <!--Open Graph Protocol for Facebook by Mageplaza SEO-->
-<?php if($block->getRegistry('current_product')): ?>
-<?php $product = $block->getRegistry('current_product'); ?>
-	<meta property="og:title" content="<?php echo ($product->getName()); ?>" />
-	<meta property="og:type" content="product" />
-<!--	<meta property="og:image" content="--><?php //echo $this->helper('catalog/image')->init($product, 'small_image')->resize(200,200);?><!--" />-->
-	<meta property="og:url" content="<?php echo $block->getRegistry('product')->getProductUrl(); ?>" />
-	<meta property="og:description" content="<?php echo trim(strip_tags($product->getShortDescription())); ?>" />
-	<meta property="og:site_name" content="<?php echo $block->getBusinessName(); ?>" />
-	<meta property="product:price:amount" content="<?php echo $product->getPrice(); ?>" />
-	<meta property="product:price:currency" content="<?php echo $block->getCurrency(); ?>" />
-	<meta property="product:availability" content="<?php echo $product->isAvailable() ?  $this->__('In stock'):  $this->__('Out of stock'); ?>" />
-	<meta property="product:retailer_item_id" content="<?php echo $product->getSku() ?>" />
-<?php if($product->getSpecialPrice() AND $product->getPrice() != $product->getSpecialPrice()):?>
-	<meta property="product:sale_price:amount"      content="<?php echo $product->getSpecialPrice();?> " />
-	<meta property="product:sale_price:currency"    content="<?php //echo $currency;?>" />
-	<meta property="product:sale_price_dates:start" content="<?php echo $product->getSpecialFromDate();?>" />
-	<meta property="product:sale_price_dates:end"   content="<?php echo $product->getSpecialToDate();?>" />
-<?php endif;?>
+<?php if ($block->getRegistry('current_product')): ?>
+	<?php $product = $block->getRegistry('current_product'); ?>
+	<meta property="og:title" content="<?php echo($product->getName()); ?>"/>
+	<meta property="og:type" content="product"/>
+	<!--	<meta property="og:image" content="--><?php //echo $this->helper('catalog/image')->init($product, 'small_image')->resize(200,200);?><!--" />-->
+	<meta property="og:url" content="<?php echo $block->getRegistry('product')->getProductUrl(); ?>"/>
+	<meta property="og:description" content="<?php echo trim(strip_tags($product->getShortDescription())); ?>"/>
+	<meta property="og:site_name" content="<?php echo $block->getBusinessName(); ?>"/>
+	<meta property="product:price:amount" content="<?php echo $product->getPrice(); ?>"/>
+	<meta property="product:price:currency" content="<?php echo $block->getCurrency(); ?>"/>
+	<meta property="product:availability" content="<?php echo $product->isAvailable() ? $this->__('In stock') : $this->__('Out of stock'); ?>"/>
+	<meta property="product:retailer_item_id" content="<?php echo $product->getSku() ?>"/>
+	<?php if ($product->getSpecialPrice() AND $product->getPrice() != $product->getSpecialPrice()): ?>
+		<meta property="product:sale_price:amount" content="<?php echo $product->getSpecialPrice(); ?> "/>
+		<meta property="product:sale_price:currency" content="<?php //echo $currency;?>"/>
+		<meta property="product:sale_price_dates:start" content="<?php echo $product->getSpecialFromDate(); ?>"/>
+		<meta property="product:sale_price_dates:end" content="<?php echo $product->getSpecialToDate(); ?>"/>
+	<?php endif; ?>
 
-<!--	Twitter Card By Mageplaza SEO-->
-	<meta name="twitter:card" content="summary" />
-	<meta name="twitter:site" content="<?php echo $block->getTwitterAccount(); ?>" />
-	<meta name="twitter:title" content="<?php echo $product->getName() ?>" />
-	<meta name="twitter:description" content="<?php echo trim(strip_tags($product->getShortDescription())); ?>" />
-<!--	<meta name="twitter:image" content="--><?php //echo $block->helper('catalog/image')->init($product, 'small_image')->resize(200,200);?><!--" />-->
+	<!--	Twitter Card By Mageplaza SEO-->
+	<meta name="twitter:card" content="summary"/>
+	<meta name="twitter:site" content="<?php echo $block->getTwitterAccount(); ?>"/>
+	<meta name="twitter:title" content="<?php echo $product->getName() ?>"/>
+	<meta name="twitter:description" content="<?php echo trim(strip_tags($product->getShortDescription())); ?>"/>
+	<!--	<meta name="twitter:image" content="--><?php //echo $block->helper('catalog/image')->init($product, 'small_image')->resize(200,200);?><!--" />-->
 
 <?php endif; ?>
\ No newline at end of file
diff --git a/view/frontend/templates/richsnippets/jsonld/breadcrumb.phtml b/view/frontend/templates/richsnippets/jsonld/breadcrumb.phtml
index 9cfd7f1..b8c0c0b 100644
--- a/view/frontend/templates/richsnippets/jsonld/breadcrumb.phtml
+++ b/view/frontend/templates/richsnippets/jsonld/breadcrumb.phtml
@@ -70,7 +70,7 @@
       "@id": "<?php echo $_crumbInfo['link']; ?>",
       "name": "<?php echo $_crumbInfo['label']; ?>"
     }
-    <?php (!$_crumbInfo['last'])?> ,
+    <?php if(!$_crumbInfo['last']) echo ',';?>
     <?php endforeach; ?>
   }]
 
diff --git a/view/frontend/templates/richsnippets/jsonld/product.phtml b/view/frontend/templates/richsnippets/jsonld/product.phtml
index ce62fe2..cf491e9 100644
--- a/view/frontend/templates/richsnippets/jsonld/product.phtml
+++ b/view/frontend/templates/richsnippets/jsonld/product.phtml
@@ -4,43 +4,46 @@
  */
 ?>
 
-<?php if($block->getProduct()): ?>
-<?php $product = $block->getProduct(); ?>
-<!--    Product Rich Snippets by Mageplaza SEO-->
-<script type="application/ld+json">
+<?php if ($block->getProduct()): ?>
+	<?php $product = $block->getProduct(); ?>
+	<!--    Product Rich Snippets by Mageplaza SEO-->
+	<script type="application/ld+json">
 {
   "@context": "http://schema.org/",
   "@type": "Product",
-  "name": "<?php echo $product->getName();?>",
-<!--  "image": "--><?php //echo $this->helper('catalog/image')->init($product, 'small_image')->resize(200,200);?><!--",-->
+  "name": "<?php echo $product->getName(); ?>",
   "description": "<?php echo trim(strip_tags($product->getShortDescription())); ?>",
-  <?php if($product->getMpn()):?>
-  "mpn": "<?php echo $product->getMpn();?>",
+  <?php if ($product->getMpn()): ?>
+  "mpn": "<?php echo $product->getMpn(); ?>",
   <?php endif; ?>
-  "sku": "<?php echo $product->getSku();?>",
-  "url": "<?php echo $product->getProductUrl();?>",
+  "sku": "<?php echo $product->getSku(); ?>",
+  "url": "<?php echo $product->getProductUrl(); ?>"
   <?php /*
   TO-DO: Allow select brand attribute in configuration > Get attribute label
   "brand": {
     "@type": "Thing",
     "name": "ACME"
   },
- */?>
+ */ ?>
 
- <?php if($block->getReviewCount()):?>
+ <?php if ($block->getReviewCount()): ?>
+ ,
   "aggregateRating": {
     "@type": "AggregateRating",
-    "ratingValue": "<?php echo $block->getRatingSummary();?>",
-    "reviewCount": "<?php echo $block->getReviewCount();?>"
-  },
-  <?php endif;?>
+    "bestRating": 100,
+    "worstRating": 0,
+    "ratingValue": "<?php echo $block->getRatingSummary(); ?>",
+    "reviewCount": "<?php echo $block->getReviewCount(); ?>"
+  }
+  <?php endif; ?>
 
-  <?php if($product->getSpecialPrice() AND $product->getPrice() != $product->getSpecialPrice()):?>
+  <?php if ($product->getSpecialPrice() AND $product->getPrice() != $product->getSpecialPrice()): ?>
+  ,
   "offers": {
     "@type": "Offer",
-    "priceCurrency": "<?php echo $block->getCurrency();?>",
-    "price": "<?php echo $product->getSpecialPrice();?>",
-    "priceValidUntil": "<?php echo $product->getSpecialToDate();?>",
+    "priceCurrency": "<?php echo $block->getCurrency(); ?>",
+    "price": "<?php echo $product->getSpecialPrice(); ?>",
+    "priceValidUntil": "<?php echo $product->getSpecialToDate(); ?>",
     "availability": "http://schema.org/InStock",
     <?php endif; ?>
   }
diff --git a/view/frontend/templates/richsnippets/microdata/product.phtml b/view/frontend/templates/richsnippets/microdata/product.phtml
deleted file mode 100644
index 290780f..0000000
--- a/view/frontend/templates/richsnippets/microdata/product.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<div itemscope itemtype="http://schema.org/Product" style="display: none;">
-  <span itemprop="brand">ACME</span>
-  <span itemprop="name">Executive Anvil</span>
-  <img itemprop="image" src="anvil_executive.jpg" alt="Executive Anvil logo" />
-  <span itemprop="description">Sleeker than ACME's Classic Anvil, the
-    Executive Anvil is perfect for the business traveler
-    looking for something to drop from a height.
-  </span>
-  Product #: <span itemprop="mpn">925872</span>
-  <span itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
-    <span itemprop="ratingValue">4.4</span> stars, based on <span itemprop="reviewCount">89
-      </span> reviews
-  </span>
-
-  <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-    Regular price: $179.99
-    <meta itemprop="priceCurrency" content="USD" />
-    $<span itemprop="price">119.99</span>
-    (Sale ends <time itemprop="priceValidUntil" datetime="2020-11-05">
-      5 November!</time>)
-    Available from: <span itemprop="seller" itemscope itemtype="http://schema.org/Organization">
-                      <span itemprop="name">Executive Objects</span>
-                    </span>
-    Condition: <link itemprop="itemCondition" href="http://schema.org/UsedCondition"/>Previously owned,
-      in excellent condition
-    <link itemprop="availability" href="http://schema.org/InStock"/>In stock! Order now!</span>
-	</span>
-</div>