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

Merge pull request #2312 from rahulshukla-webkul/development 

Issue #2297
This commit is contained in:
Jitendra Singh 2020-02-06 13:32:36 +05:30 committed by GitHub
parent ff4af0f838 570ce2610d
commit 64666a62c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
View File

@ -44,17 +44,11 @@
<span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
</div>
<div class="control-group {!! $errors->has('vat_id') ? 'has-error' : '' !!}">
<div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
<label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}</label>
<input type="text" class="control" name="vat_id"
value="<?= old('vat_id'); ?>"
data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
<span class="control-error" v-if="{!! $errors->has('vat_id') !!}">
@foreach ($errors->get('vat_id') as $message)
{{ $message }}
@endforeach
</span>
<input type="text" class="control" name="vat_id" value="{{ old('vat_id') }}"
v-validate="''" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
<span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
</div>
<div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">

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

@ -45,17 +45,11 @@
<span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
</div>
<div class="control-group {!! $errors->has('vat_id') ? 'has-error' : '' !!}">
<div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
<label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}</label>
<input type="text" class="control" name="vat_id"
value="{{ $address->vat_id }}"
data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
<span class="control-error" v-if="{!! $errors->has('vat_id') !!}">
@foreach ($errors->get('vat_id') as $message)
{{ $message }}
@endforeach
</span>
<input type="text" class="control" name="vat_id" value="{{ $address->vat_id }}" value="{{ old('vat_id') ?: $address->vat_id }}"
v-validate="''" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
<span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
</div>
<?php $addresses = explode(PHP_EOL, $address->address1); ?>

4
packages/Webkul/Velocity/src/Resources/views/shop/products/list/recently-viewed.blade.php
View File

@ -40,12 +40,12 @@
class="fs18 card-current-price fw6">
</div>
<star-ratings
<star-ratings v-if="product.rating > 0"
push-class="display-inbl"
:ratings="product.rating">
</star-ratings>
<span class="fs16 text-nowrap align-text-bottom">@{{ product.totalReviews }} Reviews</span>
<span class="fs16 text-nowrap align-text-bottom" v-if="product.rating > 0">@{{ product.totalReviews }} Reviews</span>
</a>
</div>
</div>