From c96dd396d94a35445ee1fa466dac50dc970456fa Mon Sep 17 00:00:00 2001
From: shivam kumar <shivam.kumar174@webkul.com>
Date: Thu, 17 Oct 2019 17:28:08 +0530
Subject: [PATCH 1/5] #1219 fixed

---
 .../views/users/sessions/create.blade.php     | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php
index 1e6f3ed42..8d4ffdac1 100755
--- a/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php
@@ -25,7 +25,7 @@
 
                     <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
                         <label for="password">{{ __('admin::app.users.sessions.password') }}</label>
-                        <input type="password" v-validate="'required|min:6'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.sessions.password') }}&quot;"/>
+                        <input type="password" v-validate="'required|min:6'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.sessions.password') }}&quot;" value="" onblur="hidePassword()" onfocus="showPassword()"/>
                         <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
                     </div>
 
@@ -44,4 +44,37 @@
 
     </div>
 
-@stop
\ No newline at end of file
+@stop
+@push('javascript')
+    <script>
+        //default value of password
+        password = '';
+
+        //call the showPass function
+        function setPasswordBack(){
+            showPassword();
+        }
+
+        //hide password from user inspection
+        function hidePassword(){
+            var givenValue = "";
+            var i;
+            p = document.getElementById('password');
+            password = p.value;
+            passwordLength = password.length;
+
+            for (i = 0; i < passwordLength; i++) {
+                givenValue += "*";
+            }
+
+            p.value  = givenValue;
+        }
+
+        //show the given password
+        function showPassword(){
+            p = document.getElementById('password');
+            p.type= "password";
+            p.value = password;
+        }
+    </script>
+@endpush
\ No newline at end of file

From eaf82987cfc20fe12dd0f33e0ad05dd1878e2172 Mon Sep 17 00:00:00 2001
From: shivam kumar <shivam.kumar174@webkul.com>
Date: Thu, 17 Oct 2019 17:47:48 +0530
Subject: [PATCH 2/5] #1219 fixed

---
 .../views/customers/session/index.blade.php   | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
index 8cff079eb..bec8e1fd0 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
@@ -28,7 +28,7 @@
 
                 <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
                     <label for="password" class="required">{{ __('shop::app.customer.login-form.password') }}</label>
-                    <input type="password" class="control" name="password" v-validate="'required'" value="{{ old('password') }}" data-vv-as="&quot;{{ __('shop::app.customer.login-form.password') }}&quot;">
+                    <input type="password" v-validate="'required|min:6'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.sessions.password') }}&quot;" value="" onblur="hidePassword()" onfocus="showPassword()"/>
                     <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
                 </div>
 
@@ -53,4 +53,37 @@
         {!! view_render_event('bagisto.shop.customers.login.after') !!}
     </div>
 
-@endsection
+@stop
+@push('scripts')
+    <script>
+        //default value of password
+        password = '';
+
+        //call the showPass function
+        function setPasswordBack(){
+            showPassword();
+        }
+
+        //hide password from user inspection
+        function hidePassword(){
+            var givenValue = "";
+            var i;
+            p = document.getElementById('password');
+            password = p.value;
+            passwordLength = password.length;
+
+            for (i = 0; i < passwordLength; i++) {
+                givenValue += "*";
+            }
+
+            p.value  = givenValue;
+        }
+
+        //show the given password
+        function showPassword(){
+            p = document.getElementById('password');
+            p.type= "password";
+            p.value = password;
+        }
+    </script>
+@endpush

From fd8a1fb85188ef88b0fe38941f38df7304d65009 Mon Sep 17 00:00:00 2001
From: shivam kumar <shivam.kumar174@webkul.com>
Date: Fri, 18 Oct 2019 18:43:38 +0530
Subject: [PATCH 3/5] #1182 fixed

---
 .../Controllers/Shop/SessionController.php    |  4 +-
 .../views/users/sessions/create.blade.php     | 37 +-------
 .../Http/Controllers/OnepageController.php    | 30 ++++++-
 packages/Webkul/Shop/src/Http/routes.php      |  3 +
 .../Webkul/Shop/src/Resources/lang/en/app.php |  3 +-
 .../onepage/customer-checkout.blade.php       | 25 ++++++
 .../checkout/onepage/customer-info.blade.php  | 90 +++++++++++++++++--
 .../views/customers/session/index.blade.php   | 34 +------
 .../Http/Controllers/SessionController.php    |  2 +-
 9 files changed, 148 insertions(+), 80 deletions(-)
 create mode 100644 packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php

