From 14009e7fa60997d78497ea7b4e1ef222ab1c6e71 Mon Sep 17 00:00:00 2001
From: yarik <yarik.nechyporuk@gmail.com>
Date: Thu, 11 Aug 2016 13:16:12 +0300
Subject: [PATCH] Structure data fix

---
 common/modules/comment/views/artbox_comment_item.php | 11 +++++++----
 common/modules/comment/widgets/CommentWidget.php     |  4 ++--
 frontend/views/catalog/product.php                   | 62 +++++++++++++++++++++++++++++++++-----------------------------
 3 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/common/modules/comment/views/artbox_comment_item.php b/common/modules/comment/views/artbox_comment_item.php
index 13c5005..c263fa9 100755
--- a/common/modules/comment/views/artbox_comment_item.php
+++ b/common/modules/comment/views/artbox_comment_item.php
@@ -18,12 +18,12 @@
                 echo Html::img('/img/user-noimage.png');
             ?>
         </div>
-        <div class="user_data" itemprop="commentTime">
+        <div class="user_data" itemprop="datePublished">
             <?php
                 echo date('d.m.Y', $model->date_add);
             ?>
         </div>
-        <div class="user_name" itemprop="creator">
+        <div class="user_name" itemprop="author">
             <?php
                 if(!empty( $model->user )) {
                     echo $model->user->username;
@@ -35,13 +35,16 @@
         <?php
             if(!empty( $model->rating )) {
                 ?>
-                <div class="user_rating">
+                <div class="user_rating" itemporp="reviewRating" itemscope itemtype="http://schema.org/Rating">
+                    <span itemprop="worstRating" style="display: none">1</span>
+                    <span itemprop="ratingValue" style="display: none"><?php echo $model->rating->value; ?></span>
+                    <span itemprop="bestRating" style="display: none">5</span>
                     <div class="rateit" data-rateit-value="<?php echo $model->rating->value; ?>" data-rateit-ispreset="true" data-rateit-readonly="true"></div>
                 </div>
                 <?php
             }
         ?>
-        <div class="user_txt" itemprop="commentText">
+        <div class="user_txt" itemprop="description">
             <?php
                 echo $model->text;
             ?>
diff --git a/common/modules/comment/widgets/CommentWidget.php b/common/modules/comment/widgets/CommentWidget.php
index b2e9374..797b705 100755
--- a/common/modules/comment/widgets/CommentWidget.php
+++ b/common/modules/comment/widgets/CommentWidget.php
@@ -111,9 +111,9 @@
          */
         public $itemOptions = [
             'class' => 'artbox_item_container',
-            'itemprop' => 'comment',
+            'itemprop' => 'review',
             'itemscope' => 'itemscope',
-            'itemtype' => 'http://schema.org/UserComments',
+            'itemtype' => 'http://schema.org/Review',
         ];
         
         /**
diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php
index 33af5ef..5450f51 100755
--- a/frontend/views/catalog/product.php
+++ b/frontend/views/catalog/product.php
@@ -178,7 +178,11 @@
                         <?php
                             if(!empty( $product->averageRating ) && $product->averageRating->value) {
                                 ?>
-                                <div class="rateit" data-rateit-value="<?php echo $product->averageRating->value; ?>" data-rateit-readonly="true" data-rateit-ispreset="true"></div>
+                                <div itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
+                                    <span itemprop="ratingValue" style="display: none"><?php echo $product->averageRating->value; ?></span>
+                                    <span itemprop="ratingCount" style="display: none"><?php echo count($product->comments); ?></span>
+                                    <div class="rateit" data-rateit-value="<?php echo $product->averageRating->value; ?>" data-rateit-readonly="true" data-rateit-ispreset="true"></div>
+                                </div>
                                 <?php
                             }
                         ?>
@@ -256,38 +260,38 @@
                     <?php endif ?>
                 </ul>
             </div>
-        </div>
-        <div class="content">
-            <div class="pic">
-                <center>
-                    <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->enabledVariants[ 0 ]->imageUrl, 'product_view', [
-                            'id'    => 'pic',
-                            'alt'   => $category->categoryName->value . ' ' . $product->fullname,
-                            'title' => $category->categoryName->value . ' ' . $product->fullname,
-                        ]) ?></a>
-                </center>
-            </div>
-            <ul class="product_colors">
-                <?php foreach($product->images as $image): ?>
-                    <li><a href="<?= $image->imageUrl ?>" rel="shadowbox[gal]">
-                            <?= \common\components\artboximage\ArtboxImageHelper::getImage($image->imageUrl, 'product_trumb2', [
+            <div class="content">
+                <div class="pic">
+                    <center>
+                        <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->enabledVariants[ 0 ]->imageUrl, 'product_view', [
+                                'id'    => 'pic',
                                 'alt'   => $category->categoryName->value . ' ' . $product->fullname,
                                 'title' => $category->categoryName->value . ' ' . $product->fullname,
-                            ]) ?>
-                        </a></li>
-                <?php endforeach; ?>
-            </ul>
-        </div>
-        <div class="both"></div>
-        <div class="comment-wrapper" style="padding-bottom:25px">
-            <?php
-                echo CommentWidget::widget([
-                    'model' => $product,
-                ]);
-            ?>
+                            ]) ?></a>
+                    </center>
+                </div>
+                <ul class="product_colors">
+                    <?php foreach($product->images as $image): ?>
+                        <li><a href="<?= $image->imageUrl ?>" rel="shadowbox[gal]">
+                                <?= \common\components\artboximage\ArtboxImageHelper::getImage($image->imageUrl, 'product_trumb2', [
+                                    'alt'   => $category->categoryName->value . ' ' . $product->fullname,
+                                    'title' => $category->categoryName->value . ' ' . $product->fullname,
+                                ]) ?>
+                            </a></li>
+                    <?php endforeach; ?>
+                </ul>
+            </div>
+            <div class="both"></div>
+            <div class="comment-wrapper" style="padding-bottom:25px">
+                <?php
+                    echo CommentWidget::widget([
+                        'model' => $product,
+                    ]);
+                ?>
+                <div class="both"></div>
+            </div>
             <div class="both"></div>
         </div>
-        <div class="both"></div>
         <?= \common\modules\product\widgets\similarProducts::widget([ 'product' => $product ]) ?>
         <?= \common\modules\product\widgets\specialProducts::widget([ 'type' => 'promo' ]) ?>
         <?= \common\modules\product\widgets\specialProducts::widget([ 'type' => 'new' ]) ?>
--
libgit2 0.21.4