Merge branch 'developer' into production

b538cc8d · liumengfei · f6782c77 · dd54c461 · b538cc8d · b538cc8d
Commit b538cc8d authored Apr 04, 2023 by liumengfei
8 changed files
--- a/app/code/Joshine/CouponPusher/view/frontend/templates/coupon-nope-alert.phtml
+++ b/app/code/Joshine/CouponPusher/view/frontend/templates/coupon-nope-alert.phtml
 <script type="text/javascript">
    require(['jquery', 'mage/cookies'], function($) {
        if ($.mage.cookies.get('coupon_push_stop') == null) {
-           // $.mage.cookies.set('coupon_push_stop', 'true');
+           $.mage.cookies.set('coupon_push_stop', 'true');
        }
    })
 </script>

--- a/app/code/Joshine/CouponPusher/view/frontend/templates/coupon-subscribe-alert.phtml
+++ b/app/code/Joshine/CouponPusher/view/frontend/templates/coupon-subscribe-alert.phtml
@@ -45,10 +45,12 @@
    }
    .coupon-wrapper .coupon-front {
+        transition: all 2s;
        backface-visibility: hidden;
    }
    .coupon-wrapper .coupon-back {
+        transition: all 2s;
        position: absolute;
        top: 0;
        transform: rotateY(-180deg);
@@ -115,7 +117,7 @@
                        </div>
                        <div class="coupon-alt-input">
                            <div class="coupon-alt-input-left">
-                                <input placeholder="Enter your email address" type="email" id="coupon-subscribe-email-input" value="">
+                                <input placeholder="<?= __('Enter your email address') ?>" type="email" id="coupon-subscribe-email-input" value="">
                            </div>
                            <div class="coupon-alert-submit-button" id="coupon-subscribe-email"><?= __('Submit') ?></div>
                        </div>
@@ -137,8 +139,7 @@
 </div>
 <script type="text/javascript">
-    require(['jquery'], function($) {
+    require(['jquery', 'mage/translate', 'domReady!'], function($, $t) {
        setTimeout(function () {
            $("#coupon-subscribe-alert").show();
        }, 2000);
@@ -151,7 +152,7 @@
            var email = $("#coupon-subscribe-email-input").val();
            if (email.length < 5) {
-                $(".coupon-input-errorMsg").html('You enter an invalid email address').show();
+                $(".coupon-input-errorMsg").html("<?= __('invalid email address') ?>").show();
                return;
            }
@@ -170,7 +171,8 @@
                    }
                    $("#flipping-coupon-code").html(response.coupon_code);
                    $(".coupon-wrapper").addClass("flipping");
-                    $(".coupon-alt-input-title").html("Thank your Subscribe!")
+                    var tanksText = "<?= __('Thank your Subscribe!') ?>";
+                    $(".coupon-alt-input-title").html(tanksText);
                    $(".coupon-alt-input").hide();
                    $(".coupon-shopping-now").show();
                },

--- a/app/code/Joshine/Review/view/frontend/templates/product/view/list.phtml
+++ b/app/code/Joshine/Review/view/frontend/templates/product/view/list.phtml
@@ -276,7 +276,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
                            <div class="joshine-foot-mark rate-fit">
                                <div class="rate-fit-item">
-                                    <span><strong class="joshine-font-w-bolder"><?= __("Size Fits") ?>>:</strong> <span data-review-js="fits"></span></span>
+                                    <span><strong class="joshine-font-w-bolder"><?= __("Size Fits") ?>:</strong> <span data-review-js="fits"></span></span>
                                </div>
                            </div>
                        </div>
@@ -375,15 +375,15 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
        }
        function fitsTranslate(fits) {
-            var fits_words = 'default';
+            var fits_words =  "<?= __('True to Size') ?>";
            if (fits === '1') {
-                fits_words = 'Small';
+                fits_words = "<?= __('Small') ?>";
            }
            if (fits === '2') {
-                fits_words = 'Ture Size';
+                fits_words = "<?= __('True to Size') ?>";
            }
            if (fits === '3') {
-                fits_words = 'Large';
+                fits_words = "<?= __('Large') ?>";
            }
            return fits_words;
        }
@@ -766,7 +766,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
                let review = findReviewById(shouldReviewId);
                $(".review-box-title").html(review.title);
                let fits_text = fitsTranslate(review.size_fits);
-                $(".review-box-size").html($.mage.__("Size Fits")+ ": " + fits_text);
+                $(".review-box-size").html("<?= __('Size Fits') ?>" + ": " + fits_text);
                $(".review-box-content").html(review.detail);
                $("#review-box-id").val(review.review_id);
            }

--- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
+++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
@@ -209,7 +209,9 @@ class LayoutProcessor implements LayoutProcessorInterface
                    $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']
                    ['children']['shippingAddress']['children']['after-shipping-method-form']
                );
+            $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']
+            ['children']['shippingAddress']['children']['after-shipping-method-form']['children']
+            ['billing-address-form']['children']['form-fields']['children']['company']['sortOrder'] = 140;
        }
@@ -217,7 +219,6 @@ class LayoutProcessor implements LayoutProcessorInterface
            $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
        ['shippingAddress']['children']['shipping-address-fieldset']['children']['company']['sortOrder'] = 140;
-        file_put_contents('./yyyy.txt',json_encode($jsLayout));
        return $jsLayout;
    }

--- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
@@ -30,7 +30,7 @@ $flatraPrice = $block->getFlatratePrice();
        $scriptString = <<<script
            window.checkoutConfig = {$serializedCheckoutConfig};
-            window.checkoutConfig.flatrate_price = {$flatraPrice};
+            window.checkoutConfig.flatrate_price = "{$flatraPrice}";
            window.customerData = window.checkoutConfig.customerData;
            window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
            require([

--- a/app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/list.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/list.phtml
@@ -55,6 +55,8 @@ $_helper = $block->getData('outputHelper');
        }
    }
    $googleGtmName = is_null($pos) ?  'view_item_list' : 'view_search_results';
+    $_objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+    $imageHelper    = $_objectManager->get('\Magento\Catalog\Helper\Image');
    ?>
 <style>
    .mode-list{
@@ -68,10 +70,20 @@ $_helper = $block->getData('outputHelper');
        width: 100%;
        opacity:0;
        height: 100%;
+        -webkit-transition: opacity .5s;
+        -moz-transition:    opacity .5s;
+        -ms-transition:     opacity .5s;
+        -o-transition:      opacity .5s;
+        transition:         opacity .5s;
    }
    .hoverImg:hover{
        opacity: 1;
+        -webkit-transition: opacity .5s;
+        -moz-transition:    opacity .5s;
+        -ms-transition:     opacity .5s;
+        -o-transition:      opacity .5s;
+        transition:         opacity .5s;
    }
 </style>
    <div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>">
@@ -87,10 +99,10 @@ $_helper = $block->getData('outputHelper');
                        $baseImageUrl = $productImage->getImageUrl();
                        $allImage = $_product->getMediaGalleryImages()->getItems();
-                        $haverImg = '';
+                        $hoverImg = '';
                        foreach ($allImage as $img){
                            if (basename($baseImageUrl)  != basename($img->getUrl())){
-                                $haverImg = $img->getUrl();
+                                $hoverImg = $imageHelper->init($_product, 'product_page_image_large')->setImageFile($img->getFile())->resize(400,500)->getUrl();
                                break;
                            }
                        }
@@ -105,7 +117,7 @@ $_helper = $block->getData('outputHelper');
                           class="product photo product-item-photo"
                           tabindex="-1">
                            <?= $productImage->toHtml() ?>
-                            <img class="hoverImg"  whidth="<?= $productImage->getWidth() ?>" height="<?= $productImage->getHeight() ?>" src="<?= $haverImg ?>">
+                            <img class="hoverImg"  width="<?= $productImage->getWidth() ?>" height="<?= $productImage->getHeight() ?>" src="<?= $hoverImg ?>">
                        </a>
                        <div class="product details product-item-details">
                            <?php $_productNameStripped = $block->stripTags($_product->getName(), null, true); ?>

--- a/app/design/frontend/Joshine/breeze/i18n/es_ES.csv
+++ b/app/design/frontend/Joshine/breeze/i18n/es_ES.csv
@@ -15627,6 +15627,16 @@ Buy the Latest,Comprar los últimos productos
 "Shop ","Tiendas "
 " on "," En "
 Best Seller,Mejor vendedora
+Additional Information,Información adicional
+Shopping Now,Ahora de compras
+"Subscribe to get your exclusive offer.","Suscríbase para obtener su oferta exclusiva."
+"Thank your Subscribe!","¡ gracias por su suscripción!"
+invalid email address,Dirección de correo electrónico no válida
+"Order Total:", "Total del pedido:"
+Free Over,Gratis sobre
+"10-15 Working Days -","10-15 días laborables-"
+SECURE CHECKOUT,PAGO SEGURO
--- a/app/design/frontend/Joshine/breeze/web/css/_custom.less
+++ b/app/design/frontend/Joshine/breeze/web/css/_custom.less
@@ -2933,6 +2933,7 @@ div#shipping-method-buttons-container {
 }
 @media(min-width: 1024px) {
  div.product-item-info:hover {
+    padding: 7px !important; //消除鼠标经过抖动
    background: #ffffff !important;
    border: 1px solid #bbbbbb;
    position: relative;