From dd5889039553f8cce2f05dbf8ffb05c6ccce5373 Mon Sep 17 00:00:00 2001
From: Vivek Sharma <viveksh047@webkul.com>
Date: Mon, 10 Feb 2020 13:48:44 +0530
Subject: [PATCH] [Fixed: Issue #2397 has been resolved.]

---
 .../onepage/customer-new-form.blade.php       | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

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 15be26700..f292b3648 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
@@ -236,24 +236,22 @@
         @endauth
 
     @elseif (isset($billing) && $billing)
-        <div :class="`col-12 form-field ${errors.has('address-form.billing[email]') ? 'has-error' : ''}`">
-            <label for="billing[email]" class="mandatory">
-                {{ __('shop::app.checkout.onepage.email') }}
+        <div :class="`col-12 form-field ${errors.has('address-form.billing[company_name]') ? 'has-error' : ''}`">
+            <label for="billing[company_name]">
+                {{ __('shop::app.checkout.onepage.company-name') }}
             </label>
 
             <input
                 type="text"
                 class="control"
-                id="billing[email]"
-                name="billing[email]"
-                @blur="isCustomerExist"
-                v-validate="'required|email'"
-                v-model="address.billing.email"
+                id="billing[company_name]"
+                name="billing[company_name]"
+                v-model="address.billing.company_name"
                 @change="validateForm('address-form')"
-                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;" />
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.company-name') }}&quot;" />
 
-            <span class="control-error" v-if="errors.has('address-form.billing[email]')">
-                @{{ errors.first('address-form.billing[email]') }}
+            <span class="control-error" v-if="errors.has('address-form.billing[company_name]')">
+                @{{ errors.first('address-form.billing[company_name]') }}
             </span>
         </div>
 
@@ -299,6 +297,27 @@
                 @{{ errors.first('address-form.billing[last_name]') }}
             </span>
         </div>
+        
+        <div :class="`col-12 form-field ${errors.has('address-form.billing[email]') ? 'has-error' : ''}`">
+            <label for="billing[email]" class="mandatory">
+                {{ __('shop::app.checkout.onepage.email') }}
+            </label>
+
+            <input
+                type="text"
+                class="control"
+                id="billing[email]"
+                name="billing[email]"
+                @blur="isCustomerExist"
+                v-validate="'required|email'"
+                v-model="address.billing.email"
+                @change="validateForm('address-form')"
+                data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;" />
+
+            <span class="control-error" v-if="errors.has('address-form.billing[email]')">
+                @{{ errors.first('address-form.billing[email]') }}
+            </span>
+        </div>
 
         <div :class="`col-12 form-field ${errors.has('address-form.billing[address1][]') ? 'has-error' : ''}`">
             <label for="billing_address_0" class="mandatory">