Merge pull request #2276 from CihanSenturk/master

Select remote dynamic placeholder
This commit is contained in:
Cüneyt Şentürk 2021-10-06 10:38:36 +03:00 committed by GitHub
commit 3738c64430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 13 deletions

View File

@ -29,7 +29,7 @@
{{ Form::textGroup('phone', trans('settings.company.phone'), 'phone', [], setting('company.phone')) }} {{ Form::textGroup('phone', trans('settings.company.phone'), 'phone', [], setting('company.phone')) }}
{{ Form::textareaGroup('address', trans('general.address')) }} {{ Form::textareaGroup('address', trans('general.address'), '', '', ['rows' => '2', 'v-model' => 'form.address']) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', [], setting('company.city')) }} {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', [], setting('company.city')) }}
@ -37,7 +37,7 @@
{{ Form::textGroup('state', trans('general.state'), 'city', [], setting('company.state')) }} {{ Form::textGroup('state', trans('general.state'), 'city', [], setting('company.state')) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }} {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), ['model' => 'form.country']) }}
{{ Form::fileGroup('logo', trans('companies.logo'), '', ['dropzone-class' => 'form-file']) }} {{ Form::fileGroup('logo', trans('companies.logo'), '', ['dropzone-class' => 'form-file']) }}

View File

@ -30,7 +30,7 @@
{{ Form::textGroup('phone', trans('settings.company.phone'), 'phone', [], $company->phone) }} {{ Form::textGroup('phone', trans('settings.company.phone'), 'phone', [], $company->phone) }}
{{ Form::textareaGroup('address', trans('general.address')) }} {{ Form::textareaGroup('address', trans('general.address'), '', $company->address, ['rows' => '2', 'v-model' => 'form.address']) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }} {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}
@ -38,7 +38,7 @@
{{ Form::textGroup('state', trans('general.state'), 'city', []) }} {{ Form::textGroup('state', trans('general.state'), 'city', []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $company->country, []) }} {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $company->country, ['model' => 'form.country']) }}
{{ Form::fileGroup('logo', trans('companies.logo'), '', ['dropzone-class' => 'form-file'], $company->company_logo) }} {{ Form::fileGroup('logo', trans('companies.logo'), '', ['dropzone-class' => 'form-file'], $company->company_logo) }}

View File

@ -13,7 +13,13 @@
icon="{{ $icon }}" icon="{{ $icon }}"
title="{{ $text }}" title="{{ $text }}"
@if (isset($attributes['placeholder']))
placeholder="{{ $attributes['placeholder'] }}"
@else
placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}" placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
@endif
name="{{ $name }}" name="{{ $name }}"
:options="{{ json_encode($values) }}" :options="{{ json_encode($values) }}"
@ -48,7 +54,7 @@
@if (!empty($attributes['visible-change'])) @if (!empty($attributes['visible-change']))
@visible-change="{{ $attributes['visible-change'] }}" @visible-change="{{ $attributes['visible-change'] }}"
@endif @endif
@if (isset($attributes['readonly'])) @if (isset($attributes['readonly']))
:readonly="{{ $attributes['readonly'] }}" :readonly="{{ $attributes['readonly'] }}"
@endif @endif

View File

@ -29,7 +29,7 @@
{{ Form::textGroup('website', trans('general.website'), 'globe', []) }} {{ Form::textGroup('website', trans('general.website'), 'globe', []) }}
{{ Form::textareaGroup('address', trans('general.address')) }} {{ Form::textareaGroup('address', trans('general.address'), '', '', ['rows' => '2', 'v-model' => 'form.address']) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }} {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}
@ -37,7 +37,7 @@
{{ Form::textGroup('state', trans('general.state'), 'city', []) }} {{ Form::textGroup('state', trans('general.state'), 'city', []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }} {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), ['model' => 'form.country']) }}
{{ Form::fileGroup('logo', trans_choice('general.pictures', 1), '', ['dropzone-class' => 'form-file']) }} {{ Form::fileGroup('logo', trans_choice('general.pictures', 1), '', ['dropzone-class' => 'form-file']) }}

View File

@ -30,7 +30,7 @@
{{ Form::textGroup('website', trans('general.website'), 'globe',[]) }} {{ Form::textGroup('website', trans('general.website'), 'globe',[]) }}
{{ Form::textareaGroup('address', trans('general.address')) }} {{ Form::textareaGroup('address', trans('general.address'), '', $vendor->address, ['rows' => '2', 'v-model' => 'form.address']) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }} {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}
@ -38,7 +38,7 @@
{{ Form::textGroup('state', trans('general.state'), 'city', []) }} {{ Form::textGroup('state', trans('general.state'), 'city', []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $vendor->country, []) }} {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $vendor->country, ['model' => 'form.country']) }}
{{ Form::fileGroup('logo', trans_choice('general.logos', 1), '', ['dropzone-class' => 'form-file']) }} {{ Form::fileGroup('logo', trans_choice('general.logos', 1), '', ['dropzone-class' => 'form-file']) }}

View File

@ -30,7 +30,7 @@
{{ Form::textGroup('website', trans('general.website'), 'globe', []) }} {{ Form::textGroup('website', trans('general.website'), 'globe', []) }}
{{ Form::textareaGroup('address', trans('general.address')) }} {{ Form::textareaGroup('address', trans('general.address'), '', '', ['rows' => '2', 'v-model' => 'form.address']) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }} {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}
@ -38,7 +38,7 @@
{{ Form::textGroup('state', trans('general.state'), 'city', []) }} {{ Form::textGroup('state', trans('general.state'), 'city', []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), []) }} {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), setting('company.country'), ['model' => 'form.country']) }}
{{ Form::textGroup('reference', trans('general.reference'), 'file', []) }} {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}

View File

@ -29,7 +29,7 @@
{{ Form::textGroup('website', trans('general.website'), 'globe',[]) }} {{ Form::textGroup('website', trans('general.website'), 'globe',[]) }}
{{ Form::textareaGroup('address', trans('general.address')) }} {{ Form::textareaGroup('address', trans('general.address'), '', $customer->address, ['rows' => '2', 'v-model' => 'form.address']) }}
{{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }} {{ Form::textGroup('city', trans_choice('general.cities', 1), 'city', []) }}
@ -37,7 +37,7 @@
{{ Form::textGroup('state', trans('general.state'), 'city', []) }} {{ Form::textGroup('state', trans('general.state'), 'city', []) }}
{{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $customer->country, []) }} {{ Form::selectGroup('country', trans_choice('general.countries', 1), 'globe-americas', trans('countries'), $customer->country, ['model' => 'form.country']) }}
{{ Form::textGroup('reference', trans('general.reference'), 'file', []) }} {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}