Skip to content

J
joshine
Commit c71283cc by liumengfei
Options

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

parents 1447523a aa151b37
Showing with 368 additions and 8 deletions
app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
--> -->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="checkout" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="checkout" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body> <body>
<referenceBlock name="page.bottom.container" remove="true"/>
<referenceContainer name="content"> <referenceContainer name="content">
<block class="Magento\Checkout\Block\Onepage" name="checkout.root" template="Magento_Checkout::onepage.phtml" cacheable="false"> <block class="Magento\Checkout\Block\Onepage" name="checkout.root" template="Magento_Checkout::onepage.phtml" cacheable="false">
<arguments> <arguments>
...@@ -210,7 +209,6 @@ ...@@ -210,7 +209,6 @@
</item> </item>
</item> </item>
<item name="company" xsi:type="array"> <item name="company" xsi:type="array">
<item name="visible" xsi:type="boolean">false</item>
<item name="validation" xsi:type="array"> <item name="validation" xsi:type="array">
<item name="min_text_length" xsi:type="number">0</item> <item name="min_text_length" xsi:type="number">0</item>
</item> </item>
......
app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
...@@ -16,7 +16,7 @@ $hasCouponCode = (bool) strlen($block->getCouponCode()); ...@@ -16,7 +16,7 @@ $hasCouponCode = (bool) strlen($block->getCouponCode());
data-mage-init='{"collapsible":{"active": <?= $hasCouponCode ? 'true' : 'false' ?>, "openedState": "active", "saveState": false}}' data-mage-init='{"collapsible":{"active": <?= $hasCouponCode ? 'true' : 'false' ?>, "openedState": "active", "saveState": false}}'
> >
<div class="title" data-role="title"> <div class="title" data-role="title">
<strong id="block-discount-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Apply Discount Code')) ?></strong> <strong id="block-discount-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Apply Discount Code')) ?>11</strong>
</div> </div>
<div class="content" data-role="content" aria-labelledby="block-discount-heading"> <div class="content" data-role="content" aria-labelledby="block-discount-heading">
<form id="discount-coupon-form" <form id="discount-coupon-form"
......
app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="payment-option _collapsible opc-payment-additional discount-code" <div class="payment-option _collapsible opc-payment-additional discount-code"
data-bind="mageInit: {'collapsible':{'active':true, 'openedState': '_active'}}" data-collapsible="true"> data-bind="mageInit: {'collapsible':{'active':true, 'openedState': '_active'}}" data-collapsible="true">
<div class="payment-option-title field choice" data-role="title"> <div class="payment-option-title field choice" data-role="title">
<span class="action action-toggle" id="block-discount-heading" role="heading" aria-level="2"> <span class="action action-toggle" id="block-discount-heading" role="heading" aria-level="2">2222
<!-- ko i18n: 'Apply Discount Code'--><!-- /ko --> <!-- ko i18n: 'Apply Discount Code'--><!-- /ko -->
</span> </span>
</div> </div>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_cart_index.xml 0 → 100644
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<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="header.container" remove="true"/>
<referenceBlock name="global_notices" remove="true" />
<referenceContainer name="page.bottom.container" remove="true"/>
<referenceContainer name="footer-container" remove="true"/>
<referenceContainer name="content">
<block class="Magento\Theme\Block\Html\Header\Logo" name="logo" before="checkout.cart">
<arguments>
<argument name="logoPathResolver" xsi:type="object">Magento\Theme\ViewModel\Block\Html\Header\LogoPathResolver</argument>
<argument name="logo_size_resolver" xsi:type="object">Magento\Theme\ViewModel\Block\Html\Header\LogoSizeResolver</argument>
</arguments>
</block>
<block class="Magento\Framework\View\Element\Template" name="checkout.cart.footer" template="Magento_Checkout::footer.phtml" />
</referenceContainer>
</body>
</page>
app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_onepage_success.xml 0 → 100644
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<head>
<title>Success Page</title>
</head>
<body>
<referenceBlock name="global_notices" remove="true" />
<referenceContainer name="page.bottom.container" remove="true"/>
<referenceContainer name="footer-container" remove="true"/>
<referenceContainer name="page.messages" remove="true"/>
<referenceBlock name="page.main.title">
<block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success.print.button" template="Magento_Checkout::button.phtml"/>
<action method="setPageTitle">
<argument translate="true" name="title" xsi:type="string">Thank you for your purchase!</argument>
</action>
</referenceBlock>
<referenceContainer name="content">
<block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success" template="Magento_Checkout::success.phtml" cacheable="false">
<container name="order.success.additional.info" label="Order Success Additional Info"/>
</block>
<block class="Magento\Checkout\Block\Registration" name="checkout.registration" template="Magento_Checkout::registration.phtml" cacheable="false"/>
<block class="Magento\Framework\View\Element\Template" name="checkout.cart.footer" template="Magento_Checkout::footer.phtml" />
</referenceContainer>
</body>
</page>
app/design/frontend/Joshine/breeze/Magento_Checkout/requirejs-config.js 0 → 100644
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
var config = {
config: {
mixins: {
'Magento_Theme/js/view/messages': {
'Magento_Checkout/js/view/messages-mixin': true
},
'Magento_Checkout/js/view/summary/abstract-total': {
'Magento_Checkout/js/view/summary/abstract-total-mixin': true
},
'Magento_Checkout/js/view/shipping': {
'Magento_Checkout/js/view/shipping-mixin': true
}
}
}
};
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
?>
<style>
.logo {
margin-left: 40%;
margin-top: 10%;
}
a.logo>img{
margin-top: 5%;
width: 155px;
height: auto;
}
.cart-class{
margin-top: 3%;
margin-left: 9%;
margin-bottom: 2%;
}
.activation{
font-size: 20px;
font-width: 600;
margin-right: 20px;
margin-left: 20px;
}
.activation-no{
font-size: 14px;
margin-right: 20px;
margin-left: 20px;
color: #1b1b1b;
}
@media(max-width: 1024px){
.logo {
margin-left: 30%;
}
.cart-container{
margin-top: 0px;
}
span.action.nav-toggle {
display: none;
}
.page-main > .columns{
margin-top: 20px !important;
}
.activation {
color: darkblue;
font-size: 14px;
font-weight: 600;
margin-right: 2px;
margin-left: 2px;
}
.activation-no {
font-size: 10px;
margin-right: 2px;
margin-left: 2px;
color: slategray;
}
.cart-class {
margin-left: 0px;
}
form .actions-toolbar{
margin: 0px !important;
}
.checkout-cart-index .column.main .block:not(.crosssell) .content { padding: 0px !important;}
}
</style>
<div class="cart-class">
<span class="activation">Shopping Cart</span> >
<span class="activation-no">Information </span> >
<span class="activation-no">Shipping </span> >
<span class="activation-no">Payment </span>
</div>
<?php
/**
* Shopping cart template
*
* @var $block \Magento\Checkout\Block\Cart
*/
if ($block->getItemsCount()) {
// phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
echo $block->getChildHtml('with-items');
} else {
// phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
echo $block->getChildHtml('no-items');
}
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/coupon.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/**
* @var \Magento\Framework\View\Element\AbstractBlock $block
*/
// We should use strlen function because coupon code could be "0", converted to bool will lead to false
$hasCouponCode = (bool) strlen($block->getCouponCode());
?>
<div class="block discount"
id="block-discount"
data-mage-init='{"collapsible":{"active": <?= $hasCouponCode ? 'true' : 'false' ?>, "openedState": "active", "saveState": false}}'
>
<div class="content" data-role="content" aria-labelledby="block-discount-heading" style="display: block;">
<form id="discount-coupon-form"
action="<?= $block->escapeUrl($block->getUrl('checkout/cart/couponPost')) ?>"
method="post"
data-mage-init='{"discountCode":{"couponCodeSelector": "#coupon_code",
"removeCouponSelector": "#remove-coupon",
"applyButton": "button.action.apply",
"cancelButton": "button.action.cancel"}}'>
<div class="fieldset coupon<?= $hasCouponCode ? ' applied' : '' ?>">
<input type="hidden" name="remove" id="remove-coupon" value="0" />
<div class="field" style="width: 65%;">
<label for="coupon_code" class="label"><span><?= $block->escapeHtml(__('Enter discount code')) ?></span></label>
<div class="control" style="float: left;margin-top: 0px;margin-right: 2px;">
<input type="text"
class="input-text"
id="coupon_code"
name="coupon_code"
value="<?= $block->escapeHtmlAttr($block->getCouponCode()) ?>"
placeholder="<?= $block->escapeHtmlAttr(__('Enter discount code')) ?>"
<?php if ($hasCouponCode) :?>
disabled="disabled"
<?php endif; ?>
/>
</div>
</div>
<div class="actions-toolbar" style="clear: none;">
<?php if (!$hasCouponCode) :?>
<div class="primary">
<button class="action apply primary" type="button" value="<?= $block->escapeHtmlAttr(__('Apply Discount')) ?>">
<span><?= $block->escapeHtml(__('Apply Discount')) ?></span>
</button>
</div>
<?php else :?>
<div class="primary">
<button type="button" class="action cancel primary" value="<?= $block->escapeHtmlAttr(__('Cancel Coupon')) ?>"><span><?= $block->escapeHtml(__('Cancel Coupon')) ?></span></button>
</div>
<?php endif; ?>
</div>
</div>
<?php if (!$hasCouponCode) : ?>
<?= /* @noEscape */ $block->getChildHtml('captcha') ?>
<?php endif; ?>
</form>
</div>
</div>
<script>
require([
'jquery'
], function ($) {
});
</script>
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/cart/noItems.phtml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
/** @var $block \Magento\Checkout\Block\Cart */ /** @var $block \Magento\Checkout\Block\Cart */
?> ?>
<div class="cart-empty"> <div class="cart-empty" style="min-height: 500px;">
<?= $block->getChildHtml('checkout_cart_empty_widget') ?> <?= $block->getChildHtml('checkout_cart_empty_widget') ?>
<div class="empty-img"><img src="<?= $block->getViewFileUrl('Magento_Checkout::images/empty-cart.svg');?>" /></div> <div class="empty-img"><img src="<?= $block->getViewFileUrl('Magento_Checkout::images/empty-cart.svg');?>" /></div>
<p class="empty-message"><?= $block->escapeHtml(__('You shopping cart is currently empty.')) ?></p> <p class="empty-message"><?= $block->escapeHtml(__('You shopping cart is currently empty.')) ?></p>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/footer.phtml 0 → 100644
<style>
.cat-footer{
border-top: 1px solid rgba(var(--base-color), var(--divider-alpha, .1));
width: 100%;
margin-top: 5px;
}
.cat-footer-tk{
margin-top: 10px;
margin-left: 9%;
margin-bottom: 2%;
}
.cat-footer-tk > span {
margin-right: 10px;
margin-left: 10px;
font-size: 14px;
}
</style>
<div class="cat-footer">
<div class="cat-footer-tk">
<span>Refund Policy</span>
<span>Shipping policy</span>
<span>Privacy Policy</span>
<span>Terms of service</span>
</div>
</div>
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/success.phtml
...@@ -6,6 +6,24 @@ ...@@ -6,6 +6,24 @@
?> ?>
<?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?> <?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?>
<style>
main#maincontent{
width: 80%;
}
.cat-footer{
width: 100% !important;
}
.cat-footer-tk{
margin-left: 0px !important;
}
.opc .actions-toolbar{
justify-content: center !important;
}
#registration{
margin-bottom: 200px;
}
</style>
<div class="checkout-success"> <div class="checkout-success">
<?php if ($block->getOrderId()) :?> <?php if ($block->getOrderId()) :?>
<?php if ($block->getCanViewOrder()) :?> <?php if ($block->getCanViewOrder()) :?>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/web/js/view/messages-mixin.js 0 → 100644
define([
'jquery',
'uiComponent',
'Magento_Customer/js/customer-data',
'underscore',
'escaper'
], function (customerData) {
'use strict';
return function (target) {
return target.extend({
/**
* Extends Component object by storage observable messages.
*/
initialize: function () {
this._super();
function hideMessage(){
require(['jquery', 'jquery/jquery-storageapi'], function($) {
$.cookieStorage.set('mage-messages', '');
});
}
setTimeout(hideMessage,5000);
jQuery('.messages').delay(5000).fadeOut('slow');
}
});
}
});
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Checkout/web/js/view/shipping-mixin.js 0 → 100644
define([
'Magento_Checkout/js/model/cart/estimate-service'
], function (estimateService) {
'use strict';
var mixin = {
initialize: function () {
this._super();
}
};
return function (target) {
return target.extend(mixin);
};
});
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Checkout/web/js/view/summary/abstract-total-mixin.js 0 → 100644
define([
], function () {
'use strict';
return function (Component) {
return Component.extend({
isFullMode: function () {
var result = this._super();
if (!this.getTotals()) {
return false;
}
return true;
}
});
};
});
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/progress-bar.html 0 → 100644
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<ul class="opc-progress-bar">
<!-- ko foreach: { data: steps().sort(sortItems), as: 'item' } -->
<li class="opc-progress-bar-item" data-bind="css: item.isVisible() ? '_active' : ($parent.isProcessed(item) ? '_complete' : '')">
<span data-bind="i18n: item.title, click: $parent.navigateTo"></span>
</li>
<!-- /ko -->
</ul>
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/shipping.html
...@@ -72,8 +72,7 @@ ...@@ -72,8 +72,7 @@
<div class="actions-toolbar" id="shipping-method-buttons-container"> <div class="actions-toolbar" id="shipping-method-buttons-container">
<div class="primary"> <div class="primary">
<button data-role="opc-continue" type="submit" class="button action continue primary"> <button data-role="opc-continue" type="submit" class="button action continue primary">
<span data-v-20221108="" class="secure"><img data-v-b14bd780="" alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADEAAAA3CAYAAAClxaIBAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjMyODNDODA2MkIwNTExRUNCNUFCRkFGMzY4RjkyOTdCIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjMyODNDODA3MkIwNTExRUNCNUFCRkFGMzY4RjkyOTdCIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MzI4M0M4MDQyQjA1MTFFQ0I1QUJGQUYzNjhGOTI5N0IiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MzI4M0M4MDUyQjA1MTFFQ0I1QUJGQUYzNjhGOTI5N0IiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7niMRCAAAEKklEQVR42tSaW0gVQRjHt01SwiyTJKuHiugiEVIUVhBlPRRBN7ppUCT2EGVB0A2SoB6iJ596iPJBLJPM7B5SdDXNyjIxy0iLIsEoNYuu1vb/8DuwnM7OzszZPR7/8FNxZ3b2f+ab2ZlvTj/LsgyPlQhWgvlgNkgAXaAS3ABnQIenLZIJj0gGB8EHSyy6fgCM9KptL24yCOwFbZaaPnG9xN40EQ+2gxYrPL0DO/l+Ws/ST2NMDAM5YBMY42Fkt4BCUADeq1RUMTELrAVZIMnwT1/AKTZU5YWJiWAxWAOmG5HXA1AKroM6WRNxIJ1ZAqaCWKP3RQ9ZDS6AGnAf/LCbSMPvuWAeSAXjjOhXM2jk984tMvEUf0wx+q7qTX6b9mV9Nu2x1Uf1g0z8jsYQAY9AJq+/RPpp8rwcbQYaeEovAfEu5btMz1eU4RugN/Y62/9GuNRpj8GPzigx8Bjs5hebXaNc6nWQidYoMbCReyLUWk2k92TiXRQYoPB54XB9iEv9t6bqitGHMbBdYIBkCq79okgyOZxae8nAYd62Cgeu4NqbQE+08lo+0gbOgWKJsq9dTHSQib/gVYRNvAT7JctWOQx40nN7vNVFeI+QqVj+l8O1WruJ2giGUR7oVqgzQ7BIrbGnbAaCdstfPQVHFBIA48FVrhdKTYGyMezoG7taqPnpdvMsskC02gRbJO+5A2xw2efcCzUH39U0cAtM40brBeXyJe9ZIGGAdDNUBjBNMTQucpfb75HvUL5cMoTOC8LHru8gySl51ijx8NVghcND0Nh6EqLOOAkD1yQNkM7Z6wa/0ktdQqcMzARnHcrQ2CoPCqtKiffQNZCssNcvESWUJwvcD1WYWWptveCWnqxQ6AFSJ+d/HXuigfM7obReYcAXcm9cAV8F5S6D4YrZlqL/dqMhPplMwXh4CHIke4PGToLgepFiDwQ0SSYrPgC8kZiZkl1MjBVcy9c0UKGS2t8qcUOahVZrpOKzNQ2QMlRMxEqc+AR65ZCCgbQwDNzmKVzpkGWbwovvpISBATxOdJUOTFUT/UGzgpHzLibKwzBwTHRv0f71D8iVnPZoihwNrjpc3wPGai7fKS+2S5z4dw+DYsU11eWg+qlhjANLZvKQMTEYdCgaKQtaE+nqksyEESOTOgeb+RxNNrRIR/kwJFkzjGg3ly13jiQ/PR63IqtFfpxjm7zsiITy/DzHTuHMiG6IyIjCNkulgs5hfBqvdON8MEBb5DmqlUyNhqgnlvlgoMnoOTM3ImGCVKGYAHMTpVEzdE+tzDAapi3iKg8MPDN6ztG1k9pmmA9AX8CiQ/w2zfp32EB4ZyQefXGKshn1itPoSSuKvrRlX/UWShrY52G7npoIkMvJrVD6CJZ43aYfJogJ4HSQgRMgxY/2dF52KloOlnKy7YJfjfwTYAD0328CQiS8EQAAAABJRU5ErkJggg=="></span> <span translate="'Next'" />
<span translate="'PLACE ORDER'" style="vertical-align: super;"/>
</button> </button>
</div> </div>
</div> </div>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -920,7 +920,7 @@ footer{ ...@@ -920,7 +920,7 @@ footer{
@media(min-width: 640px){ @media(min-width: 640px){
.switcher.currency{ .switcher.currency{
position: absolute; position: absolute;
top: 30px; top: 20px;
right: 145px; right: 145px;
z-index: 1; z-index: 1;
font-size: 13px; font-size: 13px;
......
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