shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Select remote fixed searching value..

Browse Source
This commit is contained in:
Cüneyt Şentürk
2021-01-13 00:09:29 +03:00
parent 64dee4cfde
commit 152e5db02b
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/search-string.php
View File

@@ -206,7 +206,7 @@ return [
'contact_phone' => ['searchable' => true], 'contact_phone' => ['searchable' => true],
'contact_address' => ['searchable' => true], 'contact_address' => ['searchable' => true],
'category_id' => [ 'category_id' => [
'route' => 'categories.index' 'route' => ['categories.index', 'search=type:expense']
], ],
'parent_id', 'parent_id',
], ],
@@ -252,7 +252,7 @@ return [
'contact_phone' => ['searchable' => true], 'contact_phone' => ['searchable' => true],
'contact_address' => ['searchable' => true], 'contact_address' => ['searchable' => true],
'category_id' => [ 'category_id' => [
'route' => 'categories.index' 'route' => ['categories.index', 'search=type:income']
], ],
'parent_id', 'parent_id',
], ],

16
resources/assets/js/components/AkauntingSelectRemote.vue
View File

@@ -621,19 +621,19 @@ export default {
let path = this.remoteAction; let path = this.remoteAction;
if (!path) { if (!path) {
path = url + '/common/items/autocomplete'; path = url + '/common/items/autocomplete';
} }
if (path.indexOf('?') === -1) { if (path.indexOf('?search') === -1) {
path += '?search="' + query + '"'; path += '?search="' + query + '"';
} else { } else {
path += '&search="' + query + '"'; path += ' "' + query + '"';
} }
path += '&currency_code=' + this.currencyCode; path += ' limit:10';
path += '&limit:10'; path += '&currency_code=' + this.currencyCode;
window.axios({ window.axios({
method: 'GET', method: 'GET',

2
resources/views/common/items/create.blade.php
View File

@@ -27,7 +27,7 @@
{{ Form::textGroup('purchase_price', trans('items.purchase_price'), 'money-bill-wave-alt') }} {{ 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']) }} {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['path' => route('modals.categories.create') . '?type=item', 'remote_action' => route('categories.index'). '?search=type:item']) }}
{{ Form::fileGroup('picture', trans_choice('general.pictures', 1), 'plus', ['dropzone-class' => 'form-file']) }} {{ Form::fileGroup('picture', trans_choice('general.pictures', 1), 'plus', ['dropzone-class' => 'form-file']) }}

2
resources/views/common/items/edit.blade.php
View File

@@ -28,7 +28,7 @@
{{ Form::textGroup('purchase_price', trans('items.purchase_price'), 'money-bill-wave-alt') }} {{ 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']) }} {{ 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'). '?search=type:item']) }}
{{ Form::fileGroup('picture', trans_choice('general.pictures', 1), '', ['dropzone-class' => 'form-file']) }} {{ Form::fileGroup('picture', trans_choice('general.pictures', 1), '', ['dropzone-class' => 'form-file']) }}

2
resources/views/components/documents/form/advanced.blade.php
View File

@@ -19,7 +19,7 @@
@if (!$hideCategory || !$hideAttachment) @if (!$hideCategory || !$hideAttachment)
<div class="{{ $more_class }}"> <div class="{{ $more_class }}">
@if (!$hideCategory) @if (!$hideCategory)
{{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $document->category_id ?? setting('default.' . $categoryType . '_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=' . $categoryType, 'remote_action' => route('categories.index'). '?type=' . $categoryType], $more_form_class) }} {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $document->category_id ?? setting('default.' . $categoryType . '_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=' . $categoryType, 'remote_action' => route('categories.index'). '?search=type:' . $categoryType], $more_form_class) }}
@endif @endif
@if (!$hideAttachment) @if (!$hideAttachment)

2
resources/views/purchases/payments/create.blade.php
View File

@@ -30,7 +30,7 @@
{{ Form::textareaGroup('description', trans('general.description')) }} {{ Form::textareaGroup('description', trans('general.description')) }}
{{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.expense_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense', 'remote_action' => route('categories.index'). '?type=expense']) }} {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.expense_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?search=type:expense', 'remote_action' => route('categories.index'). '?type=expense']) }}
{{ Form::recurring('create') }} {{ Form::recurring('create') }}

2
resources/views/purchases/payments/edit.blade.php
View File

@@ -49,7 +49,7 @@
{{ Form::textareaGroup('description', trans('general.description')) }} {{ Form::textareaGroup('description', trans('general.description')) }}
{{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $payment->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense', 'remote_action' => route('categories.index'). '?type=expense']) }} {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $payment->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense', 'remote_action' => route('categories.index'). '?search=type:expense']) }}
{{ Form::recurring('edit', $payment) }} {{ Form::recurring('edit', $payment) }}

2
resources/views/sales/revenues/create.blade.php
View File

@@ -30,7 +30,7 @@
{{ Form::textareaGroup('description', trans('general.description')) }} {{ Form::textareaGroup('description', trans('general.description')) }}
{{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.income_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income', 'remote_action' => route('categories.index'). '?type=income']) }} {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.income_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income', 'remote_action' => route('categories.index'). '?search=type:income']) }}
{{ Form::recurring('create') }} {{ Form::recurring('create') }}

2
resources/views/sales/revenues/edit.blade.php
View File

@@ -49,7 +49,7 @@
{{ Form::textareaGroup('description', trans('general.description')) }} {{ Form::textareaGroup('description', trans('general.description')) }}
{{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $revenue->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income', 'remote_action' => route('categories.index'). '?type=income']) }} {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $revenue->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income', 'remote_action' => route('categories.index'). '?search=type:income']) }}
{{ Form::recurring('edit', $revenue) }} {{ Form::recurring('edit', $revenue) }}