From 24fcdd006b989394e3ea993a891e495fce360ebf Mon Sep 17 00:00:00 2001
From: shivam kumar <shivam.kumar174@webkul.com>
Date: Wed, 5 Feb 2020 20:53:39 +0530
Subject: [PATCH] #2274 #2275 solved

---
 .../src/Resources/views/shop/checkout/onepage.blade.php      | 5 +++++
 .../views/shop/checkout/onepage/customer-info.blade.php      | 4 ++--
 .../views/shop/checkout/onepage/customer-new-form.blade.php  | 1 +
 .../Resources/views/shop/checkout/onepage/payment.blade.php  | 2 +-
 .../Resources/views/shop/checkout/onepage/review.blade.php   | 2 +-
 .../Resources/views/shop/checkout/onepage/shipping.blade.php | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php
index 945170381..60a8473cf 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php
@@ -278,6 +278,11 @@
                                 this.completed_step = this.step_numbers[response.data.jump_to_section] + 1;
                                 this.current_step = this.step_numbers[response.data.jump_to_section];
 
+                                if (response.data.jump_to_section == "payment") {
+                                    this.showPaymentSection = true;
+                                    paymentMethods  = response.data.paymentMethods;
+                                }
+
                                 shippingMethods = response.data.shippingMethods;
 
                                 this.getOrderSummary();
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php
index 38ce3cfe5..2ddd06c11 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php
@@ -3,7 +3,7 @@
         <accordian :title="'{{ __('shop::app.checkout.onepage.billing-address') }}'" :active="true">
             <div class="form-header mb-30" slot="header">
                 <h3 class="fw6 display-inbl">
-                    1. {{ __('shop::app.checkout.onepage.billing-address') }}
+                    {{ __('shop::app.checkout.onepage.billing-address') }}
                 </h3>
 
                 <a
@@ -92,7 +92,7 @@
         <accordian :title="'{{ __('shop::app.checkout.onepage.billing-address') }}'" :active="true">
             <div class="form-header" slot="header">
                 <h3 class="fw6 display-inbl">
-                    1. {{ __('shop::app.checkout.onepage.billing-address') }}
+                   {{ __('shop::app.checkout.onepage.billing-address') }}
                 </h3>
 
                 @auth('customer')
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php
index 71009b2d9..9fb69cc27 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php
@@ -366,6 +366,7 @@
                 v-validate="'required'"
                 class="control styled-select"
                 v-model="address.billing.country"
+                @change="validateForm('address-form')"
                 data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
 
                 <option value=""></option>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/payment.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/payment.blade.php
index 084653e5c..c1dca5f76 100755
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/payment.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/payment.blade.php
@@ -3,7 +3,7 @@
         <accordian :title="'{{ __('shop::app.checkout.payment-methods') }}'" :active="true">
             <div class="form-header mb-30" slot="header">
                 <h3 class="fw6 display-inbl">
-                    3. {{ __('shop::app.checkout.onepage.payment-methods') }}
+                   {{ __('shop::app.checkout.onepage.payment-methods') }}
                 </h3>
                 <i class="rango-arrow"></i>
             </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
index 886593796..1fde1befb 100755
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
@@ -4,7 +4,7 @@
     <accordian :title="'{{ __('shop::app.checkout.onepage.summary') }}'" :active="true">
         <div class="form-header mb-30" slot="header">
             <h3 class="fw6 display-inbl">
-                4. {{ __('shop::app.checkout.onepage.summary') }}
+                {{ __('shop::app.checkout.onepage.summary') }}
             </h3>
             <i class="rango-arrow"></i>
         </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/shipping.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/shipping.blade.php
index 7e6e26a05..e7ce1530e 100755
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/shipping.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/shipping.blade.php
@@ -3,7 +3,7 @@
         <accordian :title="'{{ __('shop::app.checkout.onepage.shipping-method') }}'" :active="true">
             <div class="form-header" slot="header">
                 <h3 class="fw6 display-inbl">
-                    2. {{ __('shop::app.checkout.onepage.shipping-method') }}
+                 {{ __('shop::app.checkout.onepage.shipping-method') }}
                 </h3>
                 <i class="rango-arrow"></i>
             </div>