Merge pull request #2187 from jitendra-webkul/1.0

Issue #2182 fixed
This commit is contained in:
Jitendra Singh 2020-01-28 19:03:14 +05:30 committed by GitHub
commit 9ccc8b26c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 1 deletions

View File

@ -760,6 +760,7 @@ return [
'state' => 'State',
'select-state' => 'اختر منطقة أو ولاية أو مقاطعة.',
'country' => 'Country',
'other' => 'Other',
'male' => 'Male',
'female' => 'Female',
'phone' => 'Phone',

View File

@ -918,6 +918,7 @@ return [
'state' => 'State',
'select-state' => 'Select a region, state or province.',
'country' => 'Country',
'other' => 'Other',
'male' => 'Male',
'female' => 'Female',
'phone' => 'Phone',

View File

@ -802,6 +802,7 @@ return [
'state' => 'استان',
'select-state' => 'یک منطقه ، ایالت یا استان را انتخاب کنید.',
'country' => 'کشور',
'other' => 'Other',
'male' => 'مرد',
'female' => 'زن',
'group-default' => 'نمی توان گروه پیش فرض را حذف کرد.',

View File

@ -791,6 +791,7 @@ return [
'state' => 'Estado',
'select-state' => 'Selecione uma região, estado ou província.',
'country' => 'País',
'other' => 'Other',
'male' => 'Masculino',
'female' => 'Feminino',
'phone' => 'Telefone',

View File

@ -67,7 +67,7 @@
<span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
</div>
@include ('shop::customers.account.address.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state])
@include ('admin::customers.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state])
<div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
<label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>

View File

@ -52,6 +52,7 @@
<div class="control-group" :class="[errors.has('gender') ? 'has-error' : '']">
<label for="gender" class="required">{{ __('admin::app.customers.customers.gender') }}</label>
<select name="gender" class="control" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customers.customers.gender') }}&quot;">
<option value="Other">{{ __('admin::app.customers.customers.other') }}</option>
<option value="Male">{{ __('admin::app.customers.customers.male') }}</option>
<option value="Female">{{ __('admin::app.customers.customers.female') }}</option>
</select>

View File

@ -58,6 +58,7 @@
<div class="control-group">
<label for="gender" class="required">{{ __('admin::app.customers.customers.gender') }}</label>
<select name="gender" class="control" value="{{ $customer->gender }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customers.customers.gender') }}&quot;">
<option value="Other" {{ $customer->gender == "Other" ? 'selected' : '' }}>{{ __('admin::app.customers.customers.other') }}</option>
<option value="Male" {{ $customer->gender == "Male" ? 'selected' : '' }}>{{ __('admin::app.customers.customers.male') }}</option>
<option value="Female" {{ $customer->gender == "Female" ? 'selected' : '' }}>{{ __('admin::app.customers.customers.female') }}</option>
</select>