close #1611 Fixed: Not able to login using customer email
This commit is contained in:
parent
9d6696187c
commit
d7af10fe54
@ -11,7 +11,7 @@
|
|||||||
formClasses
|
formClasses
|
||||||
]"
|
]"
|
||||||
:error="formError">
|
:error="formError">
|
||||||
<el-select v-model="real_model" @input="change" disabled filterable v-if="disabled"
|
<el-select v-model="real_model" @input="change" disabled filterable v-if="disabled && !multiple"
|
||||||
remote
|
remote
|
||||||
reserve-keyword
|
reserve-keyword
|
||||||
:placeholder="placeholder"
|
:placeholder="placeholder"
|
||||||
@ -165,6 +165,83 @@
|
|||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
|
||||||
|
<el-select v-model="real_model" @input="change" filterable v-if="disabled && multiple && !collapse" multiple disabled
|
||||||
|
remote
|
||||||
|
reserve-keyword
|
||||||
|
:placeholder="placeholder"
|
||||||
|
:remote-method="remoteMethod"
|
||||||
|
:loading="loading">
|
||||||
|
<div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
|
||||||
|
<p class="el-select-dropdown__empty">
|
||||||
|
{{ noMatchingDataText }}
|
||||||
|
</p>
|
||||||
|
<ul class="el-scrollbar__view el-select-dropdown__list">
|
||||||
|
<li class="el-select-dropdown__item el-select__footer">
|
||||||
|
<div @click="onAddItem">
|
||||||
|
<i class="fas fa-plus"></i>
|
||||||
|
<span>
|
||||||
|
{{ add_new_text }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else-if="addNew.status && options.length == 0" slot="empty">
|
||||||
|
<p class="el-select-dropdown__empty">
|
||||||
|
{{ noDataText }}
|
||||||
|
</p>
|
||||||
|
<ul class="el-scrollbar__view el-select-dropdown__list">
|
||||||
|
<li class="el-select-dropdown__item el-select__footer">
|
||||||
|
<div @click="onAddItem">
|
||||||
|
<i class="fas fa-plus"></i>
|
||||||
|
<span>
|
||||||
|
{{ add_new_text }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<template slot="prefix">
|
||||||
|
<span class="el-input__suffix-inner el-select-icon">
|
||||||
|
<i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<el-option v-if="!group" v-for="(label, value) in selectOptions"
|
||||||
|
:key="value"
|
||||||
|
:label="label"
|
||||||
|
:value="value">
|
||||||
|
<span class="float-left">{{ label }}</span>
|
||||||
|
<span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
|
||||||
|
</el-option>
|
||||||
|
|
||||||
|
<el-option-group
|
||||||
|
v-if="group"
|
||||||
|
v-for="(options, name) in selectOptions"
|
||||||
|
:key="name"
|
||||||
|
:label="name">
|
||||||
|
<el-option
|
||||||
|
v-for="(label, value) in options"
|
||||||
|
:key="value"
|
||||||
|
:label="label"
|
||||||
|
:value="value">
|
||||||
|
<span class="float-left">{{ label }}</span>
|
||||||
|
<span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
|
||||||
|
</el-option>
|
||||||
|
</el-option-group>
|
||||||
|
|
||||||
|
<el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
|
||||||
|
<div @click="onAddItem">
|
||||||
|
<i class="fas fa-plus"></i>
|
||||||
|
<span>
|
||||||
|
{{ add_new_text }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</el-option>
|
||||||
|
</el-select>
|
||||||
|
|
||||||
<el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && !collapse" multiple
|
<el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && !collapse" multiple
|
||||||
remote
|
remote
|
||||||
reserve-keyword
|
reserve-keyword
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
@endif
|
@endif
|
||||||
|
|
||||||
@permission('read-common-companies')
|
@permission('read-common-companies')
|
||||||
{{ Form::multiSelectRemoteGroup('companies', trans_choice('general.companies', 2), 'user', $companies, $user->company_ids, ['required' => 'required', 'remote_action' => route('companies.autocomplete'), 'remote_type' => 'company']) }}
|
{{ Form::multiSelectRemoteGroup('companies', trans_choice('general.companies', 2), 'user', $companies, $user->company_ids, ['required' => 'required', 'disabled' => (in_array('customer', $user->roles()->pluck('name')->toArray())) ? 'true' : 'false', 'remote_action' => route('companies.autocomplete'), 'remote_type' => 'company']) }}
|
||||||
@endpermission
|
@endpermission
|
||||||
|
|
||||||
@permission('read-auth-roles')
|
@permission('read-auth-roles')
|
||||||
|
@ -55,7 +55,10 @@
|
|||||||
|
|
||||||
remote-action="{{ $attributes['remote_action'] }}"
|
remote-action="{{ $attributes['remote_action'] }}"
|
||||||
remote-type="'{{ $attributes['remote_type'] }}"
|
remote-type="'{{ $attributes['remote_type'] }}"
|
||||||
|
|
||||||
|
@if (!empty($attributes['currecny_code']))
|
||||||
currency-code="{{ $attributes['currecny_code'] }}"
|
currency-code="{{ $attributes['currecny_code'] }}"
|
||||||
|
@endif
|
||||||
|
|
||||||
loading-text="{{ trans('general.loading') }}"
|
loading-text="{{ trans('general.loading') }}"
|
||||||
no-data-text="{{ trans('general.no_data') }}"
|
no-data-text="{{ trans('general.no_data') }}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user