From 05df88595fc8a405bcf7355185a430f75744603a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= Date: Wed, 6 Oct 2021 10:29:08 +0300 Subject: [PATCH 1/3] select remote placeholder dynamic --- .../views/partials/form/select_remote_group.blade.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/views/partials/form/select_remote_group.blade.php b/resources/views/partials/form/select_remote_group.blade.php index 29a6c522c..cb02b1853 100644 --- a/resources/views/partials/form/select_remote_group.blade.php +++ b/resources/views/partials/form/select_remote_group.blade.php @@ -13,7 +13,13 @@ icon="{{ $icon }}" title="{{ $text }}" + + @if (isset($attributes['placeholder'])) + placeholder="{{ $attributes['placeholder'] }}" + @else placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}" + @endif + name="{{ $name }}" :options="{{ json_encode($values) }}" @@ -48,7 +54,7 @@ @if (!empty($attributes['visible-change'])) @visible-change="{{ $attributes['visible-change'] }}" @endif - + @if (isset($attributes['readonly'])) :readonly="{{ $attributes['readonly'] }}" @endif From 6ecc518c58a93b52d9035c0547cb9afc30c35a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= Date: Wed, 6 Oct 2021 10:30:16 +0300 Subject: [PATCH 2/3] address fields data dynamic --- resources/views/common/companies/create.blade.php | 2 +- resources/views/common/companies/edit.blade.php | 2 +- resources/views/purchases/vendors/create.blade.php | 2 +- resources/views/purchases/vendors/edit.blade.php | 2 +- resources/views/sales/customers/create.blade.php | 2 +- resources/views/sales/customers/edit.blade.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/common/companies/create.blade.php b/resources/views/common/companies/create.blade.php index 63f1ceab5..dd297e46d 100644 --- a/resources/views/common/companies/create.blade.php +++ b/resources/views/common/companies/create.blade.php @@ -29,7 +29,7 @@ {{ 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')) }} diff --git a/resources/views/common/companies/edit.blade.php b/resources/views/common/companies/edit.blade.php index 7802aa0af..42c4aff5f 100644 --- a/resources/views/common/companies/edit.blade.php +++ b/resources/views/common/companies/edit.blade.php @@ -30,7 +30,7 @@ {{ 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', []) }} diff --git a/resources/views/purchases/vendors/create.blade.php b/resources/views/purchases/vendors/create.blade.php index 060554682..0e14d176d 100644 --- a/resources/views/purchases/vendors/create.blade.php +++ b/resources/views/purchases/vendors/create.blade.php @@ -29,7 +29,7 @@ {{ 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', []) }} diff --git a/resources/views/purchases/vendors/edit.blade.php b/resources/views/purchases/vendors/edit.blade.php index 6cf0e3c17..e773babe5 100644 --- a/resources/views/purchases/vendors/edit.blade.php +++ b/resources/views/purchases/vendors/edit.blade.php @@ -30,7 +30,7 @@ {{ 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', []) }} diff --git a/resources/views/sales/customers/create.blade.php b/resources/views/sales/customers/create.blade.php index c81bb236b..f10402940 100644 --- a/resources/views/sales/customers/create.blade.php +++ b/resources/views/sales/customers/create.blade.php @@ -30,7 +30,7 @@ {{ 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', []) }} diff --git a/resources/views/sales/customers/edit.blade.php b/resources/views/sales/customers/edit.blade.php index caf8a318a..f3cb8e8f4 100644 --- a/resources/views/sales/customers/edit.blade.php +++ b/resources/views/sales/customers/edit.blade.php @@ -29,7 +29,7 @@ {{ 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', []) }} From 5e13cc8d6a386d918c4e38db85b2cce0f94a9fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= Date: Wed, 6 Oct 2021 10:31:45 +0300 Subject: [PATCH 3/3] country fields data dynamic --- resources/views/common/companies/create.blade.php | 2 +- resources/views/common/companies/edit.blade.php | 2 +- resources/views/purchases/vendors/create.blade.php | 2 +- resources/views/purchases/vendors/edit.blade.php | 2 +- resources/views/sales/customers/create.blade.php | 2 +- resources/views/sales/customers/edit.blade.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/common/companies/create.blade.php b/resources/views/common/companies/create.blade.php index dd297e46d..01d83ac48 100644 --- a/resources/views/common/companies/create.blade.php +++ b/resources/views/common/companies/create.blade.php @@ -37,7 +37,7 @@ {{ 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']) }} diff --git a/resources/views/common/companies/edit.blade.php b/resources/views/common/companies/edit.blade.php index 42c4aff5f..dba526ff1 100644 --- a/resources/views/common/companies/edit.blade.php +++ b/resources/views/common/companies/edit.blade.php @@ -38,7 +38,7 @@ {{ 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) }} diff --git a/resources/views/purchases/vendors/create.blade.php b/resources/views/purchases/vendors/create.blade.php index 0e14d176d..2227b4514 100644 --- a/resources/views/purchases/vendors/create.blade.php +++ b/resources/views/purchases/vendors/create.blade.php @@ -37,7 +37,7 @@ {{ 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']) }} diff --git a/resources/views/purchases/vendors/edit.blade.php b/resources/views/purchases/vendors/edit.blade.php index e773babe5..15e015c70 100644 --- a/resources/views/purchases/vendors/edit.blade.php +++ b/resources/views/purchases/vendors/edit.blade.php @@ -38,7 +38,7 @@ {{ 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']) }} diff --git a/resources/views/sales/customers/create.blade.php b/resources/views/sales/customers/create.blade.php index f10402940..6cc03e8d3 100644 --- a/resources/views/sales/customers/create.blade.php +++ b/resources/views/sales/customers/create.blade.php @@ -38,7 +38,7 @@ {{ 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', []) }} diff --git a/resources/views/sales/customers/edit.blade.php b/resources/views/sales/customers/edit.blade.php index f3cb8e8f4..3e4df1e17 100644 --- a/resources/views/sales/customers/edit.blade.php +++ b/resources/views/sales/customers/edit.blade.php @@ -37,7 +37,7 @@ {{ 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', []) }}