Skip to content

J
joshine
Commit 0dccee8a by lmf
Options

Merge branch 'developer' into production

parents 4f633499 ed5b3462
Showing with 215 additions and 22 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/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,9 +8,11 @@
<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" />
......@@ -35,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">
......@@ -50,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,9 +59,17 @@
</item>
</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>
</item>
</item>
</item>
</item>
</argument>
</arguments>
</referenceBlock>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
......@@ -79,7 +79,6 @@
.checkout-index-index #maincontent{background: #f2f2f2;}
.page-title-wrapper{display: none;}
#opc-sidebar{
border: 1px solid #d4d4d4;
background: #fff;
font-size: 16px;
}
......@@ -323,7 +322,7 @@
}
.checkout-index-index .authentication-wrapper{
background: #ffffff;
padding: 20px;
padding:20px;
margin-bottom: 18px;
top:0;
}
......@@ -427,6 +426,9 @@
.checkout-index-index .opc-block-summary .payment-option._active .payment-option-title {
border-bottom: none;
}
.checkout-cart-index .opc-estimated-wrapper .minicart-wrapper {
display: none;
}
/****************************************payment end********************************************************/
@media(max-width:768px){
.opc .step-title .number {
......@@ -469,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;
......@@ -482,8 +486,29 @@
.checkout-index-index .opc .action-update-cancel {
height: 100%;
}
.checkout-index-index .page-wrapper a.logo{
margin-left: 35%!important;
}
.checkout-index-index div#checkout {
margin-top: 1rem;
}
.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;
......@@ -521,7 +546,7 @@
float: none;
width:100%;
}
#opc-sidebar{
.slip-div{
position:absolute;
top:0px;
border:none;
......@@ -581,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;
......@@ -645,10 +692,6 @@
padding: 0;
}
#opc-sidebar{
float: right;
width: 370px;
}
}
@media(max-width: 1024px){
a.logo{
......@@ -759,18 +802,34 @@ script;
var scrollTop = $(document).scrollTop(),
offsetTop = $('.checkout-container').offset().top,
containerHeight = $('.checkout-container').height()-20,
sidebarHeight = $('#opc-sidebar').height();
sidebarHeight = $('.slip-div').height();
if (scrollTop > offsetTop) {
if (containerHeight + offsetTop - scrollTop > sidebarHeight) {
$('#opc-sidebar').css('top', (scrollTop - offsetTop)+'px');
$('.slip-div').css('top', (scrollTop - offsetTop)+'px');
} else {
$('#opc-sidebar').css('top', (containerHeight - sidebarHeight)+'px');
$('.slip-div').css('top', (containerHeight - sidebarHeight)+'px');
}
} else {
$('#opc-sidebar').css('top', '0');
$('.slip-div').css('top', '0');
}
});
}
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
......@@ -30,9 +30,19 @@
</div>
</div>
<div class="payment-right">
<!-- ko foreach: getRegion('sidebar') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<div class="slip-div">
<!-- ko foreach: getRegion('sidebar') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<!-- ko foreach: getRegion('placeOrder') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<!-- ko foreach: getRegion('security') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
</div>
</div>
......
app/design/frontend/Joshine/breeze/Magento_Cms/layout/cms_index_index.xml
......@@ -6,6 +6,9 @@
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<head>
<link rel="canonical" src="{{baseUrl}}" src_type="url" />
</head>
<body>
<referenceContainer name="content">
<block class="Magento\Framework\View\Element\Template" name="default_home_page" template="Magento_Cms::default/home.phtml"/>
......
app/design/frontend/Joshine/breeze/Magento_Swatches/web/js/swatch-renderer.js
......@@ -428,12 +428,13 @@ define([
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>";
label += tem_size;
}
label +=
'<span id="' + controlLabelId + '" class="' + classes.attributeLabelClass + '">' +
$('<i></i>').text(item.label).html() +
'</span>' +
'<span class="' + classes.attributeSelectedOptionLabelClass + '"></span>' + tem_size;
'<span class="' + classes.attributeSelectedOptionLabelClass + '"></span>';
}
if ($widget.inProductList) {
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
......@@ -953,14 +953,22 @@ p.shopbycate-title {
.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-onepage-success #maincontent{
padding-bottom:0px;
.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;
......@@ -1610,7 +1618,7 @@ footer{
@media(min-width: 1024px){
& {
margin-left: auto;
margin-left: 25%;
}
.navigation{
......
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