Merge branch 'akaunting:master' into master
This commit is contained in:
@@ -6,7 +6,6 @@
|
||||
add-new
|
||||
path="{{ $path }}"
|
||||
|
||||
add-new
|
||||
name="{{ $name }}"
|
||||
label="{!! $label !!}"
|
||||
:options="$contacts"
|
||||
@@ -26,7 +25,6 @@
|
||||
add-new
|
||||
path="{{ $path }}"
|
||||
|
||||
add-new
|
||||
name="{{ $name }}"
|
||||
label="{!! $label !!}"
|
||||
:options="$contacts"
|
||||
|
||||
@@ -47,6 +47,24 @@
|
||||
:dynamic-options="{{ $attributes['dynamicOptions'] }}"
|
||||
@endif
|
||||
|
||||
@if (! empty($attributes['searchable']))
|
||||
searchable
|
||||
@elseif (! empty($searchable))
|
||||
searchable
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['fullOptions']) || isset($attributes['full-options']))
|
||||
:full-options="{{ json_encode(! empty($attributes['fullOptions']) ? $attributes['fullOptions'] : $attributes['full-options']) }}"
|
||||
@else
|
||||
:full-options="{{ json_encode($fullOptions) }}"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['searchText']) || isset($attributes['search-text']))
|
||||
search-text="{{ ! empty($attributes['searchText']) ? $attributes['searchText'] : $attributes['search-text'] }}"
|
||||
@else
|
||||
search-text="{{ $searchText }}"
|
||||
@endif
|
||||
|
||||
@if (empty($multiple))
|
||||
@if (isset($selected) || old($name))
|
||||
value="{{ old($name, $selected) }}"
|
||||
|
||||
@@ -47,6 +47,24 @@
|
||||
:dynamic-options="{{ $attributes['dynamicOptions'] }}"
|
||||
@endif
|
||||
|
||||
@if (! empty($attributes['searchable']))
|
||||
searchable
|
||||
@elseif (! empty($searchable))
|
||||
searchable
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['fullOptions']) || isset($attributes['full-options']))
|
||||
:full-options="{{ json_encode(! empty($attributes['fullOptions']) ? $attributes['fullOptions'] : $attributes['full-options']) }}"
|
||||
@else
|
||||
:full-options="{{ json_encode($fullOptions) }}"
|
||||
@endif
|
||||
|
||||
@if (isset($attributes['searchText']) || isset($attributes['search-text']))
|
||||
search-text="{{ ! empty($attributes['searchText']) ? $attributes['searchText'] : $attributes['search-text'] }}"
|
||||
@else
|
||||
search-text="{{ $searchText }}"
|
||||
@endif
|
||||
|
||||
@if (empty($multiple))
|
||||
@if (isset($selected) || old($name))
|
||||
value="{{ old($name, $selected) }}"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<x-slot name="body">
|
||||
<x-form.group.text name="name" label="{{ trans('general.name') }}" />
|
||||
|
||||
<x-form.group.select name="code" label="{{ trans('currencies.code') }}" :options="$codes" change="onChangeCode" />
|
||||
<x-form.group.select name="code" label="{{ trans('currencies.code') }}" :options="$codes" searchable change="onChangeCode" />
|
||||
|
||||
<x-form.group.text name="rate" label="{{ trans('currencies.rate') }}" @input="onChangeRate" />
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<x-slot name="body">
|
||||
<x-form.group.text name="name" label="{{ trans('general.name') }}" />
|
||||
|
||||
<x-form.group.select name="code" label="{{ trans('currencies.code') }}" :options="$codes" change="onChangeCode" />
|
||||
<x-form.group.select name="code" label="{{ trans('currencies.code') }}" :options="$codes" searchable change="onChangeCode" />
|
||||
|
||||
<x-form.group.text name="rate" label="{{ trans('currencies.rate') }}" @input="onChangeRate" />
|
||||
|
||||
|
||||
Reference in New Issue
Block a user