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

app/code/Magento/Checkout/view/frontend/web/js/view/part.js

@@ -111,8 +111,8 @@ define([
                     $('#breadcrumb-logistics').removeClass('trade_checkout_step_waiting');
                     addressOneVisible(false);
                     shippingTwoVisible(true);
-                    checkoutDataResolver.resolveEstimationAddress();
                     //quote.billAddressMent(true);
+                    checkoutDataResolver.resolveEstimationAddress();
                 });
 
                 $(document).on('click','.continue-payment',function() {
@@ -152,6 +152,8 @@ define([
                         obj.backToInformation();
                         return false;
                     }
+                    $('.waitBtn').show();
+                    $('.complete-order').hide();
                     if(!registry.get('checkout.steps.shipping-step.shippingAddress.after-shipping-method-form.billing-address-form').isAddressSameAsShipping())
                     {
                         var billadressForm = $('.checkout-billing-address form');
@@ -185,6 +187,8 @@ define([
                                         $(selectInput[i]).removeAttr('name')
                                     }
                                 }
+                                $('.waitBtn').hide();
+                                $('.complete-order').show();
                                 return false;
                             }
 
@@ -194,15 +198,20 @@ define([
                                 }
                             }
                         }else {
+                            $('.waitBtn').hide();
+                            $('.complete-order').show();
                             return false;
                         }
 
                         $('#submitBill').trigger('click');
                         if(quote.responseBillStatus() == 400)
                         {
+                            $('.waitBtn').hide();
+                            $('.complete-order').show();
                             return false;
                         }
                     }
+
                     $('.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/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js

@@ -149,14 +149,15 @@ define([
                             }
                         }
                     ).always(
-                        function () {
-                            self.isPlaceOrderActionAllowed(true);
-                        }
-                    );
+                    function () {
+                        self.isPlaceOrderActionAllowed(true);
+                    }
+                );
 
                 return true;
             }
-
+            $('.waitBtn').hide();
+            $('.complete-order').show();
             return false;
         },
 

app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml

@@ -1069,7 +1069,7 @@ $isMobile = $mobileDetect->isMobile();
         }
         .checkout-index-index .label-title{
             position:relative;
-            margin:0.5rem 0px;
+            margin:30px 0px 0px;
         }
         .checkout-index-index .contact-title{
             line-height: 30px;
@@ -1403,11 +1403,12 @@ $isMobile = $mobileDetect->isMobile();
         margin-bottom: 20px;
     }
     .block-select-subtitle {
-        font-size: 14px;
+        font-size: 12px;
         font-weight: 400;
         word-break: break-word;
         color:#5D5B5A;
-        padding-left:5px
+        padding:0;
+        margin:0 auto;
     }
     #checkoutSteps{
         display: grid;
@@ -1674,23 +1675,25 @@ $isMobile = $mobileDetect->isMobile();
         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;
+    .jkl{
+        width:17px;
+        height:17px;
+        border:2px solid #f2f2f2;
+        border-top-color:#dbb893;
+        border-radius:50%;
+        animation: fadenum 1s linear infinite;
+        -moz-animation: fadenum 1s linear infinite;
+        -webkit-animation: fadenum 1s linear infinite;
+        -o-animation: fadenum 1s linear infinite;
+        vertical-align: sub;
+        display: inline-block;
+        margin-left:15px;
     }
-    @keyframes rotate {
-        0% {
-            transform: rotate(0);
-        }
-        100% {
-            transform: rotate(360deg);
-        }
+    .wait-loop{
+        display: inline-block;
+    }
+    @keyframes fadenum{
+        100%{transform:rotate(360deg);}
     }
 
     /********************************************address from end****************************************************/

app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/shipping.html

@@ -190,7 +190,14 @@
         </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>
+        <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>
 </li>