Skip to content

J
joshine
Commit 2d98fad0 by lmf
Options

移除文件支付流程文件

parent 63485ef1
Showing with 329 additions and 401 deletions
app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_cart_index.xml deleted 100644 → 0
<?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 deleted 100644 → 0
<?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/templates/cart.phtml deleted 100644 → 0
<?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){
a.logo>img {
margin-top: 3%;
margin-bottom: 2%;
}
.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;}
.cart-container .cart.table thead{height: 0px;}
.cart-container .cart-summary{
margin-top: -15%;
}
}
</style>
<div class="cart-class">
<span class="activation"><a href="/checkout/cart/">Cart</a></span> >
<span class="activation-no"><a href="/checkout/#shipping" >Shipping</a></span> >
<span class="activation-no" id="payment-bar"><a href="/checkout/#payment">Payment</a></span> >
<span class="activation-no">Complete</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/footer.phtml deleted 100644 → 0
<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;
}
@media(max-width: 1024px){
.cat-footer{
width: 100% !important;
}
.cat-footer-tk{
margin-left: 0px;
text-align: center;
}
.cat-footer-tk > span {
margin-right: 4px;
margin-left: 4px;
font-size: 10px;
}
}
</style>
<div class="cat-footer">
<div class="cat-footer-tk">
<span><a href="/shipping-policy">Shipping Policy</a></span>
<span><a href="/return-exchange-policy">Return &amp; Exchange</a></span>
<span><a href="/365-days-warranty">365-Days Warranty</a></span>
</div>
</div>
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
...@@ -4,128 +4,371 @@ ...@@ -4,128 +4,371 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
/** @var $block \Magento\Checkout\Block\Onepage */ /** @var $block \Magento\Checkout\Block\Onepage */
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
?> ?>
<style type="text/css">
.checkout-index-index{
font-family: 'Outfit-Regular', sans-serif;
}
.header.content .logo:after{
content: '';
display: inline-block;
width: 1px;
height: 30px;
margin-left: 10px;
vertical-align: middle;
-webkit-transform: rotate(30deg);
transform: rotate(30deg);
position: relative;
top: 0px;
left: 8px;
}
.header.content .secure-wrapper{
display: inline-block;
margin-left: 10px;
font-size: 12px;
color: #83b293;
opacity: 1;
width: unset;
}
.header.content .secure-wrapper .iconfont.icon-safepay{
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
color: #ffffff;
background: #83b293;
padding: 8px;
border-radius: 50%;
}
.header.content .secure-wrapper em{
padding-top: 36px;
position: relative;
top: 2px;
left: 5px;
font-size: 20px;
font-style: normal;
}
.header.content .secure-wrapper .icon-safepay:before {
content: "\e644";
}
.checkout-index-index footer.modal-footer{margin-top: unset;}
.header.content{height:60px;padding-top: 10px;padding-bottom: 10px;}
@media(min-width: 640px){
.header.content{padding-top: 15px !important;margin-bottom: 0px !important;}
}
<style> @media(min-width: 1024px){
main#maincontent{ li#payment{
max-width: 80%; margin-top: -9%;
width: 80%;
margin-left: 18%;
} }
.page-layout-checkout .header.content{
margin-top: 2%;
} }
.cat-footer{ @media(max-width: 639.98px){
width: 80% !important; .header.content{padding-top: 15px !important;margin-bottom: 0px !important;}
.page-layout-checkout .header.content{justify-content:unset;gap:unset;}
.header.content .secure-wrapper{margin-left: -30px;margin-top: 5px;}
.header.content .secure-wrapper .iconfont.icon-safepay{padding: 5px !important;}
.header.content .secure-wrapper em{top: unset !important;font-size: 16px !important;}
.header.content .logo:after{left: 5px;}
.header.content .logo img{max-width: 60%;}
.payment-method-note{font-size: 12px;}
} }
.cat-footer-tk{
margin-left: 0px !important; .opc>li{padding: 0;padding-bottom: 20px;}
#maincontent{background: #f2f2f2;}
.page-title-wrapper{display: none;}
#opc-sidebar{
border: 1px solid #d4d4d4;
background: #fff;
font-size: 16px;
} }
.opc .actions-toolbar{ .opc-block-summary{
justify-content: center !important; background: #f9f9f9;
padding: 15px;
} }
</style> .action.action-auth-toggle{
<style> background: none;
a.logo>img{ color: #000;
margin-top: 5%; text-decoration: underline !important;
width: 155px; line-height: 30px;
height: auto; font-family: Outfit-Regular;
} font-weight: 300;
.cart-class{ font-size: 12px;
margin-top: 3%; text-transform: uppercase;
margin-left: 0px !important; z-index: 1;
margin-bottom: 1% !important; }
} .opc .step-title, .opc .field-select-billing .label{
.activation{ font-weight: 600;
font-size: 20px; font-size: 20px;
font-width: 600; cursor: pointer;
margin-right: 10px; background: #eeeeee;
margin-left: 10px; padding:15px;
}
.label {
color: #555;
font-size: 13px;
}
.table-checkout-shipping-method tr.row{
/*border: 1px solid #1979c3;*/
box-shadow: 0 2px 8px rgb(56 77 108 / 40%);
line-height: 20px;
display: block;
padding: 0 20px;
margin-bottom: 10px;
} }
.activation-no{ /*table tbody:last-child tr:last-child{*/
/* border-bottom: 1px solid #1979c3;*/
/*}*/
a[href^="tel:"]{
color: #666666;
}
.field.addresses{
color: #666666;
font-size: 14px; font-size: 14px;
margin-right: 10px;
margin-left: 10px;
color: #1b1b1b;
} }
.field ._with-tooltip input{
.opc-progress-bar{ width: 100%;
display: none !important; }
.checkout-container .action.primary,.checkout-container action.secondary{
vertical-align: middle;
-webkit-transform: perspective(1px) translateZ(0);
transform: perspective(1px) translateZ(0);
box-shadow: 0 0 1px rgb(0 0 0 / 0%);
border-radius: 0px;
background-color: #222222;
box-shadow: none;
color: #ffffff;
display: inline-block;
font-family: 'Outfit', sans-serif;
font-weight: normal;
padding: 12px 50px;
line-height: 1;
text-shadow: none;
text-transform: capitalize;
white-space: nowrap;
font-size: 13px;
border-radius: 2px;
border: 2px solid #222222;
background-image: none;
text-align: center;
border: none;
text-transform: uppercase;
font-weight: normal !important;
transition: all 0.4s ease;
-webkit-transition: all 0.4s ease;
}
input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"],#maincontent input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
border: 1px solid #e1e1e1;
height: 40px;
padding: 5px;
border-radius: 3px;
box-shadow: none;
}
select {
background: #ffffff;
background-clip: padding-box;
border: 1px solid #c2c2c2;
border-radius: 1px;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 14px;
height: 32px;
line-height: 1.42857143;
padding: 5px 10px 4px;
vertical-align: baseline;
width: 100%;
box-sizing: border-box;
}
.product-item-details{
color: #666666;
font-size: 14px;
}
.shipping-address-item.selected-item{
border: 1px solid #1979c3;
}
.shipping-address-item:hover{
box-shadow: 0 2px 8px rgb(56 77 108 / 20%);
}
.shipping-address-item.selected-item:hover{
box-shadow: 0 2px 8px rgb(56 77 108 / 40%);
} }
button.action.secondary{
background: #000000;
}
cc
.checkout-payment-method .opc-payment-additional.discount-code{
@media(max-width: 1024px){
.logo {
margin-left: 0% !important;
} }
.cart-container{ .opc-block-summary .payment-option .form-discount .actions-toolbar .action{
margin-top: 0px; background: #000000;
height: 38px;
}
.actions-toolbar .secondary a.action.remind span{
font-size: 14px;
font-family: Outfit-Regular;
color: #000000;
}
.opc .checkout-shipping-address{
padding-bottom: 20px;
}
table.table-checkout-shipping-method{
border-collapse: separate;
border-spacing: 5px 10px;
} }
span.action.nav-toggle { .content.minicart-items{
display: block !important;
}
.opc-summary-wrapper .shipping-information{
display: none; display: none;
} }
.page-main > .columns{ .field.choice>[type="radio"], .field.choice>[type="checkbox"]{
margin-top: 0px !important; margin-top: 4px;
}
.payment-method{
background: #f9f9f9;
padding: 10px 20px;
margin-bottom: 20px;
} }
.activation { .payment-method ._active{
color: darkblue; border: 1px solid #1979c3;
}
.checkout-billing-address{
font-size: 14px; font-size: 14px;
font-weight: 600; color: #666666;
margin-right: 2px;
margin-left: 2px;
} }
.activation-no { .authentication-wrapper{
font-size: 10px; float: none;
margin-right: 2px; font-size: 13px;
margin-left: 2px; color: #666666;
color: slategray;
} }
.cart-class { .totals.shipping.excl .label{
margin-left: 0px; color: unset;
font-size: unset;
} }
form .actions-toolbar{ .totals.shipping.incl .label{
margin: 0px !important; color: unset;
font-size: unset;
} }
.checkout-cart-index .column.main .block:not(.crosssell) .content { padding: 0px !important;} @media (min-width: 1024px) {
main#maincontent { .checkout-container{
max-width: 100%; /*width: 60%;*/
margin: 0 auto;
background: #ffffff;
padding: 20px;
}
}
.teliphone_number{width:100% !important;;}
@media(min-width: 1024px){
.page-title-wrapper~.columns{
margin-top:0;
}
.opc-sidebar.modal-custom .modal-content{
padding: 0;
}
.opc-summary-wrapper .actions-toolbar-trigger{
width: 90%;
margin: 20px auto;
}
.opc-summary-wrapper .button.action.primary{
vertical-align: middle;
-webkit-transform: perspective(1px) translateZ(0);
transform: perspective(1px) translateZ(0);
box-shadow: 0 0 1px rgb(0 0 0 / 0%);
border-radius: 0px;
box-shadow: none;
color: #ffffff;
display: inline-block;
font-family: 'Outfit', sans-serif;
font-weight: normal;
padding: 12px 50px;
line-height: 1;
text-shadow: none;
text-transform: capitalize;
white-space: nowrap;
font-size: 13px;
border-radius: 2px;
border: 2px solid #222222;
background-image: none;
text-align: center;
border: none;
text-transform: uppercase;
font-weight: normal !important;
transition: all 0.4s ease;
-webkit-transition: all 0.4s ease;
width: 100%; width: 100%;
margin-left: 0px; height: 50px;
background: #ffa800;
font-size: 20px;
} }
.authentication-wrapper{font-size: 12px; line-height: 12px;} .opc-progress-bar{
header.page-header{ justify-content: center;
position: unset !important; font-size: 22px;
margin-top:0px !important; padding: 20px 0;
} }
table.data.table.table-totals {
font-size: 12px;
.action.action-auth-toggle{
margin: 0;
padding: 0;
}
#opc-sidebar{
float: right;
width: 370px;
}
}
@media(max-width: 767.98px){
.page-main>.columns{margin-top: 0;}
#maincontent{background: #ffffff;}
.opc-estimated-wrapper{background: #eeeeee;}
.opc-progress-bar{
margin-top: 100px;
}
#opc-sidebar{
margin-top: -5%;
}
}
@media(max-width: 639.98px){
.header.content{padding-top: 15px !important;margin-bottom: 0px !important;}
.page-layout-checkout .header.content{justify-content:unset;gap:unset;}
.header.content .secure-wrapper{margin-left: -30px;margin-top: 5px;}
.header.content .secure-wrapper .iconfont.icon-safepay{padding: 5px !important;}
.header.content .secure-wrapper em{top: unset !important;font-size: 16px !important;}
.header.content .logo:after{left: 5px;}
.header.content .logo img{max-width: 60%;}
.opc-progress-bar-item:before{
height:3px;
} }
button.action.primary.checkout,div#shipping-method-buttons-container { .opc-progress-bar-item>span{font-size: 12px;padding-top: 35px;}
.opc-progress-bar-item>span:before, .opc-progress-bar-item>span:after{width: 26px;height: 26px;margin-left:-13px;top: 6px;}
.opc-progress-bar-item>span:after{font-size: 1rem;}
.opc .actions-toolbar{
position: fixed; position: fixed;
right: 0;
bottom: 0; bottom: 0;
width: 110%; left: 0;
margin-left: -10% !important; background: #ffffff;
z-index: 11;
padding: 10px 0;
margin-bottom:0;
} }
.opc-estimated-wrapper .estimated-price{ .checkout-container .actions-toolbar .action.continue.primary{
font-weight: 600; width: 96%;
margin: 0 auto;
background: #ff9600;
height: 48px;
font-size: 20px;
display: flex;
} }
.payment-option._collapsible.opc-payment-additional.discount-code._active { .checkout-container .actions-toolbar .action.continue.primary .secure img{
margin: 0px !important; height: 28px;
vertical-align: bottom;
margin-right: 15px;
} }
.authentication-wrapper{top: 0px;}
.opc-payment ~ div:not([style*="none"]){margin-top: 0px !important;}
} }
</style> </style>
<div class="cart-class">
<span class="activation"><a href="/checkout/cart/">Cart</a></span> >
<span class="activation"><a href="/checkout/#shipping" >Shipping</a></span> >
<span class="activation-no" id="payment-bar"><a href="/checkout/#payment">Payment</a></span> >
<span class="activation-no">Complete</span>
</div>
<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 id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"checkoutLoader": {}}'>
<div class="loader"> <div class="loader">
...@@ -163,15 +406,3 @@ script; ...@@ -163,15 +406,3 @@ script;
?> ?>
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?> <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
</div> </div>
<script>
require([
'jquery'
], function ($) {
setTimeout(function(){
var payment = $(location).attr("hash");
if ($.trim("#payment") == $.trim(payment)){
$("#payment-bar").removeClass("activation-no").addClass("activation");
}
},5000);
});
</script>
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/success.phtml deleted 100644 → 0
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
?>
<?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;
}
@media(max-width: 1024px){
.logo {
margin-left: 0% !important;
}
.cart-container{
margin-top: 0px;
}
span.action.nav-toggle {
display: none;
}
.page-main > .columns{
margin-top: 0px !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;}
main#maincontent {
max-width: 100%;
width: 100%;
margin-left: 0px;
}
.authentication-wrapper{font-size: 12px; line-height: 12px;}
header.page-header{
position: unset !important;
margin-top:0px !important;
}
#registration{
margin-bottom: 50px;
}
h1.page-title{
font-size: 16px;
text-align: center;
}
img{
margin-left: 70%;
margin-top: 10%;
}
}
</style>
<div class="cart-class">
<span class="activation">Cart</span> >
<span class="activation">Shipping</span> >
<span class="activation">Payment</span> >
<span class="activation">Complete</span>
</div>
<div class="checkout-success">
<?php if ($block->getOrderId()) :?>
<?php if ($block->getCanViewOrder()) :?>
<p><?= $block->escapeHtml(__('Your order number is: %1.', sprintf('<a href="%s" class="order-number"><strong>%s</strong></a>', $block->escapeUrl($block->getViewOrderUrl()), $block->getOrderId())), ['a', 'strong']) ?></p>
<?php else :?>
<p><?= $block->escapeHtml(__('Your order # is: <span>%1</span>.', $block->getOrderId()), ['span']) ?></p>
<?php endif;?>
<p><?= $block->escapeHtml(__('We\'ll email you an order confirmation with details and tracking info.')) ?></p>
<?php endif;?>
<?= $block->getAdditionalInfoHtml() ?>
<div class="actions-toolbar">
<div class="primary">
<a style="background: #ffffff;color: blue;" class="action primary continue" href="<?= $block->escapeUrl($block->getContinueUrl()) ?>"><span><?= $block->escapeHtml(__('Continue Shopping')) ?></span></a>
</div>
</div>
</div>
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