Skip to content

J
joshine
Commit 7eb2ab56 by dhn
Options

改版结算页shopify样式

parent 205e5955
Showing with 579 additions and 272 deletions
app/code/Magento/Checkout/Block/Onepage.php
...@@ -73,6 +73,7 @@ class Onepage extends \Magento\Framework\View\Element\Template ...@@ -73,6 +73,7 @@ class Onepage extends \Magento\Framework\View\Element\Template
$this->serializer = $serializerInterface ?: \Magento\Framework\App\ObjectManager::getInstance() $this->serializer = $serializerInterface ?: \Magento\Framework\App\ObjectManager::getInstance()
->get(\Magento\Framework\Serialize\Serializer\JsonHexTag::class); ->get(\Magento\Framework\Serialize\Serializer\JsonHexTag::class);
$this->_scopeConfigInterface = $_scopeConfigInterface; $this->_scopeConfigInterface = $_scopeConfigInterface;
$this->_urlBuilder = $context->getUrlBuilder();
} }
/** /**
...@@ -116,7 +117,13 @@ class Onepage extends \Magento\Framework\View\Element\Template ...@@ -116,7 +117,13 @@ class Onepage extends \Magento\Framework\View\Element\Template
$price = $_helper->currency($full_free, true, false); $price = $_helper->currency($full_free, true, false);
return $price; return $price;
} }
public function getLogoUrl()
{
$path = $this->_scopeConfigInterface->getValue('design/header/logo_src','stores',1);
$logoUrl = $this->_urlBuilder
->getBaseUrl(['_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA]) .'logo/'. $path;
return $logoUrl;
}
public function getFullFreeShip() public function getFullFreeShip()
{ {
return $this->_scopeConfigInterface->getValue('carriers/freeshipping/free_shipping_subtotal'); return $this->_scopeConfigInterface->getValue('carriers/freeshipping/free_shipping_subtotal');
......
app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
...@@ -9,13 +9,6 @@ ...@@ -9,13 +9,6 @@
?> ?>
<div id="checkout" data-bind="scope:'checkout'" class="checkout-container"> <div id="checkout" data-bind="scope:'checkout'" class="checkout-container">
<div id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"checkoutLoader": {}}'>
<div class="loader">
<img src="<?= $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')) ?>"
alt="<?= $block->escapeHtmlAttr(__('Loading...')) ?>">
</div>
</div>
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("position: absolute;", "#checkout-loader img") ?>
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
<script type="text/x-magento-init"> <script type="text/x-magento-init">
{ {
...@@ -35,10 +28,8 @@ script; ...@@ -35,10 +28,8 @@ script;
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?> <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
<?php $scriptString = <<<script <?php $scriptString = <<<script
require([ require([
'mage/url', 'mage/url'
'Magento_Ui/js/block-loader' ], function(url) {
], function(url, blockLoader) {
blockLoader("{$block->escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')))}");
return url.setBaseUrl('{$block->escapeJs($block->escapeUrl($block->getBaseUrl()))}'); return url.setBaseUrl('{$block->escapeJs($block->escapeUrl($block->getBaseUrl()))}');
}) })
script; script;
......
app/code/Magento/Checkout/view/frontend/web/js/model/quote.js
...@@ -42,6 +42,7 @@ define([ ...@@ -42,6 +42,7 @@ define([
totals = ko.observable(totalsData), totals = ko.observable(totalsData),
collectedTotals = ko.observable({}); collectedTotals = ko.observable({});
return { return {
totals: totals, totals: totals,
shippingAddress: shippingAddress, shippingAddress: shippingAddress,
...@@ -53,7 +54,6 @@ define([ ...@@ -53,7 +54,6 @@ define([
paymentMethod: paymentMethod, paymentMethod: paymentMethod,
paymentMethodlist:paymentMethodlist, paymentMethodlist:paymentMethodlist,
guestEmail: null, guestEmail: null,
/** /**
* @return {*} * @return {*}
*/ */
...@@ -119,12 +119,6 @@ define([ ...@@ -119,12 +119,6 @@ define([
getPaymentMethod: function () { getPaymentMethod: function () {
return paymentMethod; return paymentMethod;
}, },
setShippingSaveMethod: function (Method) {
shippingSaveMethod(Method);
},
getShippingSaveMethod: function () {
return shippingSaveMethod;
},
setPaymentMethodList: function (MethodList) { setPaymentMethodList: function (MethodList) {
paymentMethodlist(MethodList); paymentMethodlist(MethodList);
}, },
...@@ -132,6 +126,15 @@ define([ ...@@ -132,6 +126,15 @@ define([
return paymentMethodlist; return paymentMethodlist;
}, },
setShippingSaveMethod: function (Method) {
shippingSaveMethod(Method);
},
getShippingSaveMethod: function () {
return shippingSaveMethod;
},
/** /**
* @return {*} * @return {*}
*/ */
......
app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rate-processor/new-address.js
...@@ -57,6 +57,10 @@ define([ ...@@ -57,6 +57,10 @@ define([
).done(function (result) { ).done(function (result) {
var new_sh = []; var new_sh = [];
new_sh.push(result[0]); new_sh.push(result[0]);
if(result.length > 1)
{
quote.setShippingSaveMethod(result[1]);
}
rateRegistry.set(address.getCacheKey(), result); rateRegistry.set(address.getCacheKey(), result);
shippingService.setShippingRates(new_sh); shippingService.setShippingRates(new_sh);
}).fail(function (response) { }).fail(function (response) {
......
app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
...@@ -178,14 +178,14 @@ define([ ...@@ -178,14 +178,14 @@ define([
} }
} }
var data = setBillingAddressAction(globalMessageList); var data = setBillingAddressAction(globalMessageList);
if(data.status == 200) // if(data.status == 200)
{ // {
this.isAddressDetailsVisible(true); // this.isAddressDetailsVisible(true);
} // }
else // else
{ // {
this.isAddressDetailsVisible(false); // this.isAddressDetailsVisible(false);
} // }
this.updateAddresses(); this.updateAddresses();
......
app/code/Magento/Checkout/view/frontend/web/js/view/checkout-footer.js 0 → 100644
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
define([
'jquery',
'uiComponent',
'mage/mage'
], function ($, Component) {
'use strict';
return Component.extend({
defaults: {
template: 'Magento_Checkout/checkout-index-footer'
}
});
});
app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
...@@ -54,6 +54,7 @@ define([ ...@@ -54,6 +54,7 @@ define([
isCustomerLoggedIn: customer.isLoggedIn, isCustomerLoggedIn: customer.isLoggedIn,
forgotPasswordUrl: window.checkoutConfig.forgotPasswordUrl, forgotPasswordUrl: window.checkoutConfig.forgotPasswordUrl,
emailCheckTimeout: 0, emailCheckTimeout: 0,
visible: ko.observable(window.checkoutConfig.addressVisible),
/** /**
* Initializes regular properties of instance. * Initializes regular properties of instance.
...@@ -79,7 +80,6 @@ define([ ...@@ -79,7 +80,6 @@ define([
return this; return this;
}, },
/** /**
* Callback on changing email property * Callback on changing email property
*/ */
......
app/code/Magento/Checkout/view/frontend/web/js/view/logo-nav.js 0 → 100644
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
define([
'jquery',
'uiComponent',
'ko',
'Magento_Checkout/js/model/quote',
'mage/mage'
], function ($, Component,ko,quote) {
'use strict';
return Component.extend({
defaults: {
template: 'Magento_Checkout/logo-nav'
},
visible: ko.observable(!quote.isVirtual()) && ko.observable(window.checkoutConfig.addressVisible),
shippingVisible: ko.observable(window.checkoutConfig.shippingVisible),
paymentVisible: ko.observable(window.checkoutConfig.paymentVisible),
getLogoSrc: function(){
return window.checkoutConfig.logosrc;
},
breadcrumbReturnToCart: function(){
$.mage.redirect(window.checkoutConfig.cartUrl);
},
isMobile: function(){
return window.checkoutConfig.isMobile;
}
});
});
app/code/Magento/Checkout/view/frontend/web/js/view/payment.js
...@@ -39,6 +39,8 @@ define([ ...@@ -39,6 +39,8 @@ define([
activeMethod: '' activeMethod: ''
}, },
isVisible: ko.observable(quote.isVirtual()), isVisible: ko.observable(quote.isVirtual()),
paymentVisible: ko.observable(window.checkoutConfig.paymentVisible),
isLoading: paymentService.isLoading,
quoteIsVirtual: quote.isVirtual(), quoteIsVirtual: quote.isVirtual(),
isPaymentMethodsAvailable: ko.computed(function () { isPaymentMethodsAvailable: ko.computed(function () {
return paymentService.getAvailablePaymentMethods().length > 0; return paymentService.getAvailablePaymentMethods().length > 0;
......
app/code/Magento/Checkout/view/frontend/web/js/view/paypal.js 0 → 100644
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
define([
'jquery',
'uiComponent',
'mage/mage'
], function ($, Component) {
'use strict';
return Component.extend({
defaults: {
template: 'Magento_Checkout/paypal'
},
paypalCheckout: function(){
var returnUrl = $('input[data-action="checkout-form-submit"]').attr('data-checkout-url');
var y=(window.screen.availHeight-657);
var x=(window.screen.availWidth-535);
var mywindow = window.open(returnUrl, "_blank", "height=657,width=535,scrollbars=yes,resizable=1,modal=false,alwaysRaised=yes");
mywindow.moveTo(x/2,y/2);
}
});
});
app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
...@@ -73,7 +73,10 @@ define([ ...@@ -73,7 +73,10 @@ define([
isNewAddressAdded: ko.observable(false), isNewAddressAdded: ko.observable(false),
saveInAddressBook: 1, saveInAddressBook: 1,
quoteIsVirtual: quote.isVirtual(), quoteIsVirtual: quote.isVirtual(),
addressVisible: ko.observable(!quote.isVirtual() && window.checkoutConfig.addressVisible),
shippingVisible: ko.observable(window.checkoutConfig.shippingVisible),
paymentVisible: ko.observable(window.checkoutConfig.paymentVisible),
textVisible: ko.observable(false),
/** /**
* @return {exports} * @return {exports}
*/ */
...@@ -382,6 +385,9 @@ define([ ...@@ -382,6 +385,9 @@ define([
if (this.source.get('shippingAddress.custom_attributes')) { if (this.source.get('shippingAddress.custom_attributes')) {
this.source.trigger('shippingAddress.custom_attributes.data.validate'); this.source.trigger('shippingAddress.custom_attributes.data.validate');
} }
},
backToCart: function(){
$.mage.redirect(window.checkoutConfig.cartUrl);
} }
}); });
}); });
app/code/Magento/Checkout/view/frontend/web/js/view/summary/cart-items.js
...@@ -72,7 +72,7 @@ define([ ...@@ -72,7 +72,7 @@ define([
return priceUtils.formatPrice(price, quote.getPriceFormat()); return priceUtils.formatPrice(price, quote.getPriceFormat());
}, },
getGrandTotal:function(){ getGrandTotal:function(){
return this.getFormattedPrice(this.totals['subtotal']); return this.getFormattedPrice(this.totals['base_grand_total']);
}, },
/** /**
* Set items to observable field * Set items to observable field
...@@ -93,6 +93,9 @@ define([ ...@@ -93,6 +93,9 @@ define([
*/ */
isItemsBlockExpanded: function () { isItemsBlockExpanded: function () {
return quote.isVirtual() || stepNavigator.isProcessed('shipping'); return quote.isVirtual() || stepNavigator.isProcessed('shipping');
},
isMobile: function(){
return window.checkoutConfig.isMobile;
} }
}); });
}); });
app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js
...@@ -51,11 +51,10 @@ define([ ...@@ -51,11 +51,10 @@ define([
} }
if (typeof shippingMethod['method_title'] !== 'undefined') { if (typeof shippingMethod['method_title'] !== 'undefined') {
shippingMethodTitle = ' - ' + shippingMethod['method_title']; shippingMethodTitle = shippingMethod['method_title'];
} }
return shippingMethodTitle ? return shippingMethodTitle ? shippingMethodTitle :
shippingMethod['carrier_title'] + shippingMethodTitle :
shippingMethod['carrier_title']; shippingMethod['carrier_title'];
}, },
getShippingSaveMethodTitle: function () { getShippingSaveMethodTitle: function () {
......
app/code/Magento/Checkout/view/frontend/web/template/billing-address/list.html
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*/ */
--> -->
<div class="field field-select-billing"> <div class="field field-select-billing">
<label class="label"><span data-bind="i18n: 'Billing Address'"></span></label> <label class="label-title step-title"><span data-bind="i18n: 'Billing Address'"></span></label>
<div class="control" data-bind="if: (addressOptions.length > 1)"> <div class="control" data-bind="if: (addressOptions.length > 1)">
<select class="select" name="billing_address_id" data-bind=" <select class="select" name="billing_address_id" data-bind="
options: addressOptions, options: addressOptions,
......
app/code/Magento/Checkout/view/frontend/web/template/checkout-index-footer.html 0 → 100644
<div class="trade-checkout-whole-footer__baseline sl_section--small"></div>
<div class="copyright_block" data-testid="checkout-ntfht">
<div id="shopline-section-trade/policy_description" class="shopline-section"><div class="checkout-description-footer ">
<footer id="policy-description" class="checkout_policy_description" trade-btn-event-name="trade:showPolicyModal" data-testid="checkout-dtv5i">
<ul>
<li class="custom-link-color">
<a href="/return-exchange-policy" target="_blank">Refund Policy</a>
</li>
<li class="custom-link-color">
<a href="/shipping-policy" target="_blank">Shipping policy</a>
</li>
<li class="custom-link-color">
<a href="/security-privacy-policy" target="_blank">Privacy Policy</a>
</li>
<li class="custom-link-color">
<a href="/terms-of-use" target="_blank">Terms of service</a>
</li>
</ul>
</footer>
</div>
</div>
<div id="shopline-section-trade/copy_rights" class="shopline-section"><footer class="checkout_copy_right primary-text hide" role="contentinfo">
© 2023 ChicCurve. All Rights Reserved.
</footer></div>
</div>
\ No newline at end of file
app/code/Magento/Checkout/view/frontend/web/template/logo-nav.html 0 → 100644
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<header class="pc_logo">
<div id="joshine-section-header_logo" class="joshine-section">
<h1 class="logo_container logo_container_checkout header_logo--img align-center pc can_click" data-logo="logo" id="trade_logo" data-testid="checkout-zhn03">
<div class="logo_inner size-medium">
<a title="" href="/" data-testid="checkout-syuyl"><img data-bind="attr: {'src': getLogoSrc()}" alt="JOSHINE"></a>
</div>
</h1>
</div>
</header>
<!-- ko if: isMobile() -->
<!-- ko foreach: getRegion('logo-nav-sidebar') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<!--/ko-->
<header class="main__header" role="banner">
<div id="joshine-section-trade/checkout_breadcrumb" class="joshine-section"><div class="trade_checkout_breadcrumb trade_checkout_breadcrumb_checkout logo-align-center">
<button type="button" id="breadcrumb-return-to-cart"
data-step=""
trade-btn-event-name="trade:breadcrumb-return-to-cart"
class="trade_checkout_breadcrumb_button trade_checkout_step_done custom-link-color trade-checkout-btn"
data-bind="click: breadcrumbReturnToCart">
<div class="trade_checkout_steps_stepItem">
<span class="text">Cart</span>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.96967 12.0303C5.67678 11.7374 5.67678 11.2626 5.96967 10.9697L8.93934 8L5.96967 5.03033C5.67678 4.73744 5.67678 4.26256 5.96967 3.96967C6.26256 3.67678 6.73744 3.67678 7.03033 3.96967L10.5303 7.46967C10.8232 7.76256 10.8232 8.23744 10.5303 8.53033L7.03033 12.0303C6.73744 12.3232 6.26256 12.3232 5.96967 12.0303Z" fill="#959595"></path>
</svg>
</div>
</button>
<button type="button"
id="breadcrumb-fill-info"
data-step="contact_information"
trade-btn-event-name="trade:breadcrumb-fill-info"
class="trade_checkout_breadcrumb_button trade_checkout_step_doing primary-text trade-checkout-btn"
data-bind="css: { trade_checkout_step_waiting: !visible() }">
<div class="trade_checkout_steps_stepItem"><span class="text">Information</span>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.96967 12.0303C5.67678 11.7374 5.67678 11.2626 5.96967 10.9697L8.93934 8L5.96967 5.03033C5.67678 4.73744 5.67678 4.26256 5.96967 3.96967C6.26256 3.67678 6.73744 3.67678 7.03033 3.96967L10.5303 7.46967C10.8232 7.76256 10.8232 8.23744 10.5303 8.53033L7.03033 12.0303C6.73744 12.3232 6.26256 12.3232 5.96967 12.0303Z" fill="#959595"></path>
</svg>
</div>
</button>
<button type="button"
id="breadcrumb-logistics"
data-step="shipping_method"
trade-btn-event-name="trade:breadcrumb-logistics"
class="trade_checkout_breadcrumb_button shipping-btn primary-text trade-checkout-btn"
data-bind="css: { trade_checkout_step_waiting: !shippingVisible() }">
<div class="trade_checkout_steps_stepItem"><span class="text" data-text="Shipping">Shipping</span>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.96967 12.0303C5.67678 11.7374 5.67678 11.2626 5.96967 10.9697L8.93934 8L5.96967 5.03033C5.67678 4.73744 5.67678 4.26256 5.96967 3.96967C6.26256 3.67678 6.73744 3.67678 7.03033 3.96967L10.5303 7.46967C10.8232 7.76256 10.8232 8.23744 10.5303 8.53033L7.03033 12.0303C6.73744 12.3232 6.26256 12.3232 5.96967 12.0303Z" fill="#959595"></path>
</svg>
</div>
</button>
<button type="button"
id="breadcrumb-payment"
data-step="payment_method"
trade-btn-event-name="trade:breadcrumb-payment"
class="trade_checkout_breadcrumb_button primary-text trade-checkout-btn"
data-bind="css: { trade_checkout_step_waiting: !paymentVisible() }">
<div class="trade_checkout_steps_stepItem"><span class="text">Payment</span>
</div>
</button>
</div></div>
</header>
\ No newline at end of file
app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
...@@ -9,6 +9,16 @@ ...@@ -9,6 +9,16 @@
<div repeat="foreach: paymentGroupsList, item: '$group'" <div repeat="foreach: paymentGroupsList, item: '$group'"
class="payment-group"> class="payment-group">
<each args="data: getRegion($group().displayArea), as: 'method'" render=""></each> <each args="data: getRegion($group().displayArea), as: 'method'" render=""></each>
<div class="group-item-body payment__body KlarnaBNPL has_content payment__body--online" ><div>
<svg width="143" height="100" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M175 70V24C175 20.6863 172.314 18 169 18H15C11.6863 18 9 20.6863 9 24V116C9 119.314 11.6863 122 15 122H169C172.314 122 175 119.314 175 116V84.9259" stroke="currentColor" stroke-width="3"></path>
<path d="M9 36H175" stroke="currentColor" stroke-width="3"></path>
<circle cx="18" cy="27" r="3" fill="currentColor"></circle>
<circle cx="28" cy="27" r="3" fill="currentColor"></circle>
<circle cx="38" cy="27" r="3" fill="currentColor"></circle>
<path d="M146.5 77H197M197 77L189 69M197 77L189 85" stroke="currentColor" stroke-width="3"></path>
</svg>
<div>After clicking 'Complete Order', you will be redirected to the payment page to securely complete the payment.</div></div></div>
</div> </div>
</div> </div>
<div ifnot="isPaymentMethodsAvailable()" <div ifnot="isPaymentMethodsAvailable()"
......
app/code/Magento/Checkout/view/frontend/web/template/payment.html
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
--> -->
<li id="payment" role="presentation" class="checkout-payment-method"> <li id="payment" role="presentation" class="checkout-payment-method payment-three" data-bind="fadeVisible: paymentVisible(), blockLoader: isLoading" style="order:4;">
<div id="checkout-step-payment" <div id="checkout-step-payment"
class="step-content" class="step-content"
data-role="content" data-role="content"
role="tabpanel" role="tabpanel"
aria-hidden="false"> aria-hidden="false" >
<!-- ko if: (quoteIsVirtual) --> <!-- ko if: (quoteIsVirtual) -->
<!-- ko foreach: getRegion('customer-email') --> <!-- ko foreach: getRegion('customer-email') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
...@@ -18,15 +18,12 @@ ...@@ -18,15 +18,12 @@
<form id="co-payment-form" class="form payments" novalidate="novalidate"> <form id="co-payment-form" class="form payments" novalidate="novalidate">
<input data-bind='attr: {value: getFormKey()}' type="hidden" name="form_key"/> <input data-bind='attr: {value: getFormKey()}' type="hidden" name="form_key"/>
<fieldset class="fieldset"> <fieldset class="fieldset">
<p class="step-title no-border"> <p class="step-title no-border label-title">
<!-- ko ifnot: (quoteIsVirtual) --> <span translate="'Payment Method'"/>
<span class="number">
<span translate="'3'" />
</span>
<!--/ko-->
<span translate="'Payment Method'" />
</p> </p>
<h5 class="block-select-subtitle">
All transactions are secure and encrypted.
</h5>
<!-- ko foreach: getRegion('beforeMethods') --> <!-- ko foreach: getRegion('beforeMethods') -->
...@@ -42,7 +39,7 @@ ...@@ -42,7 +39,7 @@
</div> </div>
<!--/ko--> <!--/ko-->
<!-- ko ifnot: (quoteIsVirtual) --> <!-- ko ifnot: (quoteIsVirtual) -->
<div id="checkout-payment-method-load" class="opc-payment dispay-solid" data-bind="visible: isPaymentMethodsAvailable"> <div id="checkout-payment-method-load" class="opc-payment" data-bind="visible: isPaymentMethodsAvailable">
<!-- ko foreach: getRegion('payment-methods-list') --> <!-- ko foreach: getRegion('payment-methods-list') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko --> <!-- /ko -->
......
app/code/Magento/Checkout/view/frontend/web/template/paypal.html 0 → 100644
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<div id="trade-checkout-smartpay" class="address-one">
<div id="trade-paypal-express">
<h2 class="trade_checkout__exp__title">
Express Checkout
</h2>
<div data-label="or" class="paypal checkout after paypal-logo">
<div class="checkout-logo-medium" data-bind="click: paypalCheckout">
<input type="image" data-action="checkout-form-submit" data-checkout-url="/paypal/express/start/button/1/" src="http://local.joshine.com/static/frontend/Joshine/breeze/en_US/Magento_Paypal/images/paypal.png" alt="Checkout with PayPal" title="Checkout with PayPal">
<div class="checkout-txt" style="display:contents;"></div>
</div>
</div>
<div class="trade_checkout__exp__line">
<span class="lineLeft"></span>
<span class="lineText">
OR
</span>
<span class="lineRight"></span>
</div>
</div>
</div>
\ No newline at end of file
app/code/Magento/Checkout/view/frontend/web/template/sidebar.html
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
*/ */
--> -->
<div id="opc-sidebar"> <div id="opc-sidebar">
<!-- ko foreach: getRegion('estimation') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<!-- ko foreach: getRegion('summary') --> <!-- ko foreach: getRegion('summary') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
......
app/code/Magento/Checkout/view/frontend/web/template/summary.html
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
*/ */
--> -->
<div class="opc-block-summary" data-bind="blockLoader: isLoading"> <div class="opc-block-summary" data-bind="blockLoader: isLoading">
<span data-bind="i18n: 'Order Summary'" class="title"></span>
<!-- ko foreach: elems() --> <!-- ko foreach: elems() -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko --> <!-- /ko -->
......
app/code/Magento/Paypal/view/frontend/web/js/paypal-checkout.js
...@@ -91,7 +91,11 @@ define([ ...@@ -91,7 +91,11 @@ define([
$form.trigger('submit'); $form.trigger('submit');
} else { } else {
$.mage.redirect(returnUrl); var y=(window.screen.availHeight-657);
var x=(window.screen.availWidth-535);
var mywindow = window.open(returnUrl, "_blank", "height=657,width=535,scrollbars=yes,resizable=1,modal=false,alwaysRaised=yes");
mywindow.moveTo(x/2,y/2);
//$.mage.redirect(returnUrl);
} }
} }
}); });
......
app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml
...@@ -13,29 +13,29 @@ ...@@ -13,29 +13,29 @@
<item name="components" xsi:type="array"> <item name="components" xsi:type="array">
<item name="checkout" xsi:type="array"> <item name="checkout" xsi:type="array">
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
<!--<item name="steps" xsi:type="array"> <item name="logo-nav" xsi:type="array">
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
<item name="billing-step" xsi:type="array"> <item name="logo-nav-sidebar" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item>
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
<item name="payment" xsi:type="array"> <item name="summary" xsi:type="array">
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
<item name="afterMethods" xsi:type="array">
<item name="discount" xsi:type="array">
<item name="component" xsi:type="string">Magento_SalesRule/js/view/payment/discount</item>
<item name="children" xsi:type="array">
<item name="errors" xsi:type="array">
<item name="sortOrder" xsi:type="string">4</item>
<item name="component" xsi:type="string">Magento_SalesRule/js/view/payment/discount-messages</item>
<item name="displayArea" xsi:type="string">messages</item>
</item>
</item>
</item>
<item name="totals" xsi:type="array">
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
<item name="discount" xsi:type="array"> <item name="discount" xsi:type="array">
<item name="component" xsi:type="string">Magento_SalesRule/js/view/payment/discount</item> <item name="component" xsi:type="string">Magento_SalesRule/js/view/summary/discount</item>
<item name="children" xsi:type="array"> <item name="config" xsi:type="array">
<item name="errors" xsi:type="array"> <item name="title" xsi:type="string" translate="true">Discount</item>
<item name="sortOrder" xsi:type="string">0</item>
<item name="component" xsi:type="string">Magento_SalesRule/js/view/payment/discount-messages</item>
<item name="displayArea" xsi:type="string">messages</item>
</item>
<item name="captcha" xsi:type="array">
<item name="component" xsi:type="string">Magento_SalesRule/js/view/payment/captcha</item>
<item name="displayArea" xsi:type="string">captcha</item>
<item name="formId" xsi:type="string">sales_rule_coupon_request</item>
<item name="configSource" xsi:type="string">checkoutConfig</item>
</item>
</item> </item>
</item> </item>
</item> </item>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</item> </item>
</item> </item>
</item> </item>
</item>--> </item>
<item name="sidebar" xsi:type="array"> <item name="sidebar" xsi:type="array">
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
<item name="summary" xsi:type="array"> <item name="summary" xsi:type="array">
......
app/code/Magento/Theme/view/base/templates/root.phtml
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<?= /* @noEscape */ $headAdditional ?> <?= /* @noEscape */ $headAdditional ?>
</head> </head>
<body data-container="body" <body data-container="body"
data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?= /* @noEscape */ $loaderIcon ?>"}}'
<?= /* @noEscape */ $bodyAttributes ?>> <?= /* @noEscape */ $bodyAttributes ?>>
<?= /* @noEscape */ $layoutContent ?> <?= /* @noEscape */ $layoutContent ?>
</body> </body>
......
app/code/Magento/Theme/view/frontend/requirejs-config.js
...@@ -16,14 +16,12 @@ var config = { ...@@ -16,14 +16,12 @@ var config = {
'dropdownDialog': 'mage/dropdown', 'dropdownDialog': 'mage/dropdown',
'dropdown': 'mage/dropdowns', 'dropdown': 'mage/dropdowns',
'accordion': 'mage/accordion', 'accordion': 'mage/accordion',
'loader': 'mage/loader',
'tooltip': 'mage/tooltip', 'tooltip': 'mage/tooltip',
'deletableItem': 'mage/deletable-item', 'deletableItem': 'mage/deletable-item',
'itemTable': 'mage/item-table', 'itemTable': 'mage/item-table',
'fieldsetControls': 'mage/fieldset-controls', 'fieldsetControls': 'mage/fieldset-controls',
'fieldsetResetControl': 'mage/fieldset-controls', 'fieldsetResetControl': 'mage/fieldset-controls',
'redirectUrl': 'mage/redirect-url', 'redirectUrl': 'mage/redirect-url',
'loaderAjax': 'mage/loader',
'menu': 'mage/menu', 'menu': 'mage/menu',
'popupWindow': 'mage/popup-window', 'popupWindow': 'mage/popup-window',
'validation': 'mage/validation/validation', 'validation': 'mage/validation/validation',
......
app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
...@@ -491,5 +491,13 @@ define([ ...@@ -491,5 +491,13 @@ define([
isCheckoutIndex: function () { isCheckoutIndex: function () {
return $('body').hasClass('checkout-index-index'); return $('body').hasClass('checkout-index-index');
} }
,
isSelectIndex: function () {
if(this.elementTmpl.indexOf("select") != -1)
{
return true;
}
return false;
}
}); });
}); });
app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
...@@ -343,6 +343,13 @@ define([ ...@@ -343,6 +343,13 @@ define([
}); });
return _.flatten(result); return _.flatten(result);
},
isMobile: function(){
if(/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
return true;
} else {
return false;
}
} }
}); });
}); });
app/code/Magento/Ui/view/frontend/web/templates/form/element/select.html
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
--> -->
<!-- ko ifnot: isCheckoutIndex() -->
<select class="select" data-bind=" <select class="select" data-bind="
attr: { attr: {
name: inputName, name: inputName,
...@@ -26,32 +25,4 @@ ...@@ -26,32 +25,4 @@
ko.applyBindingsToNode(option, {attr: {disabled: true}}, item); ko.applyBindingsToNode(option, {attr: {disabled: true}}, item);
} }
}" }"
></select> ></select>
<!-- /ko --> \ No newline at end of file
<!-- ko if: isCheckoutIndex() -->
<input class="input-text select-input" type="text" data-bind="value: getPreview(),attr: {
'aria-required': required
}" required readonly="readonly"/>
<select class="select check-select" data-bind="
attr: {
name: inputName,
id: uid,
disabled: disabled,
'aria-describedby': getDescriptionId(),
'aria-required': required,
'aria-invalid': error() ? true : 'false',
placeholder: placeholder
},
hasFocus: focused,
optgroup: options,
value: value,
optionsCaption: caption,
optionsValue: 'value',
optionsText: 'label',
optionsAfterRender: function(option, item) {
if (item && item.disabled) {
ko.applyBindingsToNode(option, {attr: {disabled: true}}, item);
}
}"></select>
<!-- /ko -->
\ No newline at end of file
app/code/Magento/Ui/view/frontend/web/templates/form/field.html
...@@ -13,43 +13,43 @@ ...@@ -13,43 +13,43 @@
<div class="control" data-bind="css: {'_with-tooltip': element.tooltip}"> <div class="control" data-bind="css: {'_with-tooltip': element.tooltip}">
<!-- ko ifnot: element.hasAddons() --> <!-- ko ifnot: element.hasAddons() -->
<!-- ko template: element.elementTmpl --><!-- /ko --> <!-- ko template: element.elementTmpl --><!-- /ko -->
<!-- /ko --> <!-- /ko -->
<!-- ko if: element.hasAddons() --> <!-- ko if: element.hasAddons() -->
<div class="control-addon"> <div class="control-addon">
<!-- ko template: element.elementTmpl --><!-- /ko --> <!-- ko template: element.elementTmpl --><!-- /ko -->
<!-- ko if: element.addbefore --> <!-- ko if: element.addbefore -->
<label class="addon-prefix" data-bind="attr: { for: element.uid }"><span data-bind="text: element.addbefore"></span></label> <label class="addon-prefix" data-bind="attr: { for: element.uid }"><span data-bind="text: element.addbefore"></span></label>
<!-- /ko --> <!-- /ko -->
<!-- ko if: element.addafter --> <!-- ko if: element.addafter -->
<label class="addon-suffix" data-bind="attr: { for: element.uid }"><span data-bind="text: element.addafter"></span></label> <label class="addon-suffix" data-bind="attr: { for: element.uid }"><span data-bind="text: element.addafter"></span></label>
<!-- /ko --> <!-- /ko -->
</div> </div>
<!-- /ko --> <!-- /ko -->
<!-- ko if: element.tooltip --> <!-- ko if: element.tooltip -->
<!-- ko template: element.tooltipTpl --><!-- /ko --> <!-- ko template: element.tooltipTpl --><!-- /ko -->
<!-- /ko --> <!-- /ko -->
<!-- ko if: element.notice --> <!-- ko if: element.notice -->
<div class="field-note" data-bind="attr: { id: element.noticeId }"> <div class="field-note" data-bind="attr: { id: element.noticeId }">
<span data-bind="text: element.notice"></span> <span data-bind="text: element.notice"></span>
</div> </div>
<!-- /ko --> <!-- /ko -->
<!-- ko if: element.error() --> <!-- ko if: element.error() -->
<div class="field-error" data-bind="attr: { id: element.errorId }" generated="true"> <div class="field-error" data-bind="attr: { id: element.errorId }" generated="true">
<span data-bind="text: element.error"></span> <span data-bind="text: element.error"></span>
</div> </div>
<!-- /ko --> <!-- /ko -->
<!-- ko if: element.warn() --> <!-- ko if: element.warn() -->
<div role="alert" class="message warning" data-bind="attr: { id: element.warningId }" generated="true"> <div role="alert" class="message warning" data-bind="attr: { id: element.warningId }" generated="true">
<span data-bind="text: element.warn"></span> <span data-bind="text: element.warn"></span>
</div> </div>
<!-- /ko --> <!-- /ko -->
</div> </div>
</div> </div>
...@@ -57,10 +57,16 @@ ...@@ -57,10 +57,16 @@
<!-- ko if: isCheckoutIndex() --> <!-- ko if: isCheckoutIndex() -->
<div class="field" data-bind="visible: visible, attr: {'name': element.dataScope}, css: additionalClasses"> <div class="field" data-bind="visible: visible, attr: {'name': element.dataScope}, css: additionalClasses">
<!-- ko if: isSelectIndex() -->
<label class="label" data-bind="attr: { for: element.uid },css: {'fouse-label':true}">
<!-- ko if: element.label --><span translate="element.label"></span><!-- /ko -->
</label>
<!-- /ko -->
<!-- ko ifnot: isSelectIndex() -->
<label class="label" data-bind="attr: { for: element.uid },css: {'fouse-label': element.value}"> <label class="label" data-bind="attr: { for: element.uid },css: {'fouse-label': element.value}">
<!-- ko if: element.label --><span translate="element.label"></span><!-- /ko --> <!-- ko if: element.label --><span translate="element.label"></span><!-- /ko -->
</label> </label>
<!-- /ko -->
<div class="control" data-bind="css: {'_with-tooltip': element.tooltip}"> <div class="control" data-bind="css: {'_with-tooltip': element.tooltip}">
<!-- ko ifnot: element.hasAddons() --> <!-- ko ifnot: element.hasAddons() -->
<!-- ko template: element.elementTmpl --><!-- /ko --> <!-- ko template: element.elementTmpl --><!-- /ko -->
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/shipping.html
...@@ -7,10 +7,12 @@ ...@@ -7,10 +7,12 @@
<li id="shipping" class="checkout-shipping-address" data-bind="fadeVisible: visible()"> <li id="shipping" class="checkout-shipping-address" data-bind="fadeVisible: visible()">
<!--<div class="step-title" translate="'Shipping Address'" data-role="title" />--> <!--<div class="step-title" translate="'Shipping Address'" data-role="title" />-->
<p class="step-title"> <p class="step-title">
<!--
<span class="number"> <span class="number">
<span translate="'1'" /> <span translate="'1'" />
</span> </span>
<span translate="'Delivery Details'" /> -->
<span translate="'Shipping address'" />
</p> </p>
<div id="checkout-step-shipping" <div id="checkout-step-shipping"
class="step-content" class="step-content"
......
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/authentication.html
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
} }
</style> </style>
<div class="authentication-wrapper" data-block="authentication" data-bind="visible: isActive()"> <div class="authentication-wrapper" data-block="authentication" data-bind="visible: isActive()">
<span class="login-q-reg" data-bind="i18n: 'Already Registered?'"></span> <span class="login-q-reg" data-bind="i18n: 'Already have an account?'"></span>
<button <button
type="button" type="button"
class="action action-auth-toggle" class="action action-auth-toggle"
data-trigger="authentication"> data-trigger="authentication">
<span data-bind="i18n: 'Sign In'"></span> <span data-bind="i18n: 'Log In'"></span>
</button> </button>
<div class="block-authentication" <div class="block-authentication"
style="display: none" style="display: none"
......
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/form/element/email.html
...@@ -9,62 +9,73 @@ ...@@ -9,62 +9,73 @@
<!-- ko foreach: getRegion('before-login-form') --> <!-- ko foreach: getRegion('before-login-form') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko --> <!-- /ko -->
<form class="form form-login" data-role="email-with-possible-login" <div class="email-box address-one" data-bind="fadeVisible:visible">
data-bind="submit:login" <div class="label-title">
method="post"> <span data-bind="i18n: 'Contact information'" class="contact-title"></span>
<fieldset id="customer-email-fieldset" class="fieldset" data-bind="blockLoader: isLoading"> <!-- ko foreach: getRegion('authentication') -->
<div class="field required"> <!-- ko template: getTemplate() --><!-- /ko -->
<label class="label" for="customer-email" data-bind="css:{'fouse-label': email}"> <!--/ko-->
<span data-bind="i18n: 'Email Address'"></span>
<!-- ko template: 'ui/form/element/helper/tooltip' --><!-- /ko -->
</label>
<div class="control _with-tooltip">
<input class="input-text"
type="email"
data-bind="
textInput: email,
hasFocus: emailFocused,
afterRender: emailHasChanged,
mageInit: {'mage/trim-input':{}},
css:{'virtual-email': quoteIsVirtual}"
name="username"
data-validate="{required:true, 'validate-email':true}"
id="customer-email" />
<span class="note" data-bind="fadeVisible: isPasswordVisible() == false"><!-- ko i18n: 'You can create an account after checkout.'--><!-- /ko --></span> </div>
</div> <form class="form form-login" data-role="email-with-possible-login"
</div> data-bind="submit:login"
method="post">
<fieldset id="customer-email-fieldset" class="fieldset" data-bind="blockLoader: isLoading">
<div class="field required">
<label class="label" for="customer-email" data-bind="css:{'fouse-label': email}">
<span data-bind="i18n: 'Email Address'"></span>
</label>
<!--Hidden fields --> <div class="control _with-tooltip">
<fieldset class="fieldset hidden-fields" data-bind="fadeVisible: isPasswordVisible">
<div class="field">
<label class="label" for="customer-password"><span data-bind="i18n: 'Password'"></span></label>
<div class="control">
<input class="input-text" <input class="input-text"
type="password" type="email"
name="password" data-bind="
id="customer-password" textInput: email,
data-validate="{required:true}" autocomplete="off"/> hasFocus: emailFocused,
<span class="note" data-bind="i18n: 'You already have an account with us. Sign in or continue as guest.'"></span> afterRender: emailHasChanged,
</div> mageInit: {'mage/trim-input':{}},
css:{'virtual-email': quoteIsVirtual}"
name="username"
data-validate="{required:true, 'validate-email':true}"
id="customer-emails" />
</div>
<span class="note email-note" data-bind="fadeVisible: isPasswordVisible() == false"><!-- ko i18n: 'You can create an account after checkout.'--><!-- /ko --></span>
</div> </div>
<!-- ko foreach: getRegion('additional-login-form-fields') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!--Hidden fields -->
<!-- /ko --> <fieldset class="fieldset hidden-fields" data-bind="fadeVisible: isPasswordVisible">
<div class="actions-toolbar"> <div class="field">
<input name="context" type="hidden" value="checkout" /> <label class="label" for="customer-password"><span data-bind="i18n: 'Password'"></span></label>
<div class="primary"> <div class="control">
<button type="submit" class="action login primary" data-action="checkout-method-login"><span data-bind="i18n: 'Login'"></span></button> <input class="input-text"
type="password"
name="password"
id="customer-password"
data-validate="{required:true}" autocomplete="off"/>
<span class="note" data-bind="i18n: 'You already have an account with us. Sign in or continue as guest.'"></span>
</div>
</div> </div>
<div class="secondary"> <!-- ko foreach: getRegion('additional-login-form-fields') -->
<a class="action remind" data-bind="attr: { href: forgotPasswordUrl }"> <!-- ko template: getTemplate() --><!-- /ko -->
<span data-bind="i18n: 'Forgot Your Password?'"></span> <!-- /ko -->
</a> <div class="actions-toolbar">
<input name="context" type="hidden" value="checkout" />
<div class="primary">
<button type="submit" class="action login primary" data-action="checkout-method-login"><span data-bind="i18n: 'Login'"></span></button>
</div>
<div class="secondary">
<a class="action remind" data-bind="attr: { href: forgotPasswordUrl }">
<span data-bind="i18n: 'Forgot Your Password?'"></span>
</a>
</div>
</div> </div>
</div> </fieldset>
<!--Hidden fields -->
</fieldset> </fieldset>
<!--Hidden fields --> </form>
</fieldset> </div>
</form>
<!-- /ko --> <!-- /ko -->
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/onepage.html
...@@ -4,46 +4,50 @@ ...@@ -4,46 +4,50 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
--> -->
<div class="right-fill"></div>
<div class="content content_wrapper">
<div class="trade_wrapper">
<div class="payment-left">
<!-- ko foreach: getRegion('progressBar') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<div class="payment-left"> <!-- ko foreach: getRegion('logo-nav') -->
<!-- ko foreach: getRegion('progressBar') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<!-- ko foreach: getRegion('authentication') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<!-- ko foreach: getRegion('estimation') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<!-- ko foreach: getRegion('messages') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<div class="opc-wrapper">
<ol class="opc" id="checkoutSteps">
<!-- ko foreach: getRegion('steps') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko--> <!--/ko-->
</ol>
</div> <!-- ko foreach: getRegion('paypal') -->
</div> <!-- ko template: getTemplate() --><!-- /ko -->
<div class="payment-right"> <!--/ko-->
<div class="slip-div">
<!-- ko foreach: getRegion('sidebar') --> <!-- ko foreach: getRegion('customer-email') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko--> <!--/ko-->
<!-- ko foreach: getRegion('placeOrder') --> <!-- ko foreach: getRegion('messages') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko--> <!--/ko-->
<div class="opc-wrapper">
<!-- ko foreach: getRegion('security') --> <ol class="opc" id="checkoutSteps">
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko foreach: getRegion('steps') -->
<!--/ko--> <!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
</ol>
</div>
<!-- ko foreach: getRegion('checkout-footer') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
</div>
<div class="payment-right">
<!-- ko ifnot: isMobile() -->
<!-- ko foreach: getRegion('sidebar') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<!--/ko-->
</div>
</div> </div>
</div> </div>
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/shipping.html
...@@ -13,16 +13,18 @@ ...@@ -13,16 +13,18 @@
vertical-align: revert; vertical-align: revert;
} }
</style> </style>
<li id="shipping" class="checkout-shipping-address" data-bind="fadeVisible: visible()"> <li id="shipping" class="checkout-shipping-address address-one" data-bind="fadeVisible: addressVisible" style="order:1;">
<!--<div class="step-title" translate="'Shipping Address'" data-role="title" />--> <!--<div class="step-title" translate="'Shipping Address'" data-role="title" />-->
<p class="step-title"> <p class="step-title">
<!--
<span class="number"> <span class="number">
<span translate="'1'" /> <span translate="'1'" />
</span> </span>
<span translate="'Delivery Details'" /> -->
<span translate="'Shipping address'" />
</p> </p>
<div id="checkout-step-shipping" <div id="checkout-step-shipping"
class="step-content" class="step-content address-one"
data-role="content" style="margin-bottom: 1rem;"> data-role="content" style="margin-bottom: 1rem;">
<each if="!quoteIsVirtual" args="getRegion('customer-email')" render="" /> <each if="!quoteIsVirtual" args="getRegion('customer-email')" render="" />
...@@ -51,52 +53,82 @@ ...@@ -51,52 +53,82 @@
</div> </div>
<div id="shipping-text">
<div class="confirmed-address"> </li>
<div class="main-address shipping-address"> <li style="order:2;" data-bind="fadeVisible: !addressVisible" class="payment-content">
<div class="trade_info-preview form-primary-text trade_info-preact-dom sl_section--normal show-text">
<div id="email-text" data-bind="fadeVisible: shippingVisible" class="checkout-top-page">
<div class="trade_info-preview-item mian-text-line">
<div class="trade_info-preview-item_content">
<span class="left-title left-email trade_info-preview-item_label">
<!-- ko i18n: 'Contact'--><!-- /ko -->
</span>
<div class="main-text main-email trade_info-preview-item_text">
</div>
</div>
<button class="right-handle right-email trade_info-preview-item_button custom-link-color">
<span data-bind="i18n: 'Modify'"></span>
</button>
</div> </div>
</div> </div>
</div> <div id="shipping-text" data-bind="fadeVisible: shippingVisible" class="checkout-top-page">
<div class="billing-address-form"> <div class="trade_info-preview-item">
<each args="getRegion('after-shipping-method-form')" render="" /> <div class="trade_info-preview-item_content">
</div> <span class="left-title left-address trade_info-preview-item_label">
<div id="next-shipping"> <!-- ko i18n: 'Ship to'--><!-- /ko -->
<span><!-- ko i18n: 'Save & Continue'--><!-- /ko --></span> </span>
</div> <div class="main-text main-address shipping-address trade_info-preview-item_text">
<div id="edit-shipping" style="display:none;"> </div>
<a href="javascript:;" id="editLink" style="color:#000;"> </div>
<span><!-- ko i18n: 'Edit'--><!-- /ko --></span> <button class="right-handle right-address trade_info-preview-item_button custom-link-color">
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24"> <span data-bind="i18n: 'Modify'"></span>
<path d="M19.769 9.923l-12.642 12.639-7.127 1.438 1.438-7.128 12.641-12.64 5.69 5.691zm1.414-1.414l2.817-2.82-5.691-5.689-2.816 2.817 5.69 5.692z"></path> </button>
</svg> </div>
</a>
</div>
</li> </div>
<div id="method-text" data-bind="fadeVisible: paymentVisible" class="checkout-top-page payment-three">
<div class="trade_info-preview-item">
<div class="trade_info-preview-item_content">
<span class="left-title left-method trade_info-preview-item_label">
<!-- ko i18n: 'Method'--><!-- /ko -->
</span>
<div class="main-text main-method trade_info-preview-item_text">
</div>
</div>
<button class="right-handle right-method trade_info-preview-item_button custom-link-color">
<span data-bind="i18n: 'Modify'"></span>
</button>
</div>
</div>
</div>
</li>
<!--Shipping method template--> <!--Shipping method template-->
<li id="opc-shipping_method" <li id="opc-shipping_method"
class="checkout-shipping-method" class="checkout-shipping-method shipping-two"
data-bind="fadeVisible: visible(), blockLoader: isLoading" data-bind="fadeVisible: shippingVisible, blockLoader: isLoading"
role="presentation"> role="presentation" style="order:3;">
<div class="checkout-shipping-method"> <div class="checkout-shipping-method">
<!--<div class="step-title" <!--<div class="step-title"
translate="'Shipping Methods'" translate="'Shipping Methods'"
data-role="title" />--> data-role="title" />-->
<p class="step-title no-border"> <p class="step-title no-border">
<span class="number"> <!--
<span translate="'2'" /> <span class="number">
</span> <span translate="'2'" />
</span>
-->
<span translate="'Shipping Methods'" /> <span translate="'Shipping Methods'" />
</p> </p>
<each args="getRegion('before-shipping-method-form')" render="" /> <each args="getRegion('before-shipping-method-form')" render="" />
<div id="checkout-step-shipping_method" <div id="checkout-step-shipping_method"
class="step-content" class="step-content shipping-two"
data-role="content" data-role="content"
role="tabpanel" role="tabpanel"
aria-hidden="false"> aria-hidden="shippingVisible()">
<form id="co-shipping-method-form" <form id="co-shipping-method-form"
class="form methods-shipping" class="form methods-shipping"
if="rates().length" if="rates().length"
...@@ -127,3 +159,38 @@ ...@@ -127,3 +159,38 @@
</div> </div>
</div> </div>
</li> </li>
<li class="billing-address-li payment-three" data-bind="fadeVisible: paymentVisible" style="order:5;">
<div class="billing-address-form">
<each args="getRegion('after-shipping-method-form')" render="" />
</div>
</li>
<li class="handle-line" style="order:6;">
<div id="next-shipping">
<button class="handle-btn custom-link-color">
<span>
<span class="svg-left" >
<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.003 8.483L4.52 5.436l-.988 1.128 4.465 3.907 4.512-3.904-.982-1.134-3.524 3.05z" fill="currentColor"></path>
</svg>
</span>
<span data-bind="click: backToCart,fadeVisible: addressVisible" class="address-one">
<!-- ko i18n: 'Return to cart'--><!-- /ko -->
</span>
<span data-bind="fadeVisible: shippingVisible" class="shipping-two back-to-information">
<!-- ko i18n: 'Return to Information'--><!-- /ko -->
</span>
<span data-bind="fadeVisible: paymentVisible" class="payment-three back-to-shipping">
<!-- ko i18n: 'Return to Shipping'--><!-- /ko -->
</span>
</span>
</button>
<span class="save-continue continue-shipping address-one" data-bind="fadeVisible: addressVisible"><!-- ko i18n: 'Continue to Shipping'--><!-- /ko --></span>
<span class="save-continue continue-payment shipping-two" data-bind="fadeVisible: shippingVisible"><!-- ko i18n: 'Continue to Payment'--><!-- /ko --></span>
<span class="save-continue complete-order payment-three " data-bind="fadeVisible: paymentVisible"><!-- ko i18n: 'Complete Order'--><!-- /ko --></span>
</div>
</li>
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/summary/cart-items.html
...@@ -4,14 +4,24 @@ ...@@ -4,14 +4,24 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
--> -->
<div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'closeOnOuter':false,'openedState': 'false', 'active': false}}"> <div class="block items-in-cart bottom-border" data-bind="mageInit: {'collapsible':{'closeOnOuter':false,'openedState': 'false', 'active': !isMobile()}}">
<!-- ko if: isMobile() -->
<div class="title" data-role="title"> <div class="title" data-role="title">
<strong role="heading" aria-level="1"> <strong role="heading" aria-level="1" class="mobile-control">
<span class="estimated-label" data-bind="i18n: 'Order Summary'"></span> <span class="cart-icon" style="display: inline-block;color:#276EAF;margin-right: 12px;">
<svg width="21" height="21" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.0001 13C14.5524 13 15.0001 12.5523 15.0001 12C15.0001 11.4477 14.5524 11 14.0001 11H8.00015C7.44786 11 7.00015 11.4477 7.00015 12C7.00015 12.5523 7.44786 13 8.00015 13H14.0001Z" fill="currentColor"></path>
<path fill-rule="evenodd" clip-rule="evenodd" d="M1.50504 11.0996L1.50644 11.1128L2.00512 16.0995C2.05624 16.6107 2.4864 17 3.00015 17H19.0002C19.5139 17 19.9441 16.6107 19.9952 16.0995L20.9952 6.0995C21.0233 5.81838 20.9312 5.53848 20.7416 5.329C20.552 5.11951 20.2827 5 20.0002 5H2.90505L2.49511 0.900571C2.44016 0.351027 1.95011 -0.0499167 1.40057 0.00503759C0.851027 0.0599919 0.450083 0.550035 0.505038 1.09958L1.50504 11.0996ZM3.10514 7L3.90514 15H18.0952L18.8952 7H3.10514Z" fill="currentColor"></path>
<path d="M8.00015 19.5C8.00015 20.3284 7.32858 21 6.50015 21C5.67172 21 5.00015 20.3284 5.00015 19.5C5.00015 18.6716 5.67172 18 6.50015 18C7.32858 18 8.00015 18.6716 8.00015 19.5Z" fill="currentColor"></path>
<path d="M15.5001 21C16.3286 21 17.0001 20.3284 17.0001 19.5C17.0001 18.6716 16.3286 18 15.5001 18C14.6717 18 14.0001 18.6716 14.0001 19.5C14.0001 20.3284 14.6717 21 15.5001 21Z" fill="currentColor"></path>
</svg>
</span>
<span class="estimated-label" data-bind="i18n: 'Order summary'"></span>
<span class="estimated-price" data-bind="text: getGrandTotal()"></span> <span class="estimated-price" data-bind="text: getGrandTotal()"></span>
</strong> </strong>
</div> </div>
<div class="content minicart-items" data-role="content"> <!-- /ko -->
<div class="content minicart-items" data-role="content" aria-hidden="false">
<div class="minicart-items-wrapper"> <div class="minicart-items-wrapper">
<ol class="minicart-items"> <ol class="minicart-items">
<each args="items()"> <each args="items()">
......
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/summary/item/details.html
...@@ -6,41 +6,36 @@ ...@@ -6,41 +6,36 @@
--> -->
<!-- ko foreach: getRegion('before_details') --> <!-- ko foreach: getRegion('before_details') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko --> <!-- /ko -->
<div class="product-item-details"> <div class="product-item-details">
<div class="product-item-inner"> <div class="product-item-inner">
<div class="product-item-name-block"> <div class="product-item-name-block">
<strong class="product-item-name" data-bind="html: getNameUnsanitizedHtml($parent)"></strong> <strong class="product-item-name" data-bind="html: getNameUnsanitizedHtml($parent)"></strong>
<div class="details-qty">
<span class="label"><!-- ko i18n: 'Qty' --><!-- /ko --></span>
<span class="value" data-bind="text: $parent.qty"></span>
</div>
</div> </div>
<!-- ko foreach: getRegion('after_details') --> <!-- ko foreach: getRegion('after_details') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko --> <!-- /ko -->
</div> </div>
<!-- ko if: (JSON.parse($parent.options).length > 0)--> <!-- ko if: (JSON.parse($parent.options).length > 0)-->
<div class="product options" data-bind="mageInit: {'collapsible':{'openedState': 'active'}}"> <div class="product options active">
<span data-role="title" class="toggle"><!-- ko i18n: 'View Details' --><!-- /ko --></span>
<div data-role="content" class="content"> <div data-role="content" class="content">
<strong class="subtitle"><!-- ko i18n: 'Options Details' --><!-- /ko --></strong> <strong class="subtitle"><!-- ko i18n: 'Options Details' --><!-- /ko --></strong>
<dl class="item-options"> <dl class="item-options">
<!--ko foreach: JSON.parse($parent.options)--> <!--ko foreach: JSON.parse($parent.options)-->
<dt class="label" data-bind="text: label"></dt> <dt class="label" data-bind="text: label"></dt>
<!-- ko if: ($data.full_view)--> <!-- ko if: ($data.full_view)-->
<!-- ko with: {full_viewUnsanitizedHtml: $data.full_view}--> <!-- ko with: {full_viewUnsanitizedHtml: $data.full_view}-->
<dd class="values" data-bind="html: full_viewUnsanitizedHtml"></dd> <dd class="values" data-bind="html: full_viewUnsanitizedHtml"></dd>
<!-- /ko --> <!-- /ko -->
<!-- /ko --> <!-- /ko -->
<!-- ko ifnot: ($data.full_view)--> <!-- ko ifnot: ($data.full_view)-->
<!-- ko with: {valueUnsanitizedHtml: $data.value}--> <!-- ko with: {valueUnsanitizedHtml: $data.value}-->
<dd class="values" data-bind="html: valueUnsanitizedHtml"></dd> <dd class="values" data-bind="html: valueUnsanitizedHtml"></dd>
<!-- /ko --> <!-- /ko -->
<!-- /ko --> <!-- /ko -->
<!-- /ko --> <!-- /ko -->
</dl> </dl>
</div> </div>
...@@ -48,5 +43,5 @@ ...@@ -48,5 +43,5 @@
<!-- /ko --> <!-- /ko -->
</div> </div>
<!-- ko foreach: getRegion('item_message') --> <!-- ko foreach: getRegion('item_message') -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko --> <!-- /ko -->
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/summary/item/details/thumbnail.html
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
<span class="product-image-container" <span class="product-image-container"
data-bind="attr: {'style': 'height: ' + getHeight($parents[1])/2 + 'px; width: ' + getWidth($parents[1])/2 + 'px;' }"> data-bind="attr: {'style': 'height: ' + getHeight($parents[1])/2 + 'px; width: ' + getWidth($parents[1])/2 + 'px;' }">
<span class="product-image-wrapper"> <span class="product-image-wrapper">
<img <img data-bind="attr: {'src': getSrc($parents[1]), 'width': getWidth($parents[1]), 'height': getHeight($parents[1]), 'alt': getAlt($parents[1]), 'title': getAlt($parents[1]) }"/>
data-bind="attr: {'src': getSrc($parents[1]), 'width': getWidth($parents[1]), 'height': getHeight($parents[1]), 'alt': getAlt($parents[1]), 'title': getAlt($parents[1]) }"/>
</span> </span>
<div class="details-qty">
<span class="value" data-bind="text: $parents[1].qty"></span>
</div>
</span> </span>
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/summary/subtotal.html
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
*/ */
--> -->
<tr class="totals"> <tr class="totals subtotal">
<th class="mark" scope="row" data-bind="text: title"></th> <th class="mark" scope="row" data-bind="text: title"></th>
<td class="amount"> <td class="amount">
<span class="price" data-bind ="text: getValue(), attr:{'data-label': title}"></span> <span class="price" data-bind ="text: getValue(), attr:{'data-label': title}"></span>
<!-- ko foreach: elems() --> <!-- ko foreach: elems() -->
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko --> <!-- /ko -->
</td> </td>
</tr> </tr>
lib/web/jquery/jquery.validate.js
...@@ -697,11 +697,7 @@ ...@@ -697,11 +697,7 @@
showLabel: function (element, message) { showLabel: function (element, message) {
if($('body').hasClass('checkout-index-index')) if($('body').hasClass('checkout-index-index'))
{ {
if($(element).is('select')){ $(element).parent().addClass('error-border-style');
$(element).prev('input').addClass('error-border-style');
}else if($(element).is('input')){
$(element).addClass('error-border-style');
}
this.toShow = this.toShow.add(''); this.toShow = this.toShow.add('');
} }
else { else {
......
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