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

Merge branch '2.1-dev' of github.com:akaunting/akaunting into 2.1-dev

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-11-11 18:49:19 +03:00
parent 72231b10ce 6dbf2a8d5c
commit 8784dc14db
91 changed files with 1938 additions and 1814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/module.php
View File

@@ -111,7 +111,7 @@ return [
'resource' => ['path' => 'Http/Resources', 'generate' => false],
'asset' => ['path' => 'Resources/assets', 'generate' => false],
'lang' => ['path' => 'Resources/lang/en-GB', 'generate' => true],
'views' => ['path' => 'Resources/views', 'generate' => true],
'view' => ['path' => 'Resources/views', 'generate' => true],
'test' => ['path' => 'Tests', 'generate' => false],
'repository' => ['path' => 'Repositories', 'generate' => false],
'event' => ['path' => 'Events', 'generate' => false],
@@ -122,6 +122,7 @@ return [
'email' => ['path' => 'Emails', 'generate' => false],
'notification' => ['path' => 'Notifications', 'generate' => false],
'route' => ['path' => 'Routes', 'generate' => true],
'component' => ['path' => 'View/Components', 'generate' => false],
],
],

54
config/search-string.php
View File

@@ -69,7 +69,9 @@ return [
'number' => ['searchable' => true],
'bank_name' => ['searchable' => true],
'bank_address' => ['searchable' => true],
'currency' => ['relationship' => true],
'currency_code' => [
'route' => 'currencies.index'
],
'enabled' => ['boolean' => true],
],
],
@@ -87,16 +89,24 @@ return [
App\Models\Banking\Transaction::class => [
'columns' => [
'type',
'account_id',
'account_id' => [
'route' => 'accounts.index'
],
'paid_at' => ['date' => true],
'amount',
'currency_code',
'currency_code' => [
'route' => 'currencies.index'
],
'document_id',
'contact_id',
'contact_id' => [
'route' => 'customers.index'
],
'description' => ['searchable' => true],
'payment_method',
'reference',
'category_id',
'category_id' => [
'route' => 'categories.index'
],
'parent_id',
],
],
@@ -120,8 +130,10 @@ return [
'name' => ['searchable' => true],
'description' => ['searchable' => true],
'enabled' => ['boolean' => true],
'category_id' => ['key' => 'category_id'],
'sale_price',
'category_id' => [
'route' => ['categories.index', 'search=type:item']
],
'sales_price',
'purchase_price',
],
],
@@ -135,7 +147,9 @@ return [
'phone' => ['searchable' => true],
'address' => ['searchable' => true],
'website' => ['searchable' => true],
'currency_code',
'currency_code' => [
'route' => 'currencies.index'
],
'reference',
'user_id',
'enabled' => ['boolean' => true],
@@ -150,14 +164,20 @@ return [
'billed_at' => ['date' => true],
'due_at' => ['date' => true],
'amount',
'currency_code',
'contact_id',
'currency_code' => [
'route' => 'currencies.index'
],
'contact_id' => [
'route' => 'vendors.index'
],
'contact_name' => ['searchable' => true],
'contact_email' => ['searchable' => true],
'contact_tax_number',
'contact_phone' => ['searchable' => true],
'contact_address' => ['searchable' => true],
'category_id',
'category_id' => [
'route' => 'categories.index'
],
'parent_id',
],
],
@@ -170,14 +190,20 @@ return [
'invoiced_at' => ['date' => true],
'due_at' => ['date' => true],
'amount',
'currency_code',
'contact_id',
'currency_code' => [
'route' => 'currencies.index'
],
'contact_id' => [
'route' => 'customer.index'
],
'contact_name' => ['searchable' => true],
'contact_email' => ['searchable' => true],
'contact_tax_number',
'contact_phone' => ['searchable' => true],
'contact_address' => ['searchable' => true],
'category_id',
'category_id' => [
'route' => 'categories.index'
],
'parent_id',
],
],

1
config/setting.php
View File

@@ -120,6 +120,7 @@ return [
'locale' => env('SETTING_FALLBACK_DEFAULT_LOCALE', 'en-GB'),
'list_limit' => env('SETTING_FALLBACK_DEFAULT_LIST_LIMIT', '25'),
'payment_method' => env('SETTING_FALLBACK_DEFAULT_PAYMENT_METHOD', 'offline-payments.cash.1'),
'select_limit' => env('SETTING_FALLBACK_DEFAULT_SELECT_LIMIT', '10'),
],
'email' => [
'protocol' => env('SETTING_FALLBACK_EMAIL_PROTOCOL', 'mail'),