diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue index 639849c4a..3d49182a4 100644 --- a/resources/assets/js/components/AkauntingSearch.vue +++ b/resources/assets/js/components/AkauntingSearch.vue @@ -124,11 +124,6 @@ default: null, description: "Selectbox remote action path" }, - remoteType: { - type: String, - default: 'invoice', - description: "Ger remote item type." - }, }, data() { diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue index 1cbd1288a..1a6cd9473 100644 --- a/resources/assets/js/components/AkauntingSelectRemote.vue +++ b/resources/assets/js/components/AkauntingSelectRemote.vue @@ -353,11 +353,6 @@ export default { default: null, description: "Selectbox remote action path" }, - remoteType: { - type: String, - default: 'invoice', - description: "Ger remote item type." - }, currencyCode: { type: String, default: 'USD', @@ -449,7 +444,7 @@ export default { this.sort_options.push({ index: index, key: option.id, - value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name + value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name }); }, this); } @@ -523,7 +518,7 @@ export default { data.forEach(function (option) { this.sort_options.push({ key: option.id.toString(), - value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name + value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name }); }, this); } else { diff --git a/resources/views/auth/users/create.blade.php b/resources/views/auth/users/create.blade.php index cffa741ab..9e37092f9 100644 --- a/resources/views/auth/users/create.blade.php +++ b/resources/views/auth/users/create.blade.php @@ -48,7 +48,7 @@ @endif @can('read-common-companies') - {{ Form::multiSelectRemoteGroup('companies', trans_choice('general.companies', 2), 'user', $companies, [], ['required' => 'required', 'remote_action' => route('companies.autocomplete'), 'remote_type' => 'company']) }} + {{ Form::multiSelectRemoteGroup('companies', trans_choice('general.companies', 2), 'user', $companies, [], ['required' => 'required', 'remote_action' => route('companies.index')]) }} @endcan @can('read-auth-roles') diff --git a/resources/views/auth/users/edit.blade.php b/resources/views/auth/users/edit.blade.php index 29c02178f..3012d3831 100644 --- a/resources/views/auth/users/edit.blade.php +++ b/resources/views/auth/users/edit.blade.php @@ -49,7 +49,7 @@ @endif @can('read-common-companies') - {{ 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']) }} + {{ 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.index')]) }} @endcan @can('read-auth-roles') diff --git a/resources/views/common/items/create.blade.php b/resources/views/common/items/create.blade.php index f3f90ca52..62023f1a7 100644 --- a/resources/views/common/items/create.blade.php +++ b/resources/views/common/items/create.blade.php @@ -27,7 +27,7 @@ {{ Form::textGroup('purchase_price', trans('items.purchase_price'), 'money-bill-wave-alt') }} - {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['path' => route('modals.categories.create') . '?type=item', 'remote_action' => route('categories.index'). '?type=item', 'remote_type' => 'category']) }} + {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['path' => route('modals.categories.create') . '?type=item']) }} {{ Form::fileGroup('picture', trans_choice('general.pictures', 1), 'plus') }} diff --git a/resources/views/common/items/edit.blade.php b/resources/views/common/items/edit.blade.php index 8e429d902..5c2676b28 100644 --- a/resources/views/common/items/edit.blade.php +++ b/resources/views/common/items/edit.blade.php @@ -28,7 +28,7 @@ {{ Form::textGroup('purchase_price', trans('items.purchase_price'), 'money-bill-wave-alt') }} - {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $item->category_id, ['path' => route('modals.categories.create') . '?type=item', 'remote_action' => route('categories.index'). '?type=item', 'remote_type' => 'category']) }} + {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $item->category_id, ['path' => route('modals.categories.create') . '?type=item', 'remote_action' => route('categories.index'). '?type=item']) }} {{ Form::fileGroup('picture', trans_choice('general.pictures', 1)) }} diff --git a/resources/views/modals/items/create.blade.php b/resources/views/modals/items/create.blade.php index ba7250919..53a16e9a5 100644 --- a/resources/views/modals/items/create.blade.php +++ b/resources/views/modals/items/create.blade.php @@ -18,7 +18,7 @@ {{ Form::textGroup('purchase_price', trans('items.purchase_price'), 'money-bill-wave-alt') }} - {{ Form::selectRemoteGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['remote_action' => route('categories.index'). '?type=item', 'remote_type' => 'category']) }} + {{ Form::selectRemoteGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['remote_action' => route('categories.index'). '?type=item']) }} {!! Form::hidden('enabled', '1', []) !!} diff --git a/resources/views/partials/form/multi_select_remote_add_new_group.blade.php b/resources/views/partials/form/multi_select_remote_add_new_group.blade.php index b00f49516..6bb4ebe1c 100644 --- a/resources/views/partials/form/multi_select_remote_add_new_group.blade.php +++ b/resources/views/partials/form/multi_select_remote_add_new_group.blade.php @@ -84,9 +84,8 @@ @endif remote-action="{{ $attributes['remote_action'] }}" - remote-type="{{ $attributes['remote_type'] }}" - @if (!empty($attributes['currecny_code'])) + @if (!empty($attributes['currecny_code'])) currency-code="{{ $attributes['currecny_code'] }}" @endif diff --git a/resources/views/partials/form/multi_select_remote_group.blade.php b/resources/views/partials/form/multi_select_remote_group.blade.php index 699dcb591..3af3c8772 100644 --- a/resources/views/partials/form/multi_select_remote_group.blade.php +++ b/resources/views/partials/form/multi_select_remote_group.blade.php @@ -62,9 +62,8 @@ @endif remote-action="{{ $attributes['remote_action'] }}" - remote-type="{{ $attributes['remote_type'] }}" - @if (!empty($attributes['currecny_code'])) + @if (!empty($attributes['currecny_code'])) currency-code="{{ $attributes['currecny_code'] }}" @endif diff --git a/resources/views/partials/form/select_remote_add_new_group.blade.php b/resources/views/partials/form/select_remote_add_new_group.blade.php index 71f6e7a63..f0f02af21 100644 --- a/resources/views/partials/form/select_remote_add_new_group.blade.php +++ b/resources/views/partials/form/select_remote_add_new_group.blade.php @@ -78,9 +78,8 @@ @endif remote-action="{{ $attributes['remote_action'] }}" - remote-type="'{{ $attributes['remote_type'] }}" - @if (!empty($attributes['currecny_code'])) + @if (!empty($attributes['currecny_code'])) currency-code="{{ $attributes['currecny_code'] }}" @endif diff --git a/resources/views/partials/form/select_remote_group.blade.php b/resources/views/partials/form/select_remote_group.blade.php index c660a5b82..cc3c4c14a 100644 --- a/resources/views/partials/form/select_remote_group.blade.php +++ b/resources/views/partials/form/select_remote_group.blade.php @@ -56,9 +56,8 @@ @endif remote-action="{{ $attributes['remote_action'] }}" - remote-type="'{{ $attributes['remote_type'] }}" - @if (!empty($attributes['currecny_code'])) + @if (!empty($attributes['currecny_code'])) currency-code="{{ $attributes['currecny_code'] }}" @endif diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php index 889c5d671..4244463df 100644 --- a/resources/views/purchases/bills/create.blade.php +++ b/resources/views/purchases/bills/create.blade.php @@ -17,7 +17,7 @@