From 9b83fb8025914a50dd82b13bcade98442eb714e0 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Thu, 27 Jun 2019 16:14:24 +0530
Subject: [PATCH] Fixed issue #1080

---
 .../Resources/views/promotions/cart-rule/create.blade.php  | 4 ++--
 .../Customer/src/Http/Middleware/RedirectIfNotCustomer.php | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php
index e15794bd7..933d49dd7 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php
@@ -12,7 +12,7 @@
 
     @push('scripts')
         <script type="text/x-template" id="cart-rule-form-template">
-            <form method="POST" action="{{ route('admin.cart-rule.store') }}" @submit.prevent="onSubmit">
+            <form method="POST" action="{{ route('admin.cart-rule.store') }}" @submit.prevent="onSubmit" autocomplete="off">
                 @csrf
 
                 <div class="page-header">
@@ -68,7 +68,7 @@
                                         <div class="control-group" :class="[errors.has('ends_till') ? 'has-error' : '']">
                                             <label for="ends_till">{{ __('admin::app.promotion.general-info.ends-till') }}</label>
 
-                                            <input type="text" class="control" v-model="ends_till" name="ends_till" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.ends-till') }}&quot;">
+                                            <input type="text" class="control" v-model="ends_till" v-validate="'after:starts_from'" name="ends_till" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.ends-till') }}&quot;">
 
                                             <span class="control-error" v-if="errors.has('ends_till')">@{{ errors.first('ends_till') }}</span>
                                         </div>
diff --git a/packages/Webkul/Customer/src/Http/Middleware/RedirectIfNotCustomer.php b/packages/Webkul/Customer/src/Http/Middleware/RedirectIfNotCustomer.php
index 797dc81b8..38adeb4e3 100755
--- a/packages/Webkul/Customer/src/Http/Middleware/RedirectIfNotCustomer.php
+++ b/packages/Webkul/Customer/src/Http/Middleware/RedirectIfNotCustomer.php
@@ -19,6 +19,13 @@ class RedirectIfNotCustomer
     {
         if (! Auth::guard($guard)->check()) {
             return redirect()->route('customer.session.index');
+        } else {
+            if (Auth::guard($guard)->user()->status == 0) {
+                Auth::guard($guard)->logout();
+
+                session()->flash('warning', trans('shop::app.customer.login-form.not-activated'));
+                return redirect()->route('customer.session.index');
+            }
         }
 
         return $next($request);