Skip to content

J
joshine
Commit 47178796 by dhn
Options

按钮

parent c5ddbf98
Showing with 234 additions and 24 deletions
app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
......@@ -197,7 +197,8 @@ class LayoutProcessor implements LayoutProcessorInterface
$fields
);
}
$jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
['shippingAddress']['children']['shipping-address-fieldset']['children']['company']['sortOrder'] = 140;
return $jsLayout;
}
......
app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
......@@ -15,6 +15,11 @@
<referenceBlock name="catalog.topnav" remove="true" />
<referenceBlock name="top.search" remove="true" />
<referenceBlock name="sparsh.free-shipping.bar.top" remove="true" />
<referenceBlock name="header.search.bar" remove="true" />
<referenceBlock name="header.account" remove="true" />
<referenceBlock name="header.wishlist" remove="true" />
<referenceBlock name="minicart" remove="true" />
<referenceContainer name="header.container">
<block class="Magento\Cms\Block\Block" name="cart.payment.top">
<arguments>
......
app/code/Magento/Checkout/view/frontend/web/js/view/part.js
......@@ -39,6 +39,11 @@ define([
if (!addressForm.validate().form()) {
return false;
}
var paymentMethodObj = $('.checkout-index-index .payment-method');
if(paymentMethodObj.length < 1)
{
return false;
}
var email = $('#customer-email').val() || '';
var firstname = $('#co-shipping-form input[name="firstname"]').val();
var lastname = $('#co-shipping-form input[name="lastname"]').val();
......@@ -57,6 +62,7 @@ define([
$('#shipping-text').show();
$('#shipping-text .main-address.shipping-address').html(firstname + ' ' + lastname + '<br>' + street + '<br>' + city + ', ' + regin + ', ' + country + '<br>' + postcode + ', ' + telephone + '<br>' + email);
}
$(paymentMethodObj[0]).find('input[type="radio"]').trigger('click');
$('#next-shipping').hide();
$('#checkout-step-shipping_method').show();
$('#checkout-payment-method-load').show();
......@@ -70,6 +76,7 @@ define([
$(document).on('click', '#shipping-text .address-edit', function () {
$('#shipping-text .main-address.shipping-address').html('');
$('#checkout_place_order').removeClass('button-fix');
$('#shipping-text').hide();
$('#checkout-step-shipping').show();
$('#next-shipping').show();
......
app/code/Magento/Checkout/view/frontend/web/js/view/place-order.js 0 → 100644
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
define([
'jquery',
'uiComponent'
], function ($, Component) {
'use strict';
return Component.extend({
defaults: {
template: 'Magento_Checkout/placeorder'
},
placeOrder:function(){
if($('#checkout-step-shipping').is(":visible"))
{
return false;
}
$('.checkout-index-index .payment-method._active').find('.actions-toolbar').find('button').trigger('click');
}
});
});
app/code/Magento/Checkout/view/frontend/web/js/view/security.js 0 → 100644
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
define([
'jquery',
'uiComponent'
], function ($, Component) {
'use strict';
return Component.extend({
defaults: {
template: 'Magento_Checkout/security'
}
});
});
app/code/Magento/Checkout/view/frontend/web/template/payment.html
......@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-->
<li id="payment" role="presentation" class="checkout-payment-method" data-bind="fadeVisible: isVisible">
<li id="payment" role="presentation" class="checkout-payment-method">
<div id="checkout-step-payment"
class="step-content"
data-role="content"
......
app/code/Magento/Checkout/view/frontend/web/template/placeorder.html 0 → 100644
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<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">
</span>
<span class="txt">Place Order</span>
</span>
</button>
</div>
\ No newline at end of file
app/code/Magento/Checkout/view/frontend/web/template/security.html 0 → 100644
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<div id="checkout_security_guarantee">
<div style="background: #fff; padding: 15px 10px 20px;">
<div style="position: relative;">
<img style="position: absolute; left: 2px; top: 0;" alt="" src="/media/wysiwyg/cart.png">
<div style="padding-left: 45px;">
<span style="display: block; font-family: Lato-Bold; font-size: 14px; margin-bottom: 5px;color: #1d1d1d;">EASY RETURNS</span>
<span style="display: block; font-family: Regular; font-size: 12px; margin-bottom: 15px;color: #1d1d1d;">No-quibble return &amp; exchange within 15 Days</span>
</div>
</div>
<div style="position: relative;">
<img style="position: absolute; left: 9px; top: 0;" alt="" src="/media/wysiwyg/key.png">
<div style="padding-left: 45px;">
<span style="display: block; font-family: Lato-Bold; font-size: 14px; margin-bottom: 5px;color: #1d1d1d;">SAFE &amp; SECURE</span>
<span style="display: block; font-family: Regular; font-size: 12px; margin-bottom: 15px;color: #1d1d1d;">Your information is always protected</span>
</div>
</div>
<div>
<img style="margin-left: 6px; display: block;" alt="" src="/media/wysiwyg/support-payments-pc.png">
</div>
</div>
</div>
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_cart_index.xml
......@@ -8,11 +8,18 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<update handle="checkout_cart_item_renderers"/>
<body>
<referenceContainer name="page.bottom.container" remove="true"/>
<referenceBlock name="checkout.cart.addtocart" remove="true" />
<referenceContainer name="footer-container" remove="true"/>
<referenceContainer name="nav.main.box" remove="true"/>
<referenceBlock name="catalog.topnav" remove="true" />
<referenceBlock name="top.search" remove="true" />
<referenceBlock name="header.search.bar" remove="true" />
<referenceBlock name="header.account" remove="true" />
<referenceBlock name="header.wishlist" remove="true" />
<referenceBlock name="minicart" remove="true" />
<referenceContainer name="header.container">
<block class="Magento\Cms\Block\Block" name="cart.payment.top">
<arguments>
......@@ -30,6 +37,7 @@
<referenceContainer name="content">
<block class="Magento\Framework\View\Element\Template" name="checkout.cart.footer" template="Magento_Checkout::footer.phtml" />
</referenceContainer>
<!--
<referenceBlock name="checkout.cart.totals">
<arguments>
<argument name="jsLayout" xsi:type="array">
......@@ -45,5 +53,6 @@
</argument>
</arguments>
</referenceBlock>
-->
</body>
</page>
app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_index_index.xml
......@@ -12,13 +12,16 @@
<referenceBlock name="catalog.topnav" remove="true" />
<referenceBlock name="top.search" remove="true" />
<referenceBlock name="sparsh.free-shipping.bar.top" remove="true" />
<referenceContainer name="header.container">
<referenceContainer name="checkout.header.container">
<block class="Magento\Cms\Block\Block" name="cart.payment.top">
<arguments>
<argument name="block_id" xsi:type="string">cart_payment_top</argument>
</arguments>
</block>
</referenceContainer>
<referenceContainer name="columns.top">
<block class="Magento\Cms\Block\Block" name="progress.bar" before="-">
<arguments>
......@@ -56,6 +59,10 @@
</item>
</item>
</item>
<item name="placeOrder" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/place-order</item>
<item name="displayArea" xsi:type="string">placeOrder</item>
</item>
<item name="security" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/security</item>
<item name="displayArea" xsi:type="string">security</item>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/item/default.phtml
......@@ -16,6 +16,14 @@ $isVisibleProduct = $product->isVisibleInSiteVisibility();
$helper = $this->helper(Magento\Msrp\Helper\Data::class);
$canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinimalPriceLessMsrp($product);
?>
<style>
.item-options-line span{
display: inline-block;
}
.item-options-line span:first-child{
width:30%;
}
</style>
<tbody class="cart item">
<tr class="item-info">
<td data-th="<?= $block->escapeHtml(__('Item')) ?>" class="col item">
......@@ -42,19 +50,21 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
<?php endif; ?>
</strong>
<?php if ($_options = $block->getOptionList()) :?>
<dl class="item-options" >
<div class="item-options" >
<?php foreach ($_options as $_option) :?>
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
<dt style="width: 30%;float: left;margin-top: 0px;"><?= $block->escapeHtml($_option['label']) ?></dt>
<dd>
<?php if (isset($_formatedOptionValue['full_view'])) :?>
<?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
<?php else :?>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?>
<?php endif; ?>
</dd>
<div class="item-options-line">
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
<span style="margin-top: 0px;"><?= $block->escapeHtml($_option['label']) ?></span>
<span>
<?php if (isset($_formatedOptionValue['full_view'])) :?>
<?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
<?php else :?>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?>
<?php endif; ?>
</span>
</div>
<?php endforeach; ?>
</dl>
</div>
<?php endif;?>
<?php if ($messages = $block->getMessages()) :?>
<?php foreach ($messages as $message) :?>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
......@@ -471,6 +471,8 @@
}
.checkout-index-index #opc-sidebar{
border:none;
margin-bottom: 0px;
font-size: 16px !important
}
.checkout-index-index .opc .actions-toolbar.action-update-cancel {
position: relative;
......@@ -493,8 +495,20 @@
.checkout-index-index .authentication-wrapper{
padding: 5px 20px;
}
.button-fix {
position: fixed;
bottom: 0;
left: 0;
right: 0;
box-shadow: 0 0 20px #999;
z-index: 1;
}
/***************payment end******************/
}
.checkout-index-index .opc .actions-toolbar {
display:none!important;
}
.opc .step-title{
font-size: 25px;
padding: 0;
......@@ -592,6 +606,28 @@
border-bottom: 1px solid #dcdcdc !important;
}
.teliphone_number{width:100% !important;}
#checkout_security_guarantee span{
line-height: normal;
}
.checkout-index-index #checkout_place_order #place-order{
width: 95%;
border: none;
background-color: #ff9600;
height: 48px;
color: #fff;
font-size: 20px;
text-transform: uppercase;
outline: none;
text-align: center;
box-sizing: border-box;
}
.checkout-index-index #checkout_place_order
{
text-align: center;
background-color: #fff;
padding: 10px 0px;
transition: all .3s;
}
@media(min-width: 1024px){
.opc .actions-toolbar{
position: absolute;
......@@ -655,9 +691,7 @@
.action.action-auth-toggle{
padding: 0;
}
#checkout_security_guarantee span{
line-height: normal;
}
}
@media(max-width: 1024px){
a.logo{
......@@ -781,5 +815,21 @@ script;
}
});
}
else {
$(window).scroll(function () {
if(!$('#checkout-step-shipping').is(":visible")) {
var scrollTop = $(document).scrollTop() - 120;
var wh = $(document.body).height();
var offsetTop = $('#checkout_place_order').offset().top;
if (wh - offsetTop <= scrollTop) {
//
$('#checkout_place_order').removeClass('button-fix');
} else {
$('#checkout_place_order').addClass('button-fix');
}
}
});
}
});
</script>
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/onepage.html
......@@ -35,6 +35,10 @@
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<!-- ko foreach: getRegion('placeOrder') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<!-- ko foreach: getRegion('security') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
......
app/design/frontend/Joshine/breeze/web/OwlCarousel2/dist/assets/owl.carousel_local.css
......@@ -58,8 +58,7 @@
}
@media (max-width: 768px) {
.owl-carousel.owl-theme .owl-nav *{
top: 40%;
top: 25%;
}
.owl-carousel.owl-theme .owl-nav .owl-prev{
padding:10px 10px 10px 0px;
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
......@@ -742,7 +742,7 @@ p.shopbycate-title {
.checkout-cart-index .cart-empty {
min-height: 300px;
}
.checkout-cart-index .us-icon,.checkout-index-index .us-icon {
.checkout-cart-index .us-icon,.checkout-index-index .us-icon,.checkout-onepage-success .us-icon {
background: url("../images/icons-pc.png");
background-position-y: -420px;
width: 40px;
......@@ -862,6 +862,9 @@ p.shopbycate-title {
.checkout-cart-index .cart-container .cart-summary > .title {
padding: 1rem 0px;
}
.checkout-index-index .header.content,.checkout-cart-index .header.content{
padding: 15px 0px 10px;
}
}
.checkout-index-index .details-qty,.checkout-cart-index .details-qty{
display: block;
......@@ -910,7 +913,7 @@ p.shopbycate-title {
.checkout-index-index .product-item-details .product-item-inner .subtotal {
right: 13.5%;
}
.checkout-cart-index .nav-toggle {
.checkout-cart-index .nav-toggle,.checkout-cart-index .nav-toggle,.checkout-onepage-success .nav-toggle {
display: none;
}
.checkout-cart-index{
......@@ -918,28 +921,54 @@ p.shopbycate-title {
display:none;
}
}
.checkout-index-index .page-wrapper a.logo{
.checkout-cart-index .header.content,.checkout-index-index .header.content,.checkout-onepage-success .header.content{
padding:15px 0px;
}
.checkout-index-index .page-wrapper a.logo,.checkout-onepage-success .page-wrapper a.logo{
margin-left: 35%!important;
}
.checkout-onepage-success .page-footer{
padding:0px;
}
.checkout-index-index div#checkout {
margin-top: 1rem;
}
.checkout-index-index .authentication-wrapper{
padding: 5px 20px;
}
.checkout-cart-index .header.content .minicart-wrapper,.checkout-index-index .opc-estimated-wrapper .minicart-wrapper {
display: none;
}
.checkout-cart-index .header.content > a {
margin-left: 35%;
}
.checkout-cart-index .header.content .logo img,.checkout-onepage-success .header.content .logo img {
max-width:60%;
}
.checkout-index-index .authentication-wrapper {
padding: 6px 20px!important;
}
}
.checkout-index-index .page-footer,.checkout-cart-index .page-footer{
background-color: #FFFFFF;
}
.checkout-onepage-success #maincontent{
padding-bottom:0px;
}
@media (min-width: 768px){
.checkout-index-index .page-footer{
padding-top:0px;
margin-top:20px;
}
.checkout-cart-index .opc-estimated-wrapper .minicart-wrapper {
display: none;
.checkout-index-index .page-header,.checkout-cart-index .page-header,.checkout-onepage-success .page-header{
background-color: #ffffff;
}
.checkout-cart-index .page-header{
padding-top:5px;
}
}
.checkout-index-index #next-shipping,.checkout-index-index #next-payment {
text-align: center;
......
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