Skip to content

J
joshine
Commit 6e75df7d by halweg
Options

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

parents f498618c a4ba514f
Showing with 46 additions and 26 deletions
app/code/Magento/Checkout/view/frontend/web/js/view/part.js
...@@ -111,8 +111,8 @@ define([ ...@@ -111,8 +111,8 @@ define([
$('#breadcrumb-logistics').removeClass('trade_checkout_step_waiting'); $('#breadcrumb-logistics').removeClass('trade_checkout_step_waiting');
addressOneVisible(false); addressOneVisible(false);
shippingTwoVisible(true); shippingTwoVisible(true);
checkoutDataResolver.resolveEstimationAddress();
//quote.billAddressMent(true); //quote.billAddressMent(true);
checkoutDataResolver.resolveEstimationAddress();
}); });
$(document).on('click','.continue-payment',function() { $(document).on('click','.continue-payment',function() {
...@@ -152,6 +152,8 @@ define([ ...@@ -152,6 +152,8 @@ define([
obj.backToInformation(); obj.backToInformation();
return false; return false;
} }
$('.waitBtn').show();
$('.complete-order').hide();
if(!registry.get('checkout.steps.shipping-step.shippingAddress.after-shipping-method-form.billing-address-form').isAddressSameAsShipping()) if(!registry.get('checkout.steps.shipping-step.shippingAddress.after-shipping-method-form.billing-address-form').isAddressSameAsShipping())
{ {
var billadressForm = $('.checkout-billing-address form'); var billadressForm = $('.checkout-billing-address form');
...@@ -185,6 +187,8 @@ define([ ...@@ -185,6 +187,8 @@ define([
$(selectInput[i]).removeAttr('name') $(selectInput[i]).removeAttr('name')
} }
} }
$('.waitBtn').hide();
$('.complete-order').show();
return false; return false;
} }
...@@ -194,15 +198,20 @@ define([ ...@@ -194,15 +198,20 @@ define([
} }
} }
}else { }else {
$('.waitBtn').hide();
$('.complete-order').show();
return false; return false;
} }
$('#submitBill').trigger('click'); $('#submitBill').trigger('click');
if(quote.responseBillStatus() == 400) if(quote.responseBillStatus() == 400)
{ {
$('.waitBtn').hide();
$('.complete-order').show();
return false; return false;
} }
} }
$('.checkout-index-index .payment-method._active').find('.actions-toolbar').find('button').trigger('click'); $('.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() { $(document).on('click','.back-to-information,.trade_checkout_step_doing.custom-link-color,.right-email,.right-address',function() {
......
app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
...@@ -149,14 +149,15 @@ define([ ...@@ -149,14 +149,15 @@ define([
} }
} }
).always( ).always(
function () { function () {
self.isPlaceOrderActionAllowed(true); self.isPlaceOrderActionAllowed(true);
} }
); );
return true; return true;
} }
$('.waitBtn').hide();
$('.complete-order').show();
return false; return false;
}, },
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
...@@ -1069,7 +1069,7 @@ $isMobile = $mobileDetect->isMobile(); ...@@ -1069,7 +1069,7 @@ $isMobile = $mobileDetect->isMobile();
} }
.checkout-index-index .label-title{ .checkout-index-index .label-title{
position:relative; position:relative;
margin:0.5rem 0px; margin:30px 0px 0px;
} }
.checkout-index-index .contact-title{ .checkout-index-index .contact-title{
line-height: 30px; line-height: 30px;
...@@ -1403,11 +1403,12 @@ $isMobile = $mobileDetect->isMobile(); ...@@ -1403,11 +1403,12 @@ $isMobile = $mobileDetect->isMobile();
margin-bottom: 20px; margin-bottom: 20px;
} }
.block-select-subtitle { .block-select-subtitle {
font-size: 14px; font-size: 12px;
font-weight: 400; font-weight: 400;
word-break: break-word; word-break: break-word;
color:#5D5B5A; color:#5D5B5A;
padding-left:5px padding:0;
margin:0 auto;
} }
#checkoutSteps{ #checkoutSteps{
display: grid; display: grid;
...@@ -1674,23 +1675,25 @@ $isMobile = $mobileDetect->isMobile(); ...@@ -1674,23 +1675,25 @@ $isMobile = $mobileDetect->isMobile();
font-size: 12px; font-size: 12px;
color: #276EAF; color: #276EAF;
} }
.jkl { .jkl{
width: 50px; width:17px;
height: 50px; height:17px;
border-radius: 50%; border:2px solid #f2f2f2;
background-color: red; border-top-color:#dbb893;
animation-name: rotate; border-radius:50%;
animation-duration: 2s; animation: fadenum 1s linear infinite;
animation-iteration-count: infinite; -moz-animation: fadenum 1s linear infinite;
animation-timing-function: linear; -webkit-animation: fadenum 1s linear infinite;
-o-animation: fadenum 1s linear infinite;
vertical-align: sub;
display: inline-block;
margin-left:15px;
} }
@keyframes rotate { .wait-loop{
0% { display: inline-block;
transform: rotate(0); }
} @keyframes fadenum{
100% { 100%{transform:rotate(360deg);}
transform: rotate(360deg);
}
} }
/********************************************address from end****************************************************/ /********************************************address from end****************************************************/
......
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/shipping.html
...@@ -190,7 +190,14 @@ ...@@ -190,7 +190,14 @@
</button> </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-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 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> <span class="save-continue complete-order payment-three " data-bind="fadeVisible: paymentVisible">
<span class="coBtn"><!-- ko i18n: 'Complete Order'--><!-- /ko --></span>
</span>
<span class="save-continue waitBtn" style="display: none;">
<span class="wait-loop"><!-- ko i18n: 'Please wait'--><!-- /ko --><div class="jkl"></div></span>
</span>
</div> </div>
</li> </li>
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