merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3403 from asif-webkul/master 

fixed issue #3381 and #3311
This commit is contained in:
Jitendra Singh 2020-07-03 11:41:02 +05:30 committed by GitHub
parent 2dde970fb7 00b9f4862c
commit 2b8a7003be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
View File

@ -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>

2
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
View File

@ -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>

2
packages/Webkul/Velocity/src/Resources/views/shop/products/index.blade.php
View File

@ -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>