diff --git a/packages/Webkul/API/Http/Controllers/Shop/SessionController.php b/packages/Webkul/API/Http/Controllers/Shop/SessionController.php
index 0d6b83ce9..dc837f70e 100644
--- a/packages/Webkul/API/Http/Controllers/Shop/SessionController.php
+++ b/packages/Webkul/API/Http/Controllers/Shop/SessionController.php
@@ -40,7 +40,7 @@ class SessionController extends Controller
         auth()->setDefaultDriver($this->guard);
 
         $this->middleware('auth:' . $this->guard, ['only' => ['get', 'update', 'destroy']]);
-        
+
         $this->_config = request('_config');
 
         $this->customerRepository = $customerRepository;
@@ -69,7 +69,7 @@ class SessionController extends Controller
         Event::fire('customer.after.login', request()->input('email'));
 
         $customer = auth($this->guard)->user();
- 
+
         return response()->json([
             'token' => $jwtToken,
             'message' => 'Logged in successfully.',
diff --git a/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php
index 8d4ffdac1..a40568d70 100755
--- a/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php
@@ -25,7 +25,7 @@
 
                     <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
                         <label for="password">{{ __('admin::app.users.sessions.password') }}</label>
-                        <input type="password" v-validate="'required|min:6'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.sessions.password') }}&quot;" value="" onblur="hidePassword()" onfocus="showPassword()"/>
+                        <input type="password" v-validate="'required|min:6'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.sessions.password') }}&quot;" value=""/>
                         <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
                     </div>
 
@@ -44,37 +44,4 @@
 
     </div>
 
-@stop
-@push('javascript')
-    <script>
-        //default value of password
-        password = '';
-
-        //call the showPass function
-        function setPasswordBack(){
-            showPassword();
-        }
-
-        //hide password from user inspection
-        function hidePassword(){
-            var givenValue = "";
-            var i;
-            p = document.getElementById('password');
-            password = p.value;
-            passwordLength = password.length;
-
-            for (i = 0; i < passwordLength; i++) {
-                givenValue += "*";
-            }
-
-            p.value  = givenValue;
-        }
-
-        //show the given password
-        function showPassword(){
-            p = document.getElementById('password');
-            p.type= "password";
-            p.value = password;
-        }
-    </script>
-@endpush
\ No newline at end of file
+@stop
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
index 6e239f770..076291e05 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
@@ -11,6 +11,7 @@ use Webkul\Sales\Repositories\OrderRepository;
 use Webkul\Discount\Helpers\Cart\CouponAbleRule as Coupon;
 use Webkul\Discount\Helpers\Cart\NonCouponAbleRule as NonCoupon;
 use Webkul\Discount\Helpers\Cart\ValidatesDiscount;
+use Webkul\Customer\Repositories\CustomerRepository;
 
 /**
  * Chekout controller for the customer and guest for placing order
@@ -52,6 +53,11 @@ class OnepageController extends Controller
      */
     protected $validatesDiscount;
 
+     /**
+     * customerRepository instance object
+     */
+    protected $customerRepository;
+
     /**
      * Create a new controller instance.
      *
@@ -62,7 +68,8 @@ class OnepageController extends Controller
         OrderRepository $orderRepository,
         Coupon $coupon,
         NonCoupon $nonCoupon,
-        ValidatesDiscount $validatesDiscount
+        ValidatesDiscount $validatesDiscount,
+        CustomerRepository $customerRepository
     )
     {
         $this->coupon = $coupon;
@@ -73,6 +80,8 @@ class OnepageController extends Controller
 
         $this->validatesDiscount = $validatesDiscount;
 
+        $this->customerRepository = $customerRepository;
+
         $this->_config = request('_config');
     }
 
@@ -324,4 +333,23 @@ class OnepageController extends Controller
                 ], 422);
         }
     }
+
+    /**
+     * Check Customer is exist or not
+     *
+     * @return Response
+     */
+    public function checkExistCustomer()
+    {
+       //check customer is exist or not
+       $customer = $this->customerRepository->findOneWhere([
+        'email' => request()->email
+       ]);
+
+        //if customer is exist
+       if (! is_null($customer)) {
+           return 'true';
+       }
+       return 'false';
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index e47adbd1a..0293942cc 100755
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -165,6 +165,9 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
         //resend verification email
         Route::get('/resend/verification/{email}', 'Webkul\Customer\Http\Controllers\RegistrationController@resendVerificationEmail')->name('customer.resend.verification-email');
 
+        // for customer login checkout
+        Route::post('/custome/exist', 'Webkul\Shop\Http\Controllers\OnepageController@checkExistCustomer')->name('customer.checkout.exist');
+
         // Auth Routes
         Route::group(['middleware' => ['customer']], function () {
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 5b4798e78..cc7818ffd 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -494,7 +494,8 @@ return [
             'money-desc' => 'Money Transfer',
             'paypal-desc' => 'Paypal Standard',
             'free-desc' => 'This is a free shipping',
-            'flat-desc' => 'This is a flat rate'
+            'flat-desc' => 'This is a flat rate',
+            'password' => 'Password'
         ],
 
         'total' => [
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php
new file mode 100644
index 000000000..1bba5e59a
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php
@@ -0,0 +1,25 @@
+<div class="control-group" id="password" :class="[errors.has('address-form.password') ? 'has-error' : '']">
+    <label for="password" class="required">
+        {{ __('shop::app.checkout.onepage.password') }}
+    </label>
+
+    <input type="password" v-validate="'required|min:6'" class="control" id="password" name="password" v-model="address.billing.password" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.password') }}&quot;"/>
+
+    <span class="control-error" v-if="errors.has('address-form.password')">
+        @{{ errors.first('address-form.password') }}
+    </span>
+</div>
+
+<div class="control-group" id="login-and-forgot-btn" style="display:inline-block;">
+    <div class="forgot-password-link">
+        <a href="{{ route('customer.forgot-password.create') }}">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
+        <div class="mt-10">
+            @if (Cookie::has('enable-resend'))
+                @if (Cookie::get('enable-resend') == true)
+                    <a href="{{ route('customer.resend.verification-email', Cookie::get('email-for-resend')) }}">{{ __('shop::app.customer.login-form.resend-verification') }}</a>
+                @endif
+            @endif
+        </div>
+    </div>
+    <input type='button' id="" class="btn btn-primary btn-lg btn-login" value="{{ __('shop::app.customer.login-form.button_title') }}" />
+</div>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
index baa71d04d..47e64cd58 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
@@ -43,7 +43,7 @@
                     </ul>
                 </div>
             </div>
-
+            <div id="message"></div>
             <div class="control-group" :class="[errors.has('address-form.billing[address_id]') ? 'has-error' : '']">
                 <span class="control-error" v-if="errors.has('address-form.billing[address_id]')">
                     @{{ errors.first('address-form.billing[address_id]') }}
@@ -67,12 +67,6 @@
         <div class="form-header">
             <h1>{{ __('shop::app.checkout.onepage.billing-address') }}</h1>
 
-            @guest('customer')
-                <a class="btn btn-lg btn-primary" href="{{ route('customer.session.index') }}">
-                    {{ __('shop::app.checkout.onepage.sign-in') }}
-                </a>
-            @endguest
-
             @auth('customer')
                 @if(count(auth('customer')->user()->addresses))
                     <a class="btn btn-lg btn-primary" @click = backToSavedBillingAddress()>
@@ -118,6 +112,11 @@
             </span>
         </div>
 
+        {{--  for customer login checkout   --}}
+        @if (! auth()->guard('customer')->check())
+            @include('shop::checkout.onepage.customer-checkout')
+        @endif
+
         <div class="control-group" :class="[errors.has('address-form.billing[address1][]') ? 'has-error' : '']">
             <label for="billing_address_0" class="required">
                 {{ __('shop::app.checkout.onepage.address1') }}
@@ -454,3 +453,80 @@
     @endif
 
 </form>
+
+@push('scripts')
+    <script>
+        var CSRF_TOKEN = $('meta[name="csrf-token"]').attr('content');
+
+        $(document).ready(function() {
+            $("#password").hide();
+            $('#login-and-forgot-btn').hide();
+            $("[name='billing[email]']").on('blur', function() {
+                //get the given emai
+                var email = $("[name='billing[email]']").val();
+
+                $.ajax({
+                    /* the route pointing to the post function */
+                    url: '{{ route('customer.checkout.exist') }}',
+                    type: 'POST',
+
+                    /* send the csrf-token and the input to the controller with data */
+                    data: {'_token': CSRF_TOKEN,
+                            'email': email },
+                    dataType: 'JSON',
+
+                    /* remind that 'data' is the response of the OnePageController */
+                    success: function (data) {
+                        if (data == true) {
+                            $("#password").show();
+                            $('#login-and-forgot-btn').show();
+                        }
+                    }
+                });
+            });
+        });
+
+
+            $(document).ready(function() {
+                $('.btn-login').click(function(e) {
+                    var email = $("[name='billing[email]']").val();
+                    var password = $("[name='password']").val();
+                    event.preventDefault();
+                    $.ajax({
+
+                        /* the route pointing to the post function */
+                        url: '{{ url('/api/customer/login') }}',
+                        type: 'POST',
+
+                        /* send the csrf-token and the input to the controller with data */
+                        data: {'_token': CSRF_TOKEN,
+                                'email': email,
+                                'password': password
+                            },
+                        dataType: 'JSON',
+
+                        /* remind that 'data' is the response of the OnePageController */
+                        success: function (response) {
+
+                            if (response.data.email != '') {
+                                window.location.href = "{{ route('shop.checkout.onepage.index') }}";
+                            }
+                        },
+
+                        error: function (textStatus, err) {
+
+                            var appendData =  '<div class="alert alert-error"><span class="icon white-cross-sm-icon"></span><p>Please check your credentials and try again.</p></div>';
+                            $('.alert-wrapper').html('');
+                            $('.alert-wrapper').append(appendData);
+
+                            setTimeout(function () {
+                                $('.alert-error').hide();
+                            }, 5000);
+                            Success = false;//doesnt goes here
+                        }
+                    });
+                });
+            });
+    </script>
+
+@endpush
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
index bec8e1fd0..38bdbc9b1 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
@@ -28,7 +28,7 @@
 
                 <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
                     <label for="password" class="required">{{ __('shop::app.customer.login-form.password') }}</label>
-                    <input type="password" v-validate="'required|min:6'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.sessions.password') }}&quot;" value="" onblur="hidePassword()" onfocus="showPassword()"/>
+                    <input type="password" v-validate="'required|min:6'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.sessions.password') }}&quot;" value=""/>
                     <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
                 </div>
 
@@ -54,36 +54,4 @@
     </div>
 
 @stop
-@push('scripts')
-    <script>
-        //default value of password
-        password = '';
 
-        //call the showPass function
-        function setPasswordBack(){
-            showPassword();
-        }
-
-        //hide password from user inspection
-        function hidePassword(){
-            var givenValue = "";
-            var i;
-            p = document.getElementById('password');
-            password = p.value;
-            passwordLength = password.length;
-
-            for (i = 0; i < passwordLength; i++) {
-                givenValue += "*";
-            }
-
-            p.value  = givenValue;
-        }
-
-        //show the given password
-        function showPassword(){
-            p = document.getElementById('password');
-            p.type= "password";
-            p.value = password;
-        }
-    </script>
-@endpush
diff --git a/packages/Webkul/User/src/Http/Controllers/SessionController.php b/packages/Webkul/User/src/Http/Controllers/SessionController.php
index e35285d83..de5d7ab6c 100755
--- a/packages/Webkul/User/src/Http/Controllers/SessionController.php
+++ b/packages/Webkul/User/src/Http/Controllers/SessionController.php
@@ -36,7 +36,7 @@ class SessionController extends Controller
     /**
      * Show the form for creating a new resource.
      *
-     * @return \Illuminate\View\View 
+     * @return \Illuminate\View\View
      */
     public function create()
     {

From ce6766b30514e1a67ada44974fcff1572ce34c62 Mon Sep 17 00:00:00 2001
From: shivam kumar <shivam.kumar174@webkul.com>
Date: Mon, 21 Oct 2019 15:37:51 +0530
Subject: [PATCH 4/5] design changes and fixed minor issue

---
 packages/Webkul/Shop/src/Http/routes.php      |  2 +-
 .../Webkul/Shop/src/Resources/lang/en/app.php |  3 +-
 .../onepage/customer-checkout.blade.php       |  8 ++--
 .../checkout/onepage/customer-info.blade.php  | 39 ++++++++++---------
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index 0293942cc..86cef38c4 100755
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -166,7 +166,7 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
         Route::get('/resend/verification/{email}', 'Webkul\Customer\Http\Controllers\RegistrationController@resendVerificationEmail')->name('customer.resend.verification-email');
 
         // for customer login checkout
-        Route::post('/custome/exist', 'Webkul\Shop\Http\Controllers\OnepageController@checkExistCustomer')->name('customer.checkout.exist');
+        Route::post('/customer/exist', 'Webkul\Shop\Http\Controllers\OnepageController@checkExistCustomer')->name('customer.checkout.exist');
 
         // Auth Routes
         Route::group(['middleware' => ['customer']], function () {
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index cc7818ffd..deaf6cd83 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -495,7 +495,8 @@ return [
             'paypal-desc' => 'Paypal Standard',
             'free-desc' => 'This is a free shipping',
             'flat-desc' => 'This is a flat rate',
-            'password' => 'Password'
+            'password' => 'Password',
+            'login-exist-message' => 'You already have an account with us, Sign in or continue as guest.'
         ],
 
         'total' => [
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php
index 1bba5e59a..c3ad89f1d 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php
@@ -7,11 +7,13 @@
 
     <span class="control-error" v-if="errors.has('address-form.password')">
         @{{ errors.first('address-form.password') }}
-    </span>
+    </span> <br>
+    <span>{{ __('shop::app.checkout.onepage.login-exist-message') }}</span>
 </div>
 
-<div class="control-group" id="login-and-forgot-btn" style="display:inline-block;">
-    <div class="forgot-password-link">
+
+<div class="control-group" id="login-and-forgot-btn">
+    <div class="forgot-password-link"  style="float: right;margin-right: 503px; margin-top: 11px;">
         <a href="{{ route('customer.forgot-password.create') }}">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
         <div class="mt-10">
             @if (Cookie::has('enable-resend'))
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
index 47e64cd58..207531665 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
@@ -76,6 +76,23 @@
             @endauth
         </div>
 
+        <div class="control-group" :class="[errors.has('address-form.billing[email]') ? 'has-error' : '']">
+            <label for="billing[email]" class="required">
+                {{ __('shop::app.checkout.onepage.email') }}
+            </label>
+
+            <input type="text" v-validate="'required|email'" class="control" id="billing[email]" name="billing[email]" v-model="address.billing.email" 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>
+
+        {{--  for customer login checkout   --}}
+        @if (! auth()->guard('customer')->check())
+            @include('shop::checkout.onepage.customer-checkout')
+        @endif
+
         <div class="control-group" :class="[errors.has('address-form.billing[first_name]') ? 'has-error' : '']">
             <label for="billing[first_name]" class="required">
                 {{ __('shop::app.checkout.onepage.first-name') }}
@@ -100,23 +117,6 @@
             </span>
         </div>
 
-        <div class="control-group" :class="[errors.has('address-form.billing[email]') ? 'has-error' : '']">
-            <label for="billing[email]" class="required">
-                {{ __('shop::app.checkout.onepage.email') }}
-            </label>
-
-            <input type="text" v-validate="'required|email'" class="control" id="billing[email]" name="billing[email]" v-model="address.billing.email" 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>
-
-        {{--  for customer login checkout   --}}
-        @if (! auth()->guard('customer')->check())
-            @include('shop::checkout.onepage.customer-checkout')
-        @endif
-
         <div class="control-group" :class="[errors.has('address-form.billing[address1][]') ? 'has-error' : '']">
             <label for="billing_address_0" class="required">
                 {{ __('shop::app.checkout.onepage.address1') }}
@@ -480,7 +480,10 @@
                         if (data == true) {
                             $("#password").show();
                             $('#login-and-forgot-btn').show();
-                        }
+                        } else {
+                            $("#password").hide();
+                            $('#login-and-forgot-btn').hide();
+                            }
                     }
                 });
             });

From 101785cbf71769bdf24b8baaffe68b0857dd818c Mon Sep 17 00:00:00 2001
From: shivam kumar <shivam.kumar174@webkul.com>
Date: Wed, 23 Oct 2019 13:06:34 +0530
Subject: [PATCH 5/5] minor chanegs

---
 .../Http/Controllers/OnepageController.php    | 18 +++++++
 packages/Webkul/Shop/src/Http/routes.php      |  3 ++
 .../checkout/onepage/customer-info.blade.php  | 51 +++++++++----------
 3 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
index 076291e05..bf75dde2c 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
@@ -352,4 +352,22 @@ class OnepageController extends Controller
        }
        return 'false';
     }
+
+    //login for checkout
+    public function loginForCheckout()
+    {
+        $this->validate(request(), [
+            'email' => 'required|email',
+            'password' => 'required'
+        ]);
+
+        if (! auth()->guard('customer')->attempt(request(['email', 'password']))) {
+            return response()->json(['error' => trans('shop::app.customer.login-form.invalid-creds')]);
+        }
+
+        //Event passed to prepare cart after login
+        Cart::mergeCart();
+
+        return response()->json(['success' => 'Login successfully']);
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index 86cef38c4..f8d954e3b 100755
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -168,6 +168,9 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
         // for customer login checkout
         Route::post('/customer/exist', 'Webkul\Shop\Http\Controllers\OnepageController@checkExistCustomer')->name('customer.checkout.exist');
 
+        // for customer login checkout
+        Route::post('/customer/checkout/login', 'Webkul\Shop\Http\Controllers\OnepageController@loginForCheckout')->name('customer.checkout.login');
+
         // Auth Routes
         Route::group(['middleware' => ['customer']], function () {
 
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
index 207531665..e3cbc0835 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
@@ -456,6 +456,7 @@
 
 @push('scripts')
     <script>
+
         var CSRF_TOKEN = $('meta[name="csrf-token"]').attr('content');
 
         $(document).ready(function() {
@@ -489,47 +490,43 @@
             });
         });
 
+        $(document).ready(function() {
+            $('.btn-login').click(function(e) {
+                var email = $("[name='billing[email]']").val();
+                var password = $("[name='password']").val();
+                event.preventDefault();
+                $.ajax({
 
-            $(document).ready(function() {
-                $('.btn-login').click(function(e) {
-                    var email = $("[name='billing[email]']").val();
-                    var password = $("[name='password']").val();
-                    event.preventDefault();
-                    $.ajax({
+                    /* the route pointing to the post function */
+                    url: '{{ route('customer.checkout.login') }}',
+                    type: 'POST',
 
-                        /* the route pointing to the post function */
-                        url: '{{ url('/api/customer/login') }}',
-                        type: 'POST',
-
-                        /* send the csrf-token and the input to the controller with data */
-                        data: {'_token': CSRF_TOKEN,
-                                'email': email,
-                                'password': password
-                            },
-                        dataType: 'JSON',
-
-                        /* remind that 'data' is the response of the OnePageController */
-                        success: function (response) {
-
-                            if (response.data.email != '') {
-                                window.location.href = "{{ route('shop.checkout.onepage.index') }}";
-                            }
+                    /* send the csrf-token and the input to the controller with data */
+                    data: {'_token': CSRF_TOKEN,
+                            'email': email,
+                            'password': password
                         },
+                    dataType: 'JSON',
 
-                        error: function (textStatus, err) {
+                    /* remind that 'data' is the response of the OnePageController */
+                    success: function (response) {
 
-                            var appendData =  '<div class="alert alert-error"><span class="icon white-cross-sm-icon"></span><p>Please check your credentials and try again.</p></div>';
+                        if (response.success) {
+                            window.location.href = "{{ route('shop.checkout.onepage.index') }}";
+                        } else {
+                            var appendData =  '<div class="alert alert-error"><span class="icon white-cross-sm-icon"></span><p>'+response.error+'</p></div>';
                             $('.alert-wrapper').html('');
                             $('.alert-wrapper').append(appendData);
 
                             setTimeout(function () {
                                 $('.alert-error').hide();
                             }, 5000);
-                            Success = false;//doesnt goes here
+                            Success = false;
                         }
-                    });
+                    },
                 });
             });
+        });
     </script>
 
 @endpush