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

fixed #1868

Browse Source
This commit is contained in:
Denis Duliçi 2021-02-18 18:22:57 +03:00
parent b5bd5955af
commit eb2407c693
4 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
config/search-string.php
View File

@ -98,9 +98,7 @@ return [
'route' => 'currencies.index'
],
'document_id',
'contact_id' => [
'route' => 'customers.index'
],
'contact_id',
'description' => ['searchable' => true],
'payment_method',
'reference',
@ -182,9 +180,7 @@ return [
'currency_code' => [
'route' => 'currencies.index'
],
'contact_id' => [
'route' => 'vendors.index'
],
'contact_id',
'contact_name' => ['searchable' => true],
'contact_email' => ['searchable' => true],
'contact_tax_number',
@ -197,7 +193,7 @@ return [
],
],
App\Models\Purchase\Bill::class => [
'App\Models\Purchase\Bill' => [
'columns' => [
'document_number' => ['searchable' => true],
'order_number' => ['searchable' => true],
@ -226,24 +222,32 @@ return [
],
],
App\Models\Purchase\Vendor::class => [
'App\Models\Purchase\Payment' => [
'columns' => [
'type',
'name' => ['searchable' => true],
'email' => ['searchable' => true],
'tax_number' => ['searchable' => true],
'phone' => ['searchable' => true],
'address' => ['searchable' => true],
'website' => ['searchable' => true],
'account_id' => [
'route' => 'accounts.index'
],
'paid_at' => ['date' => true],
'amount',
'currency_code' => [
'route' => 'currencies.index'
],
'document_id',
'contact_id' => [
'route' => 'vendors.index'
],
'description' => ['searchable' => true],
'payment_method',
'reference',
'enabled' => ['boolean' => true],
'category_id' => [
'route' => ['categories.index', 'search=type:expense']
],
'parent_id',
],
],
App\Models\Sale\Invoice::class => [
'App\Models\Sale\Invoice' => [
'columns' => [
'document_number' => ['searchable' => true],
'order_number' => ['searchable' => true],
@ -272,6 +276,31 @@ return [
],
],
'App\Models\Sale\Revenue' => [
'columns' => [
'type',
'account_id' => [
'route' => 'accounts.index'
],
'paid_at' => ['date' => true],
'amount',
'currency_code' => [
'route' => 'currencies.index'
],
'document_id',
'contact_id' => [
'route' => 'customers.index'
],
'description' => ['searchable' => true],
'payment_method',
'reference',
'category_id' => [
'route' => ['categories.index', 'search=type:income']
],
'parent_id',
],
],
App\Models\Setting\Category::class => [
'columns' => [
'name' => ['searchable' => true],

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

@ -21,7 +21,7 @@
'class' => 'mb-0'
]) !!}
<div class="align-items-center" v-if="!bulk_action.show">
<x-search-string model="App\Models\Banking\Transaction" />
<x-search-string model="App\Models\Purchase\Payment" />
</div>
{{ Form::bulkActionRowGroup('general.payments', $bulk_actions, ['group' => 'purchases', 'type' => 'payments']) }}

2
resources/views/purchases/vendors/index.blade.php vendored
View File

@ -21,7 +21,7 @@
'class' => 'mb-0'
]) !!}
<div class="align-items-center" v-if="!bulk_action.show">
<x-search-string model="App\Models\Purchase\Vendor" />
<x-search-string model="App\Models\Common\Contact" />
</div>
{{ Form::bulkActionRowGroup('general.vendors', $bulk_actions, ['group' => 'purchases', 'type' => 'vendors']) }}

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

@ -21,7 +21,7 @@
'class' => 'mb-0'
]) !!}
<div class="align-items-center" v-if="!bulk_action.show">
<x-search-string model="App\Models\Banking\Transaction" />
<x-search-string model="App\Models\Sale\Revenue" />
</div>
{{ Form::bulkActionRowGroup('general.revenues', $bulk_actions, ['group' => 'sales', 'type' => 'revenues']) }}