Skip to content

J
joshine
Commit bf54c030 by halweg
Options

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

parents a596f8fb 579bcbd2
Showing with 23 additions and 25 deletions
app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
......@@ -12,28 +12,8 @@
<body>
<referenceContainer name="page.bottom.container" remove="true"/>
<referenceContainer name="footer-container" remove="true"/>
<referenceBlock name="catalog.topnav" remove="true" />
<referenceBlock name="top.search" remove="true" />
<referenceBlock name="sparsh.free-shipping.bar.top" remove="true" />
<referenceBlock name="header.search.bar" remove="true" />
<referenceBlock name="header.account" remove="true" />
<referenceBlock name="header.wishlist" remove="true" />
<referenceBlock name="minicart" remove="true" />
<referenceContainer name="header.container">
<block class="Magento\Cms\Block\Block" name="cart.payment.top">
<arguments>
<argument name="block_id" xsi:type="string">cart_payment_top</argument>
</arguments>
</block>
</referenceContainer>
<referenceContainer name="columns.top">
<block class="Magento\Cms\Block\Block" name="progress.bar" before="-">
<arguments>
<argument name="block_id" xsi:type="string">progress_bar</argument>
</arguments>
</block>
</referenceContainer>
<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">
......
app/code/Magento/Checkout/view/frontend/web/js/view/part.js
......@@ -111,6 +111,7 @@ define([
$('#breadcrumb-logistics').removeClass('trade_checkout_step_waiting');
addressOneVisible(false);
shippingTwoVisible(true);
checkoutDataResolver.resolveEstimationAddress();
//quote.billAddressMent(true);
});
......@@ -202,7 +203,6 @@ define([
return false;
}
}
checkoutDataResolver.resolveEstimationAddress();
$('.checkout-index-index .payment-method._active').find('.actions-toolbar').find('button').trigger('click');
});
$(document).on('click','.back-to-information,.trade_checkout_step_doing.custom-link-color,.right-email,.right-address',function() {
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
......@@ -1662,18 +1662,36 @@ $isMobile = $mobileDetect->isMobile();
height: 40px;
}
.group-item-body{
.group-item-body {
padding: 16px;
/*border-top: 1px solid rgba(44, 44, 44, 0.08);*/
font-size: 14px;
padding-top: 30px;
text-align: center;
color: #969696;
background: #f2f2f2;
margin-top: 15px;
}
#policy-description li a{
font-size: 12px;
color: #276EAF;
}
.jkl {
width: 50px;
height: 50px;
border-radius: 50%;
background-color: red;
animation-name: rotate;
animation-duration: 2s;
animation-iteration-count: infinite;
animation-timing-function: linear;
}
@keyframes rotate {
0% {
transform: rotate(0);
}
100% {
transform: rotate(360deg);
}
}
/********************************************address from end****************************************************/
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
......@@ -929,7 +929,7 @@ p.shopbycate-title {
}
div#cart-totals{
margin-bottom: 20px;
margin: 20px 0px;
}
.discount-area{
color:#fa320f;
......
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