From 9dcfaf7d0a6c4c6792b8b5008d256b6bf670b8f1 Mon Sep 17 00:00:00 2001
From: mohammad asif <asif201994@gmail.com>
Date: Thu, 2 Jul 2020 13:23:49 +0530
Subject: [PATCH 1/2] fixed issue 3381 city does not allowed hyphen

---
 .../Resources/views/customers/account/address/edit.blade.php    | 2 +-
 .../views/shop/customers/account/address/edit.blade.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
index 83a02bacc..3d08ec0ec 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
@@ -86,7 +86,7 @@
 
                     <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
                         <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
-                        <input type="text" class="control" name="city" v-validate="'required|alpha_spaces'" value="{{ old('city') ?: $address->city }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
+                        <input type="text" class="control" name="city" v-validate="'required|regex:^[a-zA-Z \-]*$'" value="{{ old('city') ?: $address->city }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
                         <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
                     </div>
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
index dd22f307f..e4c168e26 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
@@ -79,7 +79,7 @@
 
             <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
                 <label for="city" class="mandatory">{{ __('shop::app.customer.account.address.create.city') }}</label>
-                <input type="text" class="control" name="city" value="{{ old('city') ?? $address->city }}" v-validate="'required|alpha_spaces'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
+                <input type="text" class="control" name="city" value="{{ old('city') ?? $address->city }}" v-validate="'required|regex:^[a-zA-Z \-]*$'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
                 <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
             </div>
 

From 00b9f4862cf2db310ada10f22baaa6ac5c37c68a Mon Sep 17 00:00:00 2001
From: mohammad asif <asif201994@gmail.com>
Date: Thu, 2 Jul 2020 13:28:02 +0530
Subject: [PATCH 2/2] fixed issue 3311 filter disapear on zero product

---
 .../Velocity/src/Resources/views/shop/products/index.blade.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/index.blade.php
index d9d7087b7..04e75242d 100755
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/index.blade.php
@@ -91,7 +91,7 @@
 
                 @if ($isProductsDisplayMode)
                     <div class="filters-container">
-                        <template v-if="products.length > 0">
+                        <template v-if="products.length >= 0">
                             @include ('shop::products.list.toolbar')
                         </template>
                     </div>