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') ?>

app/design/frontend/Joshine/breeze/Magento_Cms/layout/cms_index_index.xml

@@ -6,6 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <link rel="canonical" src="{{baseUrl}}" src_type="url" />
+    </head>
     <body>
         <referenceContainer name="content">
             <block class="Magento\Framework\View\Element\Template" name="default_home_page" template="Magento_Cms::default/home.phtml"/>

app/design/frontend/Joshine/breeze/Magento_Swatches/web/js/swatch-renderer.js

@@ -428,12 +428,13 @@ define([
                     if (item.label.toLowerCase() == "size"){
                         tem_size = "<div  id=\"product-intro__freeshipping-more-3\"  >" +
                             "<a href=\"javascript:void(0);\"><svg width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M3.5 8.5V15.5H5.31045V13.75C5.31045 13.3358 5.64623 13 6.06045 13C6.47466 13 6.81045 13.3358 6.81045 13.75V15.5H9.31045V11.75C9.31045 11.3358 9.64623 11 10.0604 11C10.4747 11 10.8104 11.3358 10.8104 11.75V15.5H13.3104V13.75C13.3104 13.3358 13.6462 13 14.0604 13C14.4747 13 14.8104 13.3358 14.8104 13.75V15.5H17.3104V11.75C17.3104 11.3358 17.6462 11 18.0604 11C18.4747 11 18.8104 11.3358 18.8104 11.75V15.5H20.5V8.5H3.5ZM14.0604 17H18.0604H21C21.5523 17 22 16.5523 22 16V8C22 7.44772 21.5523 7 21 7H3C2.44772 7 2 7.44772 2 8V16C2 16.5523 2.44772 17 3 17H6.06045H10.0604H14.0604Z\" fill=\"#5D626A\"></path></svg> Size Guide</a></div>";
+                        label += tem_size;
                     }
                     label +=
                         '<span id="' + controlLabelId + '" class="' + classes.attributeLabelClass + '">' +
                         $('<i></i>').text(item.label).html() +
                         '</span>' +
-                        '<span class="' + classes.attributeSelectedOptionLabelClass + '"></span>' + tem_size;
+                        '<span class="' + classes.attributeSelectedOptionLabelClass + '"></span>';
                 }
 
                 if ($widget.inProductList) {

app/design/frontend/Joshine/breeze/web/css/_custom.less

@@ -1618,7 +1618,7 @@ footer{
   @media(min-width: 1024px){
 
     & {
-      margin-left: auto;
+      margin-left: 25%;
     }
 
     .navigation{