Skip to content

J
joshine
Commit 9c7b580c by wd
Options

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

parents d99973c7 4c4c2cd9
Showing with 157 additions and 58 deletions
app/code/Joshine/Review/view/frontend/templates/product/view/list.phtml
......@@ -691,9 +691,8 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
<script type="text/javascript">
require([
'jquery','ko'
], function ($) {
'jquery','ko', 'mage/translate'
], function ($, ko) {
$(".joshine-review-add-btn").on('click',function () {
$(".block.review-add").removeClass('joshine-hidden');
});
......@@ -1144,7 +1143,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("Size Fits:"+ fits_text);
$(".review-box-size").html($.mage.__("Size Fits")+ ": " + fits_text);
$(".review-box-content").html(review.detail);
$("#review-box-id").val(review.review_id);
}
......
app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grids.phtml
......@@ -16,7 +16,6 @@
var isMobile = window.matchMedia("(pointer:coarse)").matches;
var productIds = localStorage.getItem('recently_viewed') || '';
if (productIds != '') {
console.log('productIds',productIds)
$.ajax({
url: '/catalog/product/recently',
data: {ids: productIds},
......
app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
......@@ -94,13 +94,13 @@ else
<div class="content-wrap">
<div class="free_message">
<div class="msg-title">
<p style="font-weight: bold;">Shipping Fee</p>
<p style="font-weight: bold;"><?= $block->escapeHtml(__('Shipping Fee')) ?> </p>
</div>
<div class="msg-content">
Spend <span style="color:#EB001B;font-size: 16px;font-weight: bold;"><?= $block->escapeHtml(
<?= $block->escapeHtml(__('Spend')) ?> <span style="color:#EB001B;font-size: 16px;font-weight: bold;"><?= $block->escapeHtml(
$this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($difference_price),
['span']
) ?></span> more and get <span style="font-weight: bold;">FREE SHIPPING</span>!
) ?></span> <?= $block->escapeHtml(__('more and get')) ?> <span style="font-weight: bold;"><?= $block->escapeHtml(__('FREE SHIPPING')) ?></span>!
</div>
</div>
</div>
......@@ -112,10 +112,10 @@ else
<div class="content-wrap">
<div class="free_message">
<div class="msg-content">
Spend <span style="color:#EB001B;font-size: 16px;"><?= $block->escapeHtml(
<?= $block->escapeHtml(__('Spend')) ?> <span style="color:#EB001B;font-size: 16px;"><?= $block->escapeHtml(
$this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($difference_price),
['span']
) ?></span> more and get FREE SHIPPING!
) ?></span><?= $block->escapeHtml(__('more and get')) ?> <?= $block->escapeHtml(__('FREE SHIPPING')) ?>
</div>
</div>
</div>
......@@ -143,7 +143,7 @@ else
data-mage-init='{"shoppingCart":{"emptyCartButton": ".action.clear",
"updateCartActionContainer": "#update_cart_action_container"}}'>
<caption class="table-caption"><?= $block->escapeHtml(__('Shopping Cart Items')) ?></caption>
<thead><td><div class="item-summary">Item Summary</div></td></thead>
<thead><td><div class="item-summary"><?= $block->escapeHtml(__('Item Summary')) ?></div></td></thead>
<tr>
<td class="col item first" scope="col"><span><?= $block->escapeHtml(__('Item')) ?></span></td>
<td class="col price" scope="col"><span><?= $block->escapeHtml(__('Price')) ?></span></td>
......@@ -220,31 +220,29 @@ require(['jquery'], function ($) {
if (isMobile) {
var fixHeight = $('.area-blk-notitle').height();
$(window).scroll(function () {
if(!$('#checkout-step-shipping').is(":visible")) {
$(window).scroll(function () {
$(window).scroll(function () {
var scrollTop = $(document).scrollTop();
var fixTop = $('.area-blk-notitle').offset().top;
var tableTop = $('#shopping-cart-table').offset().top;
var tableHeight = $('#shopping-cart-table').height();
var headerHeight = $('.page-header').height();
if(scrollTop >= fixTop - headerHeight)
var scrollTop = $(document).scrollTop();
var fixTop = $('.area-blk-notitle').offset().top;
var tableTop = $('#shopping-cart-table').offset().top;
var tableHeight = $('#shopping-cart-table').height();
var headerHeight = $('.page-header').height();
if(scrollTop >= fixTop - headerHeight)
{
if(scrollTop < tableTop + tableHeight - fixHeight)
{
if(scrollTop < tableTop + tableHeight - fixHeight)
{
$('.area-blk-notitle .content-wrap').addClass("area-fix");
$('.area-blk-notitle .content-wrap').css({ "top": headerHeight});
}
else
{
$('.area-blk-notitle .content-wrap').removeClass("area-fix");
}
$('.area-blk-notitle .content-wrap').addClass("area-fix");
$('.area-blk-notitle .content-wrap').css({ "top": headerHeight});
}
else {
else
{
$('.area-blk-notitle .content-wrap').removeClass("area-fix");
}
});
}
}
else {
$('.area-blk-notitle .content-wrap').removeClass("area-fix");
}
});
});
}
......
app/code/Magento/Checkout/view/frontend/templates/cart/methods-new.phtml
......@@ -7,6 +7,15 @@
?>
<?php
/** @var $block \Magento\Checkout\Block\Cart */
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
$_cart = $objectManager->get('\Magento\Checkout\Model\Cart');
$subtotal = $_cart->getGrandTotal();
$subtotalStr = $block->escapeHtml(
$this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($subtotal),
['span']
);
?>
<?php if (!$block->hasError()) :?>
<style>
......@@ -16,13 +25,42 @@
flex-grow: 1;
white-space: nowrap;
}
@media(max-width:768px)
{
.checkout-methods-items .checkout-now{
background-color: #FFFFFF!important;
}
.checkout-methods-items .checkout-now button.checkout{
background-color: #ffa800!important;
}
.checkout-now.button-static .now-grand-total{
display: none;
}
}
@media(min-width:768px)
{
.now-grand-total{
display: none;
}
.checkout-methods-items .checkout-now{
margin-bottom: 1rem;
}
}
</style>
<div class="checkout methods items checkout-methods-items" style="background-color: #f2f2f2;">
<div style="background-color: #fff;width:100%;gap: 1rem;">
<div class="item checkout-now" style="margin:10px 0px 20px 0px;">
<div class="item checkout-now">
<div class="now-grand-total" style="font-size: 18px;width:100%;">
<div style="float: left;text-align: left;"><strong>Order Total:</strong></div>
<div style="float: right;text-align: right;"><?= $subtotalStr ?></div>
</div>
<button type="button" data-role="proceed-to-checkout" title="Checkout Now" class="action primary checkout">
<span class="secure"><img alt="" src="/media/wysiwyg/secure.png"></span>
<span>Checkout Now</span>
<span><?= __("Checkout Now") ?></span>
</button>
</div>
......@@ -39,7 +77,7 @@
</style>
<div class="or-checkout-with" style="display: flex;width:100%;line-height: 1.2rem;"><span>OR CHECKOUT WITH</span></div>
<div class="or-checkout-with" style="display: flex;width:100%;line-height: 1.2rem;"><span><?= __("OR CHECKOUT WITH") ?></span></div>
......@@ -47,7 +85,7 @@
ec_shortcut_jjTyyXrRb0sVUXZkA5EduNvUofEEqeuO">
<div class="checkout-logo-medium">
<input type="image" data-action="checkout-form-submit" data-checkout-url="/paypal/express/start/button/1/" src="/static/frontend/Joshine/breeze/en_US/Magento_Paypal/images/paypal-color.svg" alt="Checkout with PayPal" title="Checkout with PayPal">
<div class="checkout-txt">Checkout</div>
<div class="checkout-txt"><?= __("Checkout") ?></div>
</div>
</div>
<style type="text/css">
......@@ -62,7 +100,7 @@
<a href="https://www.securecheckout.billmelater.com/paycapture-content/fetch?hash=AU826TU8&amp;content=/bmlweb/ppwpsiw.html">
<img src="https://www.paypalobjects.com/webstatic/en_US/btn/btn_bml_text.png">
</a>
<div class="checkout-txt">Checkout</div>
<div class="checkout-txt"><?= __("Checkout") ?></div>
</div>
</div>
</div>
......@@ -101,8 +139,10 @@
var positionUl = $('.cart-container .checkout-methods-items .checkout-now')
if (window.outerHeight + $(document).scrollTop() < $(positionUl).parent().offset().top + 50) {
$(positionUl).removeClass("button-static");
$('.now-grand-total').show();
} else {
$(positionUl).addClass("button-static");
$('.now-grand-total').hide();
}
});
......
app/code/Magento/Checkout/view/frontend/web/js/view/place-order.js
......@@ -5,22 +5,27 @@
define([
'jquery',
'uiComponent'
], function ($, Component) {
'Magento_Checkout/js/view/summary/abstract-total',
'Magento_Checkout/js/model/quote'
], function ($, Component,quote) {
'use strict';
return Component.extend({
defaults: {
template: 'Magento_Checkout/placeorder'
},
totals: quote.getTotals(),
placeOrder:function(){
if($('#checkout-step-shipping').is(":visible"))
{
return false;
}
$('.checkout-index-index .payment-method._active').find('.actions-toolbar').find('button').trigger('click');
}
,
getTotalPrice:function(){
return this.getFormattedPrice(this.totals().grand_total);
}
});
});
app/code/Magento/Checkout/view/frontend/web/template/placeorder.html
......@@ -5,12 +5,18 @@
*/
-->
<div id="checkout_place_order">
<button id="place-order" data-bind="click: placeOrder">
<span class="button-inner">
<span class="secure">
<img alt="" src="/media/wysiwyg/secure.png">
<div class="fix-content">
<div class="now-order-total" style="font-size: 18px;width:95%;margin:0 auto;">
<div style="float: left;text-align: left;"><strong>Order Total:</strong></div>
<div style="float: right;text-align: right;" data-bind="text: getTotalPrice()"></div>
</div>
<button id="place-order" data-bind="click: placeOrder">
<span class="button-inner">
<span class="secure">
<img alt="" src="/media/wysiwyg/secure.png">
</span>
<span class="txt">Place Order</span>
</span>
<span class="txt">Place Order</span>
</span>
</button>
</button>
</div>
</div>
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/coupon.phtml
......@@ -26,7 +26,7 @@ $hasCouponCode = (bool) strlen($block->getCouponCode());
data-mage-init='{"collapsible":{"active": <?= $hasCouponCode ? 'true' : 'false' ?>, "openedState": "active", "saveState": false}}'
>
<div class="title" data-role="title" aria-controls="block-summary" role="tab" aria-selected="false" aria-expanded="false" tabindex="0">
<strong id="block-shipping-coupon" role="heading" aria-level="2">Coupon Code</strong>
<strong id="block-shipping-coupon" role="heading" aria-level="2"><?= __("Coupon Code") ?> </strong>
</div>
<div class="content" data-role="content" aria-labelledby="block-discount-heading" style="display: block;">
<form id="discount-coupon-form"
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/footer.phtml
......@@ -4,7 +4,7 @@ $copyrightBlock = $block->getLayout()->createBlock('Magento\Theme\Block\Html\Foo
<footer class="page-footer">
<div data-block-id="shopping_footer_why_choose_us">
<div class="choose-us">
WHY CHOOSE US
<?= __("WHY CHOOSE US") ?>
</div>
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('why_choose_us')->toHtml();?>
<div class="footer-mini-copyright-content"><?= $block->escapeHtml($copyrightBlock->getCopyright()) ?></div>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
......@@ -506,10 +506,17 @@ $flatraPrice = $block->getFlatratePrice();
right: 0;
box-shadow: 0 0 20px #999;
z-index: 1;
background-color: #FFFFFF;
padding-bottom: 10px;
}
#checkout_place_order .fix-content.button-fix .now-order-total{
display:block;
}
/***************payment end******************/
}
#checkout_place_order .fix-content .now-order-total{
display:none;
}
.checkout-index-index .opc .actions-toolbar {
display:none!important;
}
......@@ -826,9 +833,9 @@ script;
$(window).scroll(function () {
var positionUl = $('#checkout_place_order')
if (window.outerHeight + $(document).scrollTop() < $(positionUl).offset().top + 50) {
$('#place-order').addClass("button-fix");
$('.fix-content').addClass("button-fix");
} else {
$('#place-order').removeClass("button-fix");
$('.fix-content').removeClass("button-fix");
}
});
......
app/design/frontend/Joshine/breeze/Magento_Swatches/web/js/swatch-renderer.js
......@@ -427,7 +427,7 @@ define([
var tem_size = '';
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>";
"<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> "+$.mage.__('Size Guide')+"</a></div>";
label += tem_size;
label += '<span id="' + controlLabelId + '" class="' + classes.attributeLabelClass + '">' +
$('<i></i>').text(item.label).html() +
......@@ -450,7 +450,7 @@ define([
}
if (item.label.toLowerCase() == "size") {
// Create new control
var sizeContent = '<div class="swatch-attribute-selected-option-size-content" ><div style="font-size:.32rem;color:#999999;">Product Size Describe</div>'+'<span style="color:#0a0a0a;" class="'+classes.attributeSelectedOptionLabelClass + '"></span></div>';
var sizeContent = '<div class="swatch-attribute-selected-option-size-content" ><div style="font-size:.32rem;color:#999999;">'+$.mage.__("Product Size Describe")+ '</div>'+'<span style="color:#0a0a0a;" class="'+classes.attributeSelectedOptionLabelClass + '"></span></div>';
container.append(
'<div class="' + classes.attributeClass + ' ' + item.code + '" ' +
......
app/design/frontend/Joshine/breeze/i18n/es_ES.csv
......@@ -3109,7 +3109,6 @@ Time in seconds between the widget updates.,module,Magento_CatalogWidget
"See Details","Ver información",module,Magento_Checkout
"Options Details","Detalles de las opciones",module,Magento_Checkout
"Remove","Eliminar",module,Magento_Checkout
"Cart Subtotal","Subtotal del carrito",module,Magento_Checkout
"No Payment Methods","No Payment Methods",module,Magento_Checkout
"Payment Information","Información de pago",module,Magento_Checkout
"No Payment method available.","Ningún método de pago está disponible.",module,Magento_Checkout
......@@ -15493,7 +15492,7 @@ formElements/*[name(.)=../../@formElement]/settings/title,module,Magento_Ui
"Item in Cart", "Artículo en el carrito"
"You have no items in your shopping cart.", "No tiene elementos en su carrito de compras."
"View and Edit Cart","Ver y editar carrito"
"Cart Subtotal", "Subtotal del carrito"
"Cart Subtotal", "Subtotal"
"You can track your order status by creating an account.", "Puede rastrear el estado de su pedido creando una cuenta."
"View Details", "Ver detalles"
"Options Details", "Detalles de opciones"
......@@ -15591,4 +15590,38 @@ Add your photo,Añadir sus fotos
Customer Login,Inicio de sesión del cliente
My Wish List, Mi lista de deseos
"Last Added Items","Últimos elementos añadidos"
Size Guide, Guía de tamaño
Product Size Describe,Descripción del tamaño del producto
Show Password,Mostrar contraseña
"Shopping Cart","Carrito de compras"
"Shipping&Payment","Transporte y pago"
"Order Complete","El pedido se ha completado"
"Secure Checkout","Pago Seguro"
"Free Shipping","Entrega gratuita"
"15-Day Returns","Devolución en 15 días"
"One-Year Warranty","Garantía de un año"
"Already Registered?","¿Ya registrado?"
"EASY RETURNS","Recompensa fácil"
"SAFE & SECURE","Seguro y confiable"
"No-quibble return & exchange within 15 Days","No se puede devolver ni cambiar dentro de los 15 días."
"Your information is always protected","Su información siempre está protegida"
"WHY CHOOSE US","¿¿ por qué nos eligen?"
"Place Order","Hacer un pedido"
Item Summary,Resumen del proyecto
Shipping Fee,Flete
Spend,Gastos
more and get,Más y obtener
FREE SHIPPING,Sin flete
Order Total, Número total de pedidos
OR CHECKOUT WITH,O al pagar la cuenta
Checkout Now,Pagar de inmediato
Coupon Code,Código preferencial
WHY CHOOSE US,¿¿ por qué nos eligen?
app/design/frontend/Joshine/breeze/web/css/_custom.less
......@@ -790,7 +790,12 @@ p.shopbycate-title {
color:#cacaca!important;
}
.checkout-cart-index .cart-container .checkout-methods-items .checkout-now button{
background: #0000; height: 40px;font-size: 22px;text-transform: uppercase;font-weight: 400;
background: #0000;
height: 40px;
font-size: 22px;
text-transform: uppercase;
font-weight: 400;
padding: 1.47rem 0px;
}
@media (min-width: 768px) {
.checkout-cart-index .cart-container {
......@@ -897,6 +902,12 @@ p.shopbycate-title {
.button-static{
position: static!important;
box-shadow: none!important;
margin-bottom:1rem!important;
padding: 0px!important;
gap: 0.5rem;
}
.checkout-now.button-static .now-grand-total{
display: none;
}
.checkout-cart-index table tr{
border: none;
......@@ -906,7 +917,8 @@ p.shopbycate-title {
}
.checkout-cart-index .cart-container .checkout-methods-items .checkout-now{
z-index:1;
gap: 0rem;
margin-bottom: 0px;padding: 0px 10px 10px;
}
.checkout-cart-index .cart-container .checkout-methods-items .checkout-now button{
transition: all .3s;
......@@ -2792,7 +2804,6 @@ tr.grand.totals {
left: 0;
z-index: 100;
box-shadow: 0 0 20px #999;
padding: 5px 10px;
}
.checkout.checkout-methods-items div{
height: auto !important;
......
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