Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into developer

app/code/Joshine/Review/Controller/Ajax/ReviewInfo.php

 <?php
 namespace Joshine\Review\Controller\Ajax;
 
-use Amasty\AdvancedReview\Model\ResourceModel\Images as ImagesModel;
 use Joshine\Review\Helper\BlockHelper;
 use Joshine\Review\Helper\ImageHelper;
 use Magento\Catalog\Model\ProductFactory;

app/code/Joshine/Review/Helper/BlockHelper.php

@@ -82,4 +82,21 @@ class BlockHelper implements \Magento\Framework\Data\CollectionDataSourceInterfa
             ->setReviewId($reviewId);
     }
 
+    public function translateSizeFits($value)
+    {
+        $default = __('True to Size');
+        if (intval($value) == 1) {
+            return __('Small');
+        }
+
+        if (intval($value) == 2) {
+            return __('True to Size');
+        }
+
+        if (intval($value) == 3) {
+            return __('Large');
+        }
+        return $default;
+    }
+
 }

app/code/Joshine/Review/view/frontend/templates/product/view/list.phtml

@@ -129,7 +129,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
                             <div class="joshine-foot-mark rate-fit">
                                 <div class="rate-fit-item">
                                     <?php $fitsValue = $review->getSizeFits(); ?>
-                                    <span><strong class="joshine-font-w-bolder">Size Fits:</strong> <?= $t[$fitsValue] ?></span>
+                                    <span><strong class="joshine-font-w-bolder">Size Fits:</strong> <?= $helper->translateSizeFits($fitsValue);  ?></span>
                                 </div>
                             </div>
                         </div>
@@ -172,7 +172,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
                     <div class="joshine-rating-container joshine-col-xs-8">
                         <div class="joshine-rating-starts" style="width: <?= $rating ?>%;"></div>
                     </div>
-                    <h2 class="ave-rate-total" style="margin-top: 0; margin-bottom: .35em;"><?= $block->getRatingSummaryValue() ?></h2>
+                    <h2 class="ave-rate-total" style="margin-top: 0; margin-bottom: .35em; margin-left: .4em"><?= $block->getRatingSummaryValue()  ?></h2>
                 </div>
             </div>
             <div class="joshine-review-item">
@@ -231,7 +231,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
 
                     <div class="row joshine-foot-mark">
                         <?php $fitsValue = $review->getSizeFits(); ?>
-                        <span><strong class="joshine-font-w-bolder">Size Fits:</strong> <?=  $t[$fitsValue] ?></span>
+                        <span><strong class="joshine-font-w-bolder">Size Fits:</strong> <?=   $helper->translateSizeFits($fitsValue); ?></span>
                     </div>
 
                     <div class="row joshine-font-w-bolder"  style="font-size: .9em;">
@@ -333,6 +333,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
         display: flex;
         align-items: center;
         justify-content:space-between;
+        flex-wrap: wrap;
     }
 
     .modal-reviews-details__des-wrap {
@@ -499,14 +500,16 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
                         </div>
                         <div class="modal-reviews-details__des-wrap joshine-col-xs-4">
                             <div class="joshine-review-des-head">
-                                <span class="joshine-review-nickname" data-review-js="nickname" style="font-size: .9em;">
+                                <span class="joshine-review-nickname joshine-col-xs-6" data-review-js="nickname" style="font-size: .9em;">
 
                                 </span>
                                 <div class="joshine-rating-container joshine-rating-small" style="margin-bottom: 3px;">
                                     <div class="joshine-rating-starts" style="width: 100%;" data-review-js="rating"></div>
                                 </div>
-                                <span class="joshine-review-date joshine-font-c-darkgray joshine-font-mini-plus joshine-pull-right" data-review-js="date">
+
+                                <span class="joshine-review-date joshine-font-c-darkgray joshine-font-mini-plus" style="margin-top: .4em;" data-review-js="date">
                                 </span>
+
                             </div>
 
                             <div class="joshine-review-des-title joshine-font-w-bolder joshine-font-text joshine-font-c-deepin" data-review-js="title">

app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml

@@ -127,7 +127,7 @@ require(['jquery'], function ($) {
         'event': 'add_to_cart',
         'value': <?= $priceSum ?>,
         'items': <?= json_encode($items, true) ?>
-    );
+    });
 </script>
 <?= $block->getChildHtml('checkout.cart.order.actions') ?>
 <?= $block->getChildHtml('shopping.cart.table.after') ?>