Skip to content

J
joshine
Commit 06503866 by dhn
Options

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

parents f0800e31 f3964d27
Showing with 20 additions and 12 deletions
app/code/Joshine/CouponPusher/view/frontend/templates/coupon-nope-alert.phtml
<script type="text/javascript"> <script type="text/javascript">
require(['jquery', 'mage/cookies'], function($) { require(['jquery', 'mage/cookies'], function($) {
if ($.mage.cookies.get('coupon_push_stop') == null) { if ($.mage.cookies.get('coupon_push_stop') == null) {
// $.mage.cookies.set('coupon_push_stop', 'true'); $.mage.cookies.set('coupon_push_stop', 'true');
} }
}) })
</script> </script>
......
app/code/Joshine/CouponPusher/view/frontend/templates/coupon-subscribe-alert.phtml
...@@ -45,10 +45,12 @@ ...@@ -45,10 +45,12 @@
} }
.coupon-wrapper .coupon-front { .coupon-wrapper .coupon-front {
transition: all 2s;
backface-visibility: hidden; backface-visibility: hidden;
} }
.coupon-wrapper .coupon-back { .coupon-wrapper .coupon-back {
transition: all 2s;
position: absolute; position: absolute;
top: 0; top: 0;
transform: rotateY(-180deg); transform: rotateY(-180deg);
...@@ -115,7 +117,7 @@ ...@@ -115,7 +117,7 @@
</div> </div>
<div class="coupon-alt-input"> <div class="coupon-alt-input">
<div class="coupon-alt-input-left"> <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>
<div class="coupon-alert-submit-button" id="coupon-subscribe-email"><?= __('Submit') ?></div> <div class="coupon-alert-submit-button" id="coupon-subscribe-email"><?= __('Submit') ?></div>
</div> </div>
...@@ -137,8 +139,7 @@ ...@@ -137,8 +139,7 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
require(['jquery'], function($) { require(['jquery', 'mage/translate', 'domReady!'], function($, $t) {
setTimeout(function () { setTimeout(function () {
$("#coupon-subscribe-alert").show(); $("#coupon-subscribe-alert").show();
}, 2000); }, 2000);
...@@ -151,7 +152,7 @@ ...@@ -151,7 +152,7 @@
var email = $("#coupon-subscribe-email-input").val(); var email = $("#coupon-subscribe-email-input").val();
if (email.length < 5) { if (email.length < 5) {
$(".coupon-input-errorMsg").html('You enter an invalid email address').show(); $(".coupon-input-errorMsg").html("<?= __('invalid email address') ?>").show();
return; return;
} }
...@@ -170,7 +171,8 @@ ...@@ -170,7 +171,8 @@
} }
$("#flipping-coupon-code").html(response.coupon_code); $("#flipping-coupon-code").html(response.coupon_code);
$(".coupon-wrapper").addClass("flipping"); $(".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-alt-input").hide();
$(".coupon-shopping-now").show(); $(".coupon-shopping-now").show();
}, },
......
app/code/Joshine/Review/view/frontend/templates/product/view/list.phtml
...@@ -276,7 +276,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId()); ...@@ -276,7 +276,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
<div class="joshine-foot-mark rate-fit"> <div class="joshine-foot-mark rate-fit">
<div class="rate-fit-item"> <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> </div>
</div> </div>
...@@ -375,15 +375,15 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId()); ...@@ -375,15 +375,15 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
} }
function fitsTranslate(fits) { function fitsTranslate(fits) {
var fits_words = 'default'; var fits_words = "<?= __('True to Size') ?>";
if (fits === '1') { if (fits === '1') {
fits_words = 'Small'; fits_words = "<?= __('Small') ?>";
} }
if (fits === '2') { if (fits === '2') {
fits_words = 'Ture Size'; fits_words = "<?= __('True to Size') ?>";
} }
if (fits === '3') { if (fits === '3') {
fits_words = 'Large'; fits_words = "<?= __('Large') ?>";
} }
return fits_words; return fits_words;
} }
...@@ -766,7 +766,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId()); ...@@ -766,7 +766,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
let review = findReviewById(shouldReviewId); let review = findReviewById(shouldReviewId);
$(".review-box-title").html(review.title); $(".review-box-title").html(review.title);
let fits_text = fitsTranslate(review.size_fits); 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-content").html(review.detail);
$("#review-box-id").val(review.review_id); $("#review-box-id").val(review.review_id);
} }
......
app/design/frontend/Joshine/breeze/i18n/es_ES.csv
...@@ -15627,6 +15627,11 @@ Buy the Latest,Comprar los últimos productos ...@@ -15627,6 +15627,11 @@ Buy the Latest,Comprar los últimos productos
"Shop ","Tiendas " "Shop ","Tiendas "
" on "," En " " on "," En "
Best Seller,Mejor vendedora 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
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -2933,6 +2933,7 @@ div#shipping-method-buttons-container { ...@@ -2933,6 +2933,7 @@ div#shipping-method-buttons-container {
} }
@media(min-width: 1024px) { @media(min-width: 1024px) {
div.product-item-info:hover { div.product-item-info:hover {
padding: 7px !important; //消除鼠标经过抖动
background: #ffffff !important; background: #ffffff !important;
border: 1px solid #bbbbbb; border: 1px solid #bbbbbb;
position: relative; position: relative;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment