Skip to content

J
joshine
Commit af7069ef by liumengfei
Options

Merge branch 'developer' into production

parents 04d20bc5 e3882ffe
Showing with 310 additions and 18 deletions
app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
......@@ -36,6 +36,11 @@ else
{
$difference_price = $free_shipping_subtotal - $subtotal;
}
$mobileDetect = $objectManager->get(\Joshine\Common\Lib\MobileDetect\MobileDetect::class);
?>
<style>
.free_message{
......@@ -83,6 +88,9 @@ else
z-index: 1;
border-top: 1px solid #fff;
}
.cart.table-wrapper{
border-top:1px solid #ddd;
}
}
</style>
<?php $mergedCells = ($this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices() ? 2 : 1); ?>
......@@ -121,6 +129,7 @@ else
</div>
</div>
<?php endif ?>
<?php if (!$mobileDetect->isMobile()): ?>
<form action="<?= $block->escapeUrl($block->getUrl('checkout/cart/updatePost')) ?>"
method="post"
......@@ -191,6 +200,37 @@ else
<input type="hidden" value="" id="update_cart_action_container" data-cart-item-update=""/>
</div>
</form>
<?php else: ?>
<form action="<?= $block->escapeUrl($block->getUrl('checkout/cart/updatePost')) ?>"
method="post"
id="form-validate"
data-mage-init='{"Magento_Checkout/js/action/update-shopping-cart":
{"validationURL" : "<?= $block->escapeUrl($block->getUrl('checkout/cart/updateItemQty')) ?>",
"updateCartActionContainer": "#update_cart_action_container"}
}'
class="form form-cart">
<?= $block->getBlockHtml('formkey') ?>
<div class="cart table-wrapper<?= $mergedCells == 2 ? ' detailed' : '' ?>">
<?php if ($block->getPagerHtml()): ?>
<div class="cart-products-toolbar cart-products-toolbar-top toolbar"
data-attribute="cart-products-toolbar-top"><?= $block->getPagerHtml() ?>
</div>
<?php endif ?>
<?php foreach ($block->getItems() as $_item): ?>
<?= $block->getItemHtml($_item) ?>
<?php endforeach ?>
<?php if ($block->getPagerHtml()): ?>
<div class="cart-products-toolbar cart-products-toolbar-bottom toolbar"
data-attribute="cart-products-toolbar-bottom"><?= $block->getPagerHtml() ?>
</div>
<?php endif ?>
</div>
</form>
<?php endif ?>
<script>
require(['jquery'], function ($) {
$('.add-qty').click(function(){
......
app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
......@@ -7,10 +7,10 @@
/** @var $block \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Remove */
?>
<a href="#"
title="<?= $block->escapeHtml(__('Remove item')) ?>"
title="<?= $block->escapeHtml(__('Remove')) ?>"
class="action action-delete"
data-post='<?= /* @noEscape */ $block->getDeletePostJson() ?>'>
<span>
<?= $block->escapeHtml(__('Remove item')) ?>
<?= $block->escapeHtml(__('Remove')) ?>
</span>
</a>
app/code/Magento/Checkout/view/frontend/web/js/view/summary/cart-items.js
......@@ -72,7 +72,7 @@ define([
return priceUtils.formatPrice(price, quote.getPriceFormat());
},
getGrandTotal:function(){
return this.getFormattedPrice(this.totals['base_subtotal']);
return this.getFormattedPrice(this.totals['subtotal']);
},
/**
* Set items to observable field
......
app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html
......@@ -58,20 +58,21 @@
<div class="method-msg">
<span class="col col-msg"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg">
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg" data-bind="i18n:'10-15 Working Days -'">
10-15 Working Days - <span class="free-over ff">Free Over <span text="$parent.full_free_ship()"></span></span>
</span>
<span class="free-over ff" data-bind="i18n:'Free Over'"> </span>
<span text="$parent.full_free_ship()"></span>
</div>
<!-- /ko -->
<!-- ko ifnot: (method.amount) -->
<div class="method-msg">
<span class="col col-msg"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg">
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg" data-bind="i18n:'10-15 Working Days -'">
10-15 Working Days</span>
</span>
</span>
</div>
......@@ -135,19 +136,21 @@
<!-- ko if: (method.amount) -->
<div class="method-msg">
<span class="col col-msg"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg">
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg" data-bind="i18n:'10-15 Working Days -'">
10-15 Working Days - <span class="free-over">Free Over <span text="$parent.full_free_ship()"></span></span>
</span>
<span class="free-over" data-bind="i18n:'Free Over'"></span>
<span text="$parent.full_free_ship()"></span>
</div>
<!-- /ko -->
<!-- ko ifnot: (method.amount) -->
<div class="method-msg">
<span class="col col-msg"
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg">
attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg" data-bind="i18n:'10-15 Working Days'">
10-15 Working Days</span>
</span>
</span>
</div>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/coupon.phtml
......@@ -20,6 +20,15 @@ $hasCouponCode = (bool) strlen($block->getCouponCode());
.checkout-cart-index .cart-container .block.discount.active .content{
padding:0px 1rem;
}
@media(max-width: 768px){
.checkout-cart-index .cart-container .block.discount.active .content{
padding:0px!important;
}
.checkout-cart-index .column.main .block .title
{
padding: 0.45rem!important;
}
}
</style>
<!--
<div class="block discount"
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/item/renderer/actions/remove.phtml
......@@ -7,10 +7,10 @@
/** @var $block \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Remove */
?>
<a href="#"
title="<?= $block->escapeHtml(__('Remove item')) ?>"
title="<?= $block->escapeHtml(__('Remove')) ?>"
class="action action-delete"
data-post='<?= /* @noEscape */ $block->getDeletePostJson() ?>'>
<span>
<?= $block->escapeHtml(__('Remove item')) ?>
<?= $block->escapeHtml(__('Remove')) ?>
</span>
</a>
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
......@@ -980,7 +980,12 @@ $free_price = $_helper->currency(0, true, false);
border:1px solid #ddd!important;
padding: 0!important;
}
.checkout-index-index .table-totals td, .checkout-index-index .table-totals th {
padding: 0.1rem 0.5rem;
}
.checkout-index-index .table-totals .grand.totals td{
padding-bottom:0.45rem;
}
/********************************************address from end****************************************************/
</style>
......@@ -1026,7 +1031,6 @@ script;
</div>
<script>
require(['jquery'], function ($) {
console.log('window.checkoutConfig',window.checkoutConfig)
var isMobile = window.matchMedia("(pointer:coarse)").matches;
if (!isMobile) {
$(window).scroll(function () {
......
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/cart/totals/grand-total.html
......@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-->
<tr class="grand totals" style="font-size: 22px;">
<tr class="grand totals" style="font-size: 20px;">
<th class="mark" colspan="1" scope="row">
<strong data-bind="i18n: title"></strong>
</th>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/summary/grand-total.html
......@@ -5,7 +5,7 @@
*/
-->
<!-- ko if: isDisplayed() -->
<tr class="grand totals" style="font-size: 22px;">
<tr class="grand totals" style="font-size: 20px;">
<td class="mark" scope="row">
<strong data-bind="i18n: title"></strong>
</td>
......
app/design/frontend/Joshine/breeze/i18n/es_ES.csv
......@@ -15636,6 +15636,7 @@ invalid email address,Dirección de correo electrónico no válida
Free Over,Gratis sobre
"10-15 Working Days -","10-15 días laborables-"
SECURE CHECKOUT,PAGO SEGURO
"10-15 Working Days","10-15 días laborables"
app/design/frontend/Joshine/breeze/web/css/_custom.less
......@@ -965,7 +965,7 @@ p.shopbycate-title {
transition: all .3s;
}
.checkout-cart-index #cart-totals table td,.checkout-cart-index #cart-totals table th {
padding: 0.3rem 0.5rem;
padding: 0.2rem 0.5rem;
}
.catalog-product-view .recently-viewed .flash-sale-info .price-final_price .normal-price{
float:right;
......
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