IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up config.

Browse Source
This commit is contained in:
James Cole 2020-03-20 17:31:54 +01:00
parent 7b216543fa
commit 5a7152ceec
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
11 changed files with 327 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
config/debugbar.php
View File

@ -99,7 +99,7 @@ return [
| in the Messages tab. | in the Messages tab.
| |
*/ */
'error_handler' => true, 'error_handler' => true,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -110,7 +110,7 @@ return [
| Extension, without the server-side code. It uses Debugbar collectors instead. | Extension, without the server-side code. It uses Debugbar collectors instead.
| |
*/ */
'clockwork' => false, 'clockwork' => false,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -156,20 +156,21 @@ return [
*/ */
'options' => [ 'options' => [
'auth' => [ 'auth' => [
'show_name' => true, // Also show the users name/email in the debugbar 'show_name' => true, // Also show the users name/email in the debugbar
], ],
'db' => [ 'db' => [
'with_params' => true, // Render SQL with the parameters substituted 'with_params' => true, // Render SQL with the parameters substituted
'backtrace' => true, // Use a backtrace to find the origin of the query in your files. 'backtrace' => true, // Use a backtrace to find the origin of the query in your files.
'timeline' => false, // Add the queries to the timeline 'timeline' => false, // Add the queries to the timeline
'explain' => [ // Show EXPLAIN output on queries 'explain' => [ // Show EXPLAIN output on queries
'enabled' => false, 'enabled' => false,
'types' => ['SELECT'], // // workaround ['SELECT'] only. https://github.com/barryvdh/laravel-debugbar/issues/888 ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+ 'types' => ['SELECT'],
// // workaround ['SELECT'] only. https://github.com/barryvdh/laravel-debugbar/issues/888 ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+
], ],
'hints' => true, // Show hints for common mistakes 'hints' => true, // Show hints for common mistakes
], ],
'mail' => [ 'mail' => [
'full_log' => false, 'full_log' => false,
], ],
'views' => [ 'views' => [
@ -178,7 +179,7 @@ return [
'route' => [ 'route' => [
'label' => true, // show complete route on bar 'label' => true, // show complete route on bar
], ],
'logs' => [ 'logs' => [
'file' => null, 'file' => null,
], ],
'cache' => [ 'cache' => [
@ -197,7 +198,7 @@ return [
| |
*/ */
'inject' => true, 'inject' => true,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

6
config/filesystems.php
View File

@ -66,17 +66,17 @@ return [
*/ */
'disks' => [ 'disks' => [
'local' => [ 'local' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('app'), 'root' => storage_path('app'),
], ],
// local storage configuration for upload and export: // local storage configuration for upload and export:
'upload' => [ 'upload' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('upload'), 'root' => storage_path('upload'),
], ],
'export' => [ 'export' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('export'), 'root' => storage_path('export'),
], ],

14
config/google2fa.php
View File

@ -51,17 +51,17 @@ return [
* 2FA verified session var * 2FA verified session var
*/ */
'session_var' => 'google2fa', 'session_var' => 'google2fa',
/* /*
* One Time Password request input name * One Time Password request input name
*/ */
'otp_input' => 'one_time_password', 'otp_input' => 'one_time_password',
/* /*
* One Time Password Window * One Time Password Window
*/ */
'window' => 1, 'window' => 1,
/* /*
* Forbid user to reuse One Time Passwords. * Forbid user to reuse One Time Passwords.
@ -71,24 +71,24 @@ return [
/* /*
* User's table column for google2fa secret * User's table column for google2fa secret
*/ */
'otp_secret_column' => 'mfa_secret', 'otp_secret_column' => 'mfa_secret',
/* /*
* One Time Password View * One Time Password View
*/ */
'view' => 'auth.mfa', 'view' => 'auth.mfa',
/* /*
* One Time Password error message * One Time Password error message
*/ */
'error_messages' => [ 'error_messages' => [
'wrong_otp' => "The 'One Time Password' typed was wrong.", 'wrong_otp' => "The 'One Time Password' typed was wrong.",
], ],
/* /*
* Throw exceptions or just fire events? * Throw exceptions or just fire events?
*/ */
'throw_exceptions' => true, 'throw_exceptions' => true,
'store_in_cookie' => true, 'store_in_cookie' => true,

12
config/ide-helper.php
View File

@ -31,8 +31,8 @@ return [
| |
*/ */
'filename' => '_ide_helper', 'filename' => '_ide_helper',
'format' => 'php', 'format' => 'php',
'meta_filename' => '.phpstorm.meta.php', 'meta_filename' => '.phpstorm.meta.php',
@ -140,7 +140,7 @@ return [
| |
*/ */
'interfaces' => [ 'interfaces' => [
], ],
@ -170,7 +170,7 @@ return [
| ), | ),
| |
*/ */
'custom_db_types' => [ 'custom_db_types' => [
], ],
@ -208,7 +208,7 @@ return [
| Cast the given "real type" to the given "type". | Cast the given "real type" to the given "type".
| |
*/ */
'type_overrides' => [ 'type_overrides' => [
'integer' => 'int', 'integer' => 'int',
'boolean' => 'bool', 'boolean' => 'bool',
], ],
@ -222,6 +222,6 @@ return [
| magic methods and properties. | magic methods and properties.
| |
*/ */
'include_class_docblocks' => false, 'include_class_docblocks' => false,
]; ];

72
config/intro.php
View File

@ -27,7 +27,7 @@ declare(strict_types=1);
return [ return [
// index // index
'index' => [ 'index' => [
'intro' => [], 'intro' => [],
'accounts-chart' => ['element' => '#accounts-chart'], 'accounts-chart' => ['element' => '#accounts-chart'],
'box_out_holder' => ['element' => '#box_out_holder'], 'box_out_holder' => ['element' => '#box_out_holder'],
@ -37,40 +37,40 @@ return [
'outro' => [], 'outro' => [],
], ],
// accounts: create // accounts: create
'accounts_create' => [ 'accounts_create' => [
'iban' => ['element' => '#ffInput_iban'], 'iban' => ['element' => '#ffInput_iban'],
], ],
// transactions: create // transactions: create
'transactions_create_withdrawal' => [ 'transactions_create_withdrawal' => [
'source' => ['element' => 'input[name="source[]"]'], 'source' => ['element' => 'input[name="source[]"]'],
'destination' => ['element' => 'input[name="destination[]"]'], 'destination' => ['element' => 'input[name="destination[]"]'],
'more_meta' => ['element' => 'input[name="category[]"]'], 'more_meta' => ['element' => 'input[name="category[]"]'],
'split_add' => ['element' => '.split_add_btn'], 'split_add' => ['element' => '.split_add_btn'],
], ],
'transactions_create_deposit' => [ 'transactions_create_deposit' => [
'source' => ['element' => 'input[name="source[]"]'], 'source' => ['element' => 'input[name="source[]"]'],
'destination' => ['element' => 'input[name="destination[]"]'], 'destination' => ['element' => 'input[name="destination[]"]'],
'more_meta' => ['element' => 'input[name="category[]"]'], 'more_meta' => ['element' => 'input[name="category[]"]'],
'split_add' => ['element' => '.split_add_btn'], 'split_add' => ['element' => '.split_add_btn'],
], ],
'transactions_create_transfer' => [ 'transactions_create_transfer' => [
'source' => ['element' => 'input[name="source[]"]'], 'source' => ['element' => 'input[name="source[]"]'],
'destination' => ['element' => 'input[name="destination[]"]'], 'destination' => ['element' => 'input[name="destination[]"]'],
'more_meta' => ['element' => 'input[name="category[]"]'], 'more_meta' => ['element' => 'input[name="category[]"]'],
'split_add' => ['element' => '.split_add_btn'], 'split_add' => ['element' => '.split_add_btn'],
], ],
// extra text for asset account creation. // extra text for asset account creation.
'accounts_create_asset' => [ 'accounts_create_asset' => [
'opening_balance' => ['element' => '#ffInput_opening_balance'], 'opening_balance' => ['element' => '#ffInput_opening_balance'],
'currency' => ['element' => '#ffInput_currency_id'], 'currency' => ['element' => '#ffInput_currency_id'],
'virtual' => ['element' => '#ffInput_virtual_balance'], 'virtual' => ['element' => '#ffInput_virtual_balance'],
], ],
// budgets: index // budgets: index
'budgets_index' => [ 'budgets_index' => [
'intro' => [], 'intro' => [],
'set_budget' => ['element' => '#availableBar'], 'set_budget' => ['element' => '#availableBar'],
'see_expenses_bar' => ['element' => '#spentBar'], 'see_expenses_bar' => ['element' => '#spentBar'],
@ -81,61 +81,61 @@ return [
], ],
// reports: index, default report, audit, budget, cat, tag // reports: index, default report, audit, budget, cat, tag
'reports_index' => [ 'reports_index' => [
'intro' => [], 'intro' => [],
'inputReportType' => ['element' => '#inputReportType'], 'inputReportType' => ['element' => '#inputReportType'],
'inputAccountsSelect' => ['element' => '#inputAccountsSelect'], 'inputAccountsSelect' => ['element' => '#inputAccountsSelect'],
'inputDateRange' => ['element' => '#inputDateRange'], 'inputDateRange' => ['element' => '#inputDateRange'],
'extra-options-box' => ['element' => '#extra-options-box', 'position' => 'top'], 'extra-options-box' => ['element' => '#extra-options-box', 'position' => 'top'],
], ],
'reports_report_default' => [ 'reports_report_default' => [
'intro' => [], 'intro' => [],
], ],
'reports_report_audit' => [ 'reports_report_audit' => [
'intro' => [], 'intro' => [],
'optionsBox' => ['element' => '#optionsBox'], 'optionsBox' => ['element' => '#optionsBox'],
], ],
'reports_report_category' => [ 'reports_report_category' => [
'intro' => [], 'intro' => [],
'pieCharts' => ['element' => '#pieCharts'], 'pieCharts' => ['element' => '#pieCharts'],
'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'], 'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'],
], ],
'reports_report_tag' => [ 'reports_report_tag' => [
'intro' => [], 'intro' => [],
'pieCharts' => ['element' => '#pieCharts'], 'pieCharts' => ['element' => '#pieCharts'],
'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'], 'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'],
], ],
'reports_report_budget' => [ 'reports_report_budget' => [
'intro' => [], 'intro' => [],
'pieCharts' => ['element' => '#pieCharts'], 'pieCharts' => ['element' => '#pieCharts'],
'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'], 'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'],
], ],
// piggies: index, create, show // piggies: index, create, show
'piggy-banks_index' => [ 'piggy-banks_index' => [
'saved' => ['element' => '.piggySaved'], 'saved' => ['element' => '.piggySaved'],
'button' => ['element' => '.piggyBar'], 'button' => ['element' => '.piggyBar'],
'accountStatus' => ['element' => '#accountStatus', 'position' => 'top'], 'accountStatus' => ['element' => '#accountStatus', 'position' => 'top'],
], ],
'piggy-banks_create' => [ 'piggy-banks_create' => [
'name' => ['element' => '#ffInput_name'], 'name' => ['element' => '#ffInput_name'],
'date' => ['element' => '#ffInput_targetdate'], 'date' => ['element' => '#ffInput_targetdate'],
], ],
'piggy-banks_show' => [ 'piggy-banks_show' => [
'piggyChart' => ['element' => '#piggyChart'], 'piggyChart' => ['element' => '#piggyChart'],
'piggyDetails' => ['element' => '#piggyDetails'], 'piggyDetails' => ['element' => '#piggyDetails'],
'piggyEvents' => ['element' => '#piggyEvents'], 'piggyEvents' => ['element' => '#piggyEvents'],
], ],
// bills: index, create, show // bills: index, create, show
'bills_index' => [ 'bills_index' => [
'rules' => ['element' => '.rules'], 'rules' => ['element' => '.rules'],
'paid_in_period' => ['element' => '.paid_in_period'], 'paid_in_period' => ['element' => '.paid_in_period'],
'expected_in_period' => ['element' => '.expected_in_period'], 'expected_in_period' => ['element' => '.expected_in_period'],
], ],
'bills_create' => [ 'bills_create' => [
'intro' => [], 'intro' => [],
'name' => ['element' => '#name_holder'], 'name' => ['element' => '#name_holder'],
//'match' => ['element' => '#match_holder'], //'match' => ['element' => '#match_holder'],
@ -143,14 +143,14 @@ return [
'repeat_freq_holder' => ['element' => '#repeat_freq_holder'], 'repeat_freq_holder' => ['element' => '#repeat_freq_holder'],
'skip_holder' => ['element' => '#skip_holder'], 'skip_holder' => ['element' => '#skip_holder'],
], ],
'bills_show' => [ 'bills_show' => [
'billInfo' => ['element' => '#billInfo'], 'billInfo' => ['element' => '#billInfo'],
'billButtons' => ['element' => '#billButtons'], 'billButtons' => ['element' => '#billButtons'],
'billChart' => ['element' => '#billChart', 'position' => 'top'], 'billChart' => ['element' => '#billChart', 'position' => 'top'],
], ],
// rules: index, create-rule, edit-rule // rules: index, create-rule, edit-rule
'rules_index' => [ 'rules_index' => [
'intro' => [], 'intro' => [],
'new_rule_group' => ['element' => '#new_rule_group'], 'new_rule_group' => ['element' => '#new_rule_group'],
'new_rule' => ['element' => '.new_rule'], 'new_rule' => ['element' => '.new_rule'],
@ -159,23 +159,23 @@ return [
'rule-triggers' => ['element' => '.rule-triggers'], 'rule-triggers' => ['element' => '.rule-triggers'],
'outro' => [], 'outro' => [],
], ],
'rules_create' => [ 'rules_create' => [
'mandatory' => ['element' => '#mandatory'], 'mandatory' => ['element' => '#mandatory'],
'ruletriggerholder' => ['element' => '.rule-trigger-box'], 'ruletriggerholder' => ['element' => '.rule-trigger-box'],
'test_rule_triggers' => ['element' => '.test_rule_triggers'], 'test_rule_triggers' => ['element' => '.test_rule_triggers'],
'actions' => ['element' => '.rule-action-box', 'position' => 'top'], 'actions' => ['element' => '.rule-action-box', 'position' => 'top'],
], ],
// preferences: index // preferences: index
'preferences_index' => [ 'preferences_index' => [
'tabs' => ['element' => '.nav-tabs'], 'tabs' => ['element' => '.nav-tabs'],
], ],
// currencies: index, create // currencies: index, create
'currencies_index' => [ 'currencies_index' => [
'intro' => [], 'intro' => [],
'default' => ['element' => '#default-currency'], 'default' => ['element' => '#default-currency'],
'buttons' => ['element' => '.buttons'], 'buttons' => ['element' => '.buttons'],
], ],
'currencies_create' => [ 'currencies_create' => [
'code' => ['element' => '#ffInput_code'], 'code' => ['element' => '#ffInput_code'],
], ],
]; ];

48
config/ldap_auth.php
View File

@ -22,6 +22,28 @@
declare(strict_types=1); declare(strict_types=1);
use Adldap\Laravel\Events\Authenticated;
use Adldap\Laravel\Events\AuthenticatedModelTrashed;
use Adldap\Laravel\Events\AuthenticatedWithWindows;
use Adldap\Laravel\Events\Authenticating;
use Adldap\Laravel\Events\AuthenticationFailed;
use Adldap\Laravel\Events\AuthenticationRejected;
use Adldap\Laravel\Events\AuthenticationSuccessful;
use Adldap\Laravel\Events\DiscoveredWithCredentials;
use Adldap\Laravel\Events\Importing;
use Adldap\Laravel\Events\Synchronized;
use Adldap\Laravel\Events\Synchronizing;
use Adldap\Laravel\Listeners\LogAuthenticated;
use Adldap\Laravel\Listeners\LogAuthentication;
use Adldap\Laravel\Listeners\LogAuthenticationFailure;
use Adldap\Laravel\Listeners\LogAuthenticationRejection;
use Adldap\Laravel\Listeners\LogAuthenticationSuccess;
use Adldap\Laravel\Listeners\LogDiscovery;
use Adldap\Laravel\Listeners\LogImport;
use Adldap\Laravel\Listeners\LogSynchronized;
use Adldap\Laravel\Listeners\LogSynchronizing;
use Adldap\Laravel\Listeners\LogTrashedModel;
use Adldap\Laravel\Listeners\LogWindowsAuth;
use Adldap\Laravel\Scopes\UidScope; use Adldap\Laravel\Scopes\UidScope;
use Adldap\Laravel\Scopes\UpnScope; use Adldap\Laravel\Scopes\UpnScope;
@ -169,8 +191,8 @@ return [
'ldap' => [ 'ldap' => [
'locate_users_by' => envNonEmpty('ADLDAP_DISCOVER_FIELD', 'userprincipalname'), 'locate_users_by' => envNonEmpty('ADLDAP_DISCOVER_FIELD', 'userprincipalname'),
'bind_users_by' => envNonEmpty('ADLDAP_AUTH_FIELD', 'distinguishedname'), 'bind_users_by' => envNonEmpty('ADLDAP_AUTH_FIELD', 'distinguishedname'),
], ],
@ -330,17 +352,17 @@ return [
'enabled' => true, 'enabled' => true,
'events' => [ 'events' => [
\Adldap\Laravel\Events\Importing::class => \Adldap\Laravel\Listeners\LogImport::class, Importing::class => LogImport::class,
\Adldap\Laravel\Events\Synchronized::class => \Adldap\Laravel\Listeners\LogSynchronized::class, Synchronized::class => LogSynchronized::class,
\Adldap\Laravel\Events\Synchronizing::class => \Adldap\Laravel\Listeners\LogSynchronizing::class, Synchronizing::class => LogSynchronizing::class,
\Adldap\Laravel\Events\Authenticated::class => \Adldap\Laravel\Listeners\LogAuthenticated::class, Authenticated::class => LogAuthenticated::class,
\Adldap\Laravel\Events\Authenticating::class => \Adldap\Laravel\Listeners\LogAuthentication::class, Authenticating::class => LogAuthentication::class,
\Adldap\Laravel\Events\AuthenticationFailed::class => \Adldap\Laravel\Listeners\LogAuthenticationFailure::class, AuthenticationFailed::class => LogAuthenticationFailure::class,
\Adldap\Laravel\Events\AuthenticationRejected::class => \Adldap\Laravel\Listeners\LogAuthenticationRejection::class, AuthenticationRejected::class => LogAuthenticationRejection::class,
\Adldap\Laravel\Events\AuthenticationSuccessful::class => \Adldap\Laravel\Listeners\LogAuthenticationSuccess::class, AuthenticationSuccessful::class => LogAuthenticationSuccess::class,
\Adldap\Laravel\Events\DiscoveredWithCredentials::class => \Adldap\Laravel\Listeners\LogDiscovery::class, DiscoveredWithCredentials::class => LogDiscovery::class,
\Adldap\Laravel\Events\AuthenticatedWithWindows::class => \Adldap\Laravel\Listeners\LogWindowsAuth::class, AuthenticatedWithWindows::class => LogWindowsAuth::class,
\Adldap\Laravel\Events\AuthenticatedModelTrashed::class => \Adldap\Laravel\Listeners\LogTrashedModel::class, AuthenticatedModelTrashed::class => LogTrashedModel::class,
], ],
], ],

14
config/logging.php
View File

@ -52,39 +52,39 @@ return [
*/ */
'channels' => [ 'channels' => [
'stack' => [ 'stack' => [
'driver' => 'stack', 'driver' => 'stack',
'channels' => ['daily', 'stdout'], 'channels' => ['daily', 'stdout'],
], ],
'single' => [ 'single' => [
'driver' => 'single', 'driver' => 'single',
'path' => storage_path('logs/laravel.log'), 'path' => storage_path('logs/laravel.log'),
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'), 'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),
], ],
'stdout' => [ 'stdout' => [
'driver' => 'single', 'driver' => 'single',
'path' => 'php://stdout', 'path' => 'php://stdout',
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'), 'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),
], ],
'docker_out' => [ 'docker_out' => [
'driver' => 'single', 'driver' => 'single',
'path' => 'php://stdout', 'path' => 'php://stdout',
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'), 'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),
], ],
'daily' => [ 'daily' => [
'driver' => 'daily', 'driver' => 'daily',
'path' => storage_path('logs/ff3-' . PHP_SAPI . '.log'), 'path' => storage_path('logs/ff3-' . PHP_SAPI . '.log'),
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'), 'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),
'days' => 7, 'days' => 7,
], ],
'audit' => [ 'audit' => [
'driver' => 'daily', 'driver' => 'daily',
'path' => storage_path('logs/ff3-audit.log'), 'path' => storage_path('logs/ff3-audit.log'),
'tap' => [AuditLogger::class], 'tap' => [AuditLogger::class],
'level' => 'info', 'level' => 'info',
'days' => 90, 'days' => 90,
], ],
'dailytest' => [ 'dailytest' => [
'driver' => 'daily', 'driver' => 'daily',
'path' => storage_path('logs/test-ff3-' . PHP_SAPI . '.log'), 'path' => storage_path('logs/test-ff3-' . PHP_SAPI . '.log'),
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'), 'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),

4
config/twigbridge.php
View File

@ -113,7 +113,7 @@ return [
| `Twig\Extension\DebugExtension` is enabled automatically if twig.debug is TRUE. | `Twig\Extension\DebugExtension` is enabled automatically if twig.debug is TRUE.
| |
*/ */
'enabled' => [ 'enabled' => [
Facades::class, Facades::class,
Filters::class, Filters::class,
Functions::class, Functions::class,
@ -276,7 +276,7 @@ return [
| </code> | </code>
| |
*/ */
'filters' => [ 'filters' => [
'get' => 'data_get', 'get' => 'data_get',
], ],
], ],

54
routes/breadcrumbs.php
View File

@ -114,8 +114,8 @@ try {
if (null !== $start && null !== $end) { if (null !== $start && null !== $end) {
$title = trans( $title = trans(
'firefly.between_dates_breadcrumb', 'firefly.between_dates_breadcrumb',
['start' => $start ? $start->formatLocalized((string) trans('config.month_and_day')) : '', ['start' => $start ? $start->formatLocalized((string) trans('config.month_and_day')) : '',
'end' => $end ? $end->formatLocalized((string) trans('config.month_and_day')) : '', ] 'end' => $end ? $end->formatLocalized((string) trans('config.month_and_day')) : '',]
); );
$breadcrumbs->push($title, route('accounts.show', $account)); $breadcrumbs->push($title, route('accounts.show', $account));
} }
@ -164,7 +164,8 @@ try {
$what = config('firefly.shortNamesByFullName.' . $account->accountType->type); $what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
$breadcrumbs->push( $breadcrumbs->push(
trans('firefly.edit_' . $what . '_account', ['name' => limitStringLength($account->name)]), route('accounts.edit', [$account->id]) trans('firefly.edit_' . $what . '_account', ['name' => limitStringLength($account->name)]),
route('accounts.edit', [$account->id])
); );
} }
); );
@ -318,7 +319,10 @@ try {
if ($object instanceof Bill) { if ($object instanceof Bill) {
$breadcrumbs->parent('bills.show', $object); $breadcrumbs->parent('bills.show', $object);
} }
$breadcrumbs->push(limitStringLength(trans('firefly.edit_attachment', ['name' => $attachment->filename])), route('attachments.edit', [$attachment])); $breadcrumbs->push(
limitStringLength(trans('firefly.edit_attachment', ['name' => $attachment->filename])),
route('attachments.edit', [$attachment])
);
} }
); );
Breadcrumbs::register( Breadcrumbs::register(
@ -332,7 +336,8 @@ try {
$breadcrumbs->parent('bills.show', $object); $breadcrumbs->parent('bills.show', $object);
} }
$breadcrumbs->push( $breadcrumbs->push(
trans('firefly.delete_attachment', ['name' => limitStringLength($attachment->filename)]), route('attachments.edit', [$attachment]) trans('firefly.delete_attachment', ['name' => limitStringLength($attachment->filename)]),
route('attachments.edit', [$attachment])
); );
} }
); );
@ -415,8 +420,8 @@ try {
if (null !== $start && null !== $end) { if (null !== $start && null !== $end) {
$title = trans( $title = trans(
'firefly.between_dates_breadcrumb', 'firefly.between_dates_breadcrumb',
['start' => $start->formatLocalized((string) trans('config.month_and_day')), ['start' => $start->formatLocalized((string) trans('config.month_and_day')),
'end' => $end->formatLocalized((string) trans('config.month_and_day')), ] 'end' => $end->formatLocalized((string) trans('config.month_and_day')),]
); );
$breadcrumbs->push($title, route('budgets.no-budget')); $breadcrumbs->push($title, route('budgets.no-budget'));
} }
@ -449,8 +454,8 @@ try {
$title = trans( $title = trans(
'firefly.between_dates_breadcrumb', 'firefly.between_dates_breadcrumb',
['start' => $budgetLimit->start_date->formatLocalized((string) trans('config.month_and_day')), ['start' => $budgetLimit->start_date->formatLocalized((string) trans('config.month_and_day')),
'end' => $budgetLimit->end_date->formatLocalized((string) trans('config.month_and_day')), ] 'end' => $budgetLimit->end_date->formatLocalized((string) trans('config.month_and_day')),]
); );
$breadcrumbs->push( $breadcrumbs->push(
@ -499,8 +504,8 @@ try {
if (null !== $start && null !== $end) { if (null !== $start && null !== $end) {
$title = trans( $title = trans(
'firefly.between_dates_breadcrumb', 'firefly.between_dates_breadcrumb',
['start' => $start->formatLocalized((string) trans('config.month_and_day')), ['start' => $start->formatLocalized((string) trans('config.month_and_day')),
'end' => $end->formatLocalized((string) trans('config.month_and_day')), ] 'end' => $end->formatLocalized((string) trans('config.month_and_day')),]
); );
$breadcrumbs->push($title, route('categories.show', [$category->id])); $breadcrumbs->push($title, route('categories.show', [$category->id]));
} }
@ -524,8 +529,8 @@ try {
if (null !== $start && null !== $end) { if (null !== $start && null !== $end) {
$title = trans( $title = trans(
'firefly.between_dates_breadcrumb', 'firefly.between_dates_breadcrumb',
['start' => $start->formatLocalized((string) trans('config.month_and_day')), ['start' => $start->formatLocalized((string) trans('config.month_and_day')),
'end' => $end->formatLocalized((string) trans('config.month_and_day')), ] 'end' => $end->formatLocalized((string) trans('config.month_and_day')),]
); );
$breadcrumbs->push($title, route('categories.no-category')); $breadcrumbs->push($title, route('categories.no-category'));
} }
@ -950,7 +955,8 @@ try {
static function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) { static function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) {
$breadcrumbs->parent('rules.index'); $breadcrumbs->parent('rules.index');
$breadcrumbs->push( $breadcrumbs->push(
trans('firefly.rule_select_transactions', ['title' => $rule->title]), route('rules.select-transactions', [$rule]) trans('firefly.rule_select_transactions', ['title' => $rule->title]),
route('rules.select-transactions', [$rule])
); );
} }
); );
@ -960,7 +966,8 @@ try {
static function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { static function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) {
$breadcrumbs->parent('rules.index'); $breadcrumbs->parent('rules.index');
$breadcrumbs->push( $breadcrumbs->push(
trans('firefly.rule_group_select_transactions', ['title' => $ruleGroup->title]), route('rule-groups.select-transactions', [$ruleGroup]) trans('firefly.rule_group_select_transactions', ['title' => $ruleGroup->title]),
route('rule-groups.select-transactions', [$ruleGroup])
); );
} }
); );
@ -1016,8 +1023,8 @@ try {
if (null !== $start && null !== $end) { if (null !== $start && null !== $end) {
$title = trans( $title = trans(
'firefly.between_dates_breadcrumb', 'firefly.between_dates_breadcrumb',
['start' => $start->formatLocalized((string) trans('config.month_and_day')), ['start' => $start->formatLocalized((string) trans('config.month_and_day')),
'end' => $end->formatLocalized((string) trans('config.month_and_day')), ] 'end' => $end->formatLocalized((string) trans('config.month_and_day')),]
); );
$breadcrumbs->push($title, route('tags.show', [$tag->id, $start, $end])); $breadcrumbs->push($title, route('tags.show', [$tag->id, $start, $end]));
} }
@ -1046,8 +1053,8 @@ try {
// add date range: // add date range:
$title = trans( $title = trans(
'firefly.between_dates_breadcrumb', 'firefly.between_dates_breadcrumb',
['start' => $start->formatLocalized((string) trans('config.month_and_day')), ['start' => $start->formatLocalized((string) trans('config.month_and_day')),
'end' => $end->formatLocalized((string) trans('config.month_and_day')), ] 'end' => $end->formatLocalized((string) trans('config.month_and_day')),]
); );
$breadcrumbs->push($title, route('transactions.index', [$what, $start, $end])); $breadcrumbs->push($title, route('transactions.index', [$what, $start, $end]));
} }
@ -1079,7 +1086,8 @@ try {
$first = $group->transactionJournals()->first(); $first = $group->transactionJournals()->first();
$breadcrumbs->push( $breadcrumbs->push(
trans('breadcrumbs.edit_journal', ['description' => limitStringLength($first->description)]), route('transactions.edit', [$group->id]) trans('breadcrumbs.edit_journal', ['description' => limitStringLength($first->description)]),
route('transactions.edit', [$group->id])
); );
} }
); );
@ -1101,7 +1109,7 @@ try {
static function (BreadcrumbsGenerator $breadcrumbs, TransactionGroup $group) { static function (BreadcrumbsGenerator $breadcrumbs, TransactionGroup $group) {
$breadcrumbs->parent('transactions.show', $group); $breadcrumbs->parent('transactions.show', $group);
$journal = $group->transactionJournals->first(); $journal = $group->transactionJournals->first();
$breadcrumbs->push( $breadcrumbs->push(
trans('breadcrumbs.delete_group', ['description' => limitStringLength($group->title ?? $journal->description)]), trans('breadcrumbs.delete_group', ['description' => limitStringLength($group->title ?? $journal->description)]),
route('transactions.delete', [$group->id]) route('transactions.delete', [$group->id])
@ -1166,7 +1174,7 @@ try {
Breadcrumbs::register( Breadcrumbs::register(
'transactions.mass.delete', 'transactions.mass.delete',
static function (BreadcrumbsGenerator $breadcrumbs, array $journals) { static function (BreadcrumbsGenerator $breadcrumbs, array $journals) {
$objectType= strtolower(reset($journals)['transaction_type_type']); $objectType = strtolower(reset($journals)['transaction_type_type']);
$breadcrumbs->parent('transactions.index', $objectType); $breadcrumbs->parent('transactions.index', $objectType);
$breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.delete', [''])); $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.delete', ['']));
} }
@ -1177,7 +1185,7 @@ try {
'transactions.bulk.edit', 'transactions.bulk.edit',
static function (BreadcrumbsGenerator $breadcrumbs, array $journals): void { static function (BreadcrumbsGenerator $breadcrumbs, array $journals): void {
if (count($journals) > 0) { if (count($journals) > 0) {
$ids = Arr::pluck($journals, 'transaction_journal_id'); $ids = Arr::pluck($journals, 'transaction_journal_id');
$first = reset($journals); $first = reset($journals);
$breadcrumbs->parent('transactions.index', strtolower($first['transaction_type_type'])); $breadcrumbs->parent('transactions.index', strtolower($first['transaction_type_type']));
$breadcrumbs->push(trans('firefly.mass_bulk_journals'), route('transactions.bulk.edit', $ids)); $breadcrumbs->push(trans('firefly.mass_bulk_journals'), route('transactions.bulk.edit', $ids));

3
routes/channels.php
View File

@ -34,7 +34,8 @@ declare(strict_types=1);
*/ */
Broadcast::channel( Broadcast::channel(
'App.User.{id}', static function ($user, $id) { 'App.User.{id}',
static function ($user, $id) {
return (int) $user->id === (int) $id; return (int) $user->id === (int) $id;
} }
); );

280
routes/web.php
View File

@ -22,15 +22,17 @@
declare(strict_types=1); declare(strict_types=1);
Route::group( Route::group(
['namespace' => 'FireflyIII\Http\Controllers\System', ['namespace' => 'FireflyIII\Http\Controllers\System',
'as' => 'installer.', 'prefix' => 'install', ], static function () { 'as' => 'installer.', 'prefix' => 'install',],
Route::get('', ['uses' => 'InstallController@index', 'as' => 'index']); static function () {
Route::post('runCommand', ['uses' => 'InstallController@runCommand', 'as' => 'runCommand']); Route::get('', ['uses' => 'InstallController@index', 'as' => 'index']);
} Route::post('runCommand', ['uses' => 'InstallController@runCommand', 'as' => 'runCommand']);
}
); );
Route::group( Route::group(
['middleware' => 'binders-only', 'namespace' => 'FireflyIII\Http\Controllers\System', 'as' => 'cron.', 'prefix' => 'cron'], static function () { ['middleware' => 'binders-only', 'namespace' => 'FireflyIII\Http\Controllers\System', 'as' => 'cron.', 'prefix' => 'cron'],
static function () {
Route::get('run/{cliToken}', ['uses' => 'CronController@cron', 'as' => 'cron']); Route::get('run/{cliToken}', ['uses' => 'CronController@cron', 'as' => 'cron']);
} }
); );
@ -39,10 +41,11 @@ Route::group(
* These routes only work when the user is NOT logged in. * These routes only work when the user is NOT logged in.
*/ */
Route::group( Route::group(
['middleware' => 'user-not-logged-in', 'namespace' => 'FireflyIII\Http\Controllers'], static function () { ['middleware' => 'user-not-logged-in', 'namespace' => 'FireflyIII\Http\Controllers'],
static function () {
// Authentication Routes... // Authentication Routes...
Route::get('login', ['uses' =>'Auth\LoginController@showLoginForm', 'as' => 'login']); Route::get('login', ['uses' => 'Auth\LoginController@showLoginForm', 'as' => 'login']);
Route::post('login', ['uses' => 'Auth\LoginController@login', 'as' => 'login.post']); Route::post('login', ['uses' => 'Auth\LoginController@login', 'as' => 'login.post']);
// Registration Routes... // Registration Routes...
@ -65,7 +68,8 @@ Route::group(
* For some other routes, it is only relevant that the user is authenticated. * For some other routes, it is only relevant that the user is authenticated.
*/ */
Route::group( Route::group(
['middleware' => 'user-simple-auth', 'namespace' => 'FireflyIII\Http\Controllers'], static function () { ['middleware' => 'user-simple-auth', 'namespace' => 'FireflyIII\Http\Controllers'],
static function () {
Route::get('error', ['uses' => 'DebugController@displayError', 'as' => 'error']); Route::get('error', ['uses' => 'DebugController@displayError', 'as' => 'error']);
Route::any('logout', ['uses' => 'Auth\LoginController@logout', 'as' => 'logout']); Route::any('logout', ['uses' => 'Auth\LoginController@logout', 'as' => 'logout']);
Route::get('flush', ['uses' => 'DebugController@flush', 'as' => 'flush']); Route::get('flush', ['uses' => 'DebugController@flush', 'as' => 'flush']);
@ -96,7 +100,8 @@ Route::group(
* Home Controller. * Home Controller.
*/ */
Route::group( Route::group(
['middleware' => ['user-full-auth'], 'namespace' => 'FireflyIII\Http\Controllers'], static function () { ['middleware' => ['user-full-auth'], 'namespace' => 'FireflyIII\Http\Controllers'],
static function () {
Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']); Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
Route::get('/flash', ['uses' => 'DebugController@testFlash', 'as' => 'test-flash']); Route::get('/flash', ['uses' => 'DebugController@testFlash', 'as' => 'test-flash']);
Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']); Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']);
@ -111,22 +116,26 @@ Route::group(
* Account Controller. * Account Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'inactive-accounts', 'as' => 'accounts.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'inactive-accounts', 'as' => 'accounts.'],
static function () {
Route::get('{objectType}', ['uses' => 'Account\IndexController@inactive', 'as' => 'inactive.index'])->where( Route::get('{objectType}', ['uses' => 'Account\IndexController@inactive', 'as' => 'inactive.index'])->where(
'objectType', 'revenue|asset|expense|liabilities' 'objectType',
); 'revenue|asset|expense|liabilities'
);
} }
); );
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'accounts', 'as' => 'accounts.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'accounts', 'as' => 'accounts.'],
static function () {
// show: // show:
Route::get('{objectType}', ['uses' => 'Account\IndexController@index', 'as' => 'index'])->where('objectType', 'revenue|asset|expense|liabilities'); Route::get('{objectType}', ['uses' => 'Account\IndexController@index', 'as' => 'index'])->where('objectType', 'revenue|asset|expense|liabilities');
// create // create
Route::get('create/{objectType}', ['uses' => 'Account\CreateController@create', 'as' => 'create'])->where( Route::get('create/{objectType}', ['uses' => 'Account\CreateController@create', 'as' => 'create'])->where(
'objectType', 'revenue|asset|expense|liabilities' 'objectType',
); 'revenue|asset|expense|liabilities'
);
Route::post('store', ['uses' => 'Account\CreateController@store', 'as' => 'store']); Route::post('store', ['uses' => 'Account\CreateController@store', 'as' => 'store']);
// edit // edit
@ -148,8 +157,9 @@ Route::group(
// reconcile JSON routes // reconcile JSON routes
Route::get('reconcile/{account}/overview/{start_date?}/{end_date?}', ['uses' => 'Json\ReconcileController@overview', 'as' => 'reconcile.overview']); Route::get('reconcile/{account}/overview/{start_date?}/{end_date?}', ['uses' => 'Json\ReconcileController@overview', 'as' => 'reconcile.overview']);
Route::get( Route::get(
'reconcile/{account}/transactions/{start_date?}/{end_date?}', ['uses' => 'Json\ReconcileController@transactions', 'as' => 'reconcile.transactions'] 'reconcile/{account}/transactions/{start_date?}/{end_date?}',
); ['uses' => 'Json\ReconcileController@transactions', 'as' => 'reconcile.transactions']
);
// show reconciliation // show reconciliation
// TODO improve me // TODO improve me
@ -163,7 +173,8 @@ Route::group(
* Attachment Controller. * Attachment Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'attachments', 'as' => 'attachments.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'attachments', 'as' => 'attachments.'],
static function () {
Route::get('', ['uses' => 'AttachmentController@index', 'as' => 'index']); Route::get('', ['uses' => 'AttachmentController@index', 'as' => 'index']);
Route::get('edit/{attachment}', ['uses' => 'AttachmentController@edit', 'as' => 'edit']); Route::get('edit/{attachment}', ['uses' => 'AttachmentController@edit', 'as' => 'edit']);
Route::get('delete/{attachment}', ['uses' => 'AttachmentController@delete', 'as' => 'delete']); Route::get('delete/{attachment}', ['uses' => 'AttachmentController@delete', 'as' => 'delete']);
@ -179,7 +190,8 @@ Route::group(
* Bills Controller. * Bills Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'bills', 'as' => 'bills.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'bills', 'as' => 'bills.'],
static function () {
Route::get('', ['uses' => 'BillController@index', 'as' => 'index']); Route::get('', ['uses' => 'BillController@index', 'as' => 'index']);
Route::get('rescan/{bill}', ['uses' => 'BillController@rescan', 'as' => 'rescan']); Route::get('rescan/{bill}', ['uses' => 'BillController@rescan', 'as' => 'rescan']);
Route::get('create', ['uses' => 'BillController@create', 'as' => 'create']); Route::get('create', ['uses' => 'BillController@create', 'as' => 'create']);
@ -197,7 +209,8 @@ Route::group(
* Budget Controller. * Budget Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'budgets', 'as' => 'budgets.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'budgets', 'as' => 'budgets.'],
static function () {
// delete // delete
Route::get('delete/{budget}', ['uses' => 'Budget\DeleteController@delete', 'as' => 'delete']); Route::get('delete/{budget}', ['uses' => 'Budget\DeleteController@delete', 'as' => 'delete']);
@ -235,7 +248,8 @@ Route::group(
// create // create
Route::get('create/{start_date}/{end_date}/{currency?}', ['uses' => 'Budget\AvailableBudgetController@create', 'as' => 'create']); Route::get('create/{start_date}/{end_date}/{currency?}', ['uses' => 'Budget\AvailableBudgetController@create', 'as' => 'create']);
Route::get( Route::get(
'create-alternative/{start_date}/{end_date}', ['uses' => 'Budget\AvailableBudgetController@createAlternative', 'as' => 'create-alternative'] 'create-alternative/{start_date}/{end_date}',
['uses' => 'Budget\AvailableBudgetController@createAlternative', 'as' => 'create-alternative']
); );
Route::post('store', ['uses' => 'Budget\AvailableBudgetController@store', 'as' => 'store']); Route::post('store', ['uses' => 'Budget\AvailableBudgetController@store', 'as' => 'store']);
@ -266,7 +280,8 @@ Route::group(
* Category Controller. * Category Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'categories', 'as' => 'categories.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'categories', 'as' => 'categories.'],
static function () {
// index: // index:
Route::get('', ['uses' => 'Category\IndexController@index', 'as' => 'index']); Route::get('', ['uses' => 'Category\IndexController@index', 'as' => 'index']);
@ -297,7 +312,8 @@ Route::group(
* Currency Controller. * Currency Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'currencies', 'as' => 'currencies.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'currencies', 'as' => 'currencies.'],
static function () {
Route::get('', ['uses' => 'CurrencyController@index', 'as' => 'index']); Route::get('', ['uses' => 'CurrencyController@index', 'as' => 'index']);
Route::get('create', ['uses' => 'CurrencyController@create', 'as' => 'create']); Route::get('create', ['uses' => 'CurrencyController@create', 'as' => 'create']);
Route::get('edit/{currency}', ['uses' => 'CurrencyController@edit', 'as' => 'edit']); Route::get('edit/{currency}', ['uses' => 'CurrencyController@edit', 'as' => 'edit']);
@ -368,7 +384,8 @@ Route::group(
['uses' => 'BudgetReportController@categoryExpense', 'as' => 'category-expense'] ['uses' => 'BudgetReportController@categoryExpense', 'as' => 'category-expense']
); );
Route::get( Route::get(
'budget/expense/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetReportController@budgetExpense', 'as' => 'budget-expense'] 'budget/expense/{accountList}/{budgetList}/{start_date}/{end_date}',
['uses' => 'BudgetReportController@budgetExpense', 'as' => 'budget-expense']
); );
Route::get( Route::get(
'source-account/expense/{accountList}/{budgetList}/{start_date}/{end_date}', 'source-account/expense/{accountList}/{budgetList}/{start_date}/{end_date}',
@ -392,16 +409,40 @@ Route::group(
Route::get('period/{category}', ['uses' => 'CategoryController@currentPeriod', 'as' => 'current']); Route::get('period/{category}', ['uses' => 'CategoryController@currentPeriod', 'as' => 'current']);
Route::get('period/{category}/{date}', ['uses' => 'CategoryController@specificPeriod', 'as' => 'specific']); Route::get('period/{category}/{date}', ['uses' => 'CategoryController@specificPeriod', 'as' => 'specific']);
Route::get('all/{category}', ['uses' => 'CategoryController@all', 'as' => 'all']); Route::get('all/{category}', ['uses' => 'CategoryController@all', 'as' => 'all']);
Route::get('report-period/0/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@reportPeriodNoCategory', 'as' => 'period.no-category']); Route::get(
'report-period/0/{accountList}/{start_date}/{end_date}',
['uses' => 'CategoryController@reportPeriodNoCategory', 'as' => 'period.no-category']
);
Route::get('report-period/{category}/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@reportPeriod', 'as' => 'period']); Route::get('report-period/{category}/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@reportPeriod', 'as' => 'period']);
Route::get('category/expense/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@categoryExpense', 'as' => 'category-expense']); Route::get(
Route::get('category/income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@categoryIncome', 'as' => 'category-income']); 'category/expense/{accountList}/{categoryList}/{start_date}/{end_date}',
Route::get('budget/expense/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@budgetExpense', 'as' => 'budget-expense']); ['uses' => 'CategoryReportController@categoryExpense', 'as' => 'category-expense']
Route::get('source/expense/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@sourceExpense', 'as' => 'source-expense']); );
Route::get('source/income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@sourceIncome', 'as' => 'source-income']); Route::get(
Route::get('dest/expense/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@destinationExpense', 'as' => 'dest-expense']); 'category/income/{accountList}/{categoryList}/{start_date}/{end_date}',
Route::get('dest/income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@destinationIncome', 'as' => 'dest-income']); ['uses' => 'CategoryReportController@categoryIncome', 'as' => 'category-income']
);
Route::get(
'budget/expense/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryReportController@budgetExpense', 'as' => 'budget-expense']
);
Route::get(
'source/expense/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryReportController@sourceExpense', 'as' => 'source-expense']
);
Route::get(
'source/income/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryReportController@sourceIncome', 'as' => 'source-income']
);
Route::get(
'dest/expense/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryReportController@destinationExpense', 'as' => 'dest-expense']
);
Route::get(
'dest/income/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryReportController@destinationIncome', 'as' => 'dest-income']
);
Route::get('operations/{accountList}/{category}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@mainChart', 'as' => 'main']); Route::get('operations/{accountList}/{category}/{start_date}/{end_date}', ['uses' => 'CategoryReportController@mainChart', 'as' => 'main']);
} }
); );
@ -410,10 +451,14 @@ Route::group(
* Chart\Tag Controller. * Chart\Tag Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Chart', 'prefix' => 'chart/tag', 'as' => 'chart.tag.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Chart', 'prefix' => 'chart/tag', 'as' => 'chart.tag.'],
static function () {
Route::get('tag/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@tagExpense', 'as' => 'tag-expense']); Route::get('tag/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@tagExpense', 'as' => 'tag-expense']);
Route::get('tag/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@tagIncome', 'as' => 'tag-income']); Route::get('tag/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@tagIncome', 'as' => 'tag-income']);
Route::get('category/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@categoryExpense', 'as' => 'category-expense']); Route::get(
'category/expense/{accountList}/{tagList}/{start_date}/{end_date}',
['uses' => 'TagReportController@categoryExpense', 'as' => 'category-expense']
);
Route::get('category/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@categoryIncome', 'as' => 'category-income']); Route::get('category/income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@categoryIncome', 'as' => 'category-income']);
Route::get('budget/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@budgetExpense', 'as' => 'budget-expense']); Route::get('budget/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@budgetExpense', 'as' => 'budget-expense']);
Route::get('source/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@sourceExpense', 'as' => 'source-expense']); Route::get('source/expense/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagReportController@sourceExpense', 'as' => 'source-expense']);
@ -433,9 +478,18 @@ Route::group(
static function () { static function () {
Route::get('main/{accountList}/{account}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@mainChart', 'as' => 'main']); Route::get('main/{accountList}/{account}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@mainChart', 'as' => 'main']);
Route::get('category/expense/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@categoryExpense', 'as' => 'category-expense']); Route::get(
Route::get('category/income/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@categoryIncome', 'as' => 'category-income']); 'category/expense/{accountList}/{doubleList}/{start_date}/{end_date}',
Route::get('budget/expense/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@budgetExpense', 'as' => 'budget-expense']); ['uses' => 'DoubleReportController@categoryExpense', 'as' => 'category-expense']
);
Route::get(
'category/income/{accountList}/{doubleList}/{start_date}/{end_date}',
['uses' => 'DoubleReportController@categoryIncome', 'as' => 'category-income']
);
Route::get(
'budget/expense/{accountList}/{doubleList}/{start_date}/{end_date}',
['uses' => 'DoubleReportController@budgetExpense', 'as' => 'budget-expense']
);
Route::get('tag/expense/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@tagExpense', 'as' => 'tag-expense']); Route::get('tag/expense/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@tagExpense', 'as' => 'tag-expense']);
Route::get('tag/income/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@tagIncome', 'as' => 'tag-income']); Route::get('tag/income/{accountList}/{doubleList}/{start_date}/{end_date}', ['uses' => 'DoubleReportController@tagIncome', 'as' => 'tag-income']);
@ -471,7 +525,10 @@ Route::group(
static function () { static function () {
Route::get('categories/{objectType}/{start_date}/{end_date}', ['uses' => 'TransactionController@categories', 'as' => 'categories']); Route::get('categories/{objectType}/{start_date}/{end_date}', ['uses' => 'TransactionController@categories', 'as' => 'categories']);
Route::get('budgets/{start_date}/{end_date}', ['uses' => 'TransactionController@budgets', 'as' => 'budgets']); Route::get('budgets/{start_date}/{end_date}', ['uses' => 'TransactionController@budgets', 'as' => 'budgets']);
Route::get('destinationAccounts/{objectType}/{start_date}/{end_date}', ['uses' => 'TransactionController@destinationAccounts', 'as' => 'destinationAccounts']); Route::get(
'destinationAccounts/{objectType}/{start_date}/{end_date}',
['uses' => 'TransactionController@destinationAccounts', 'as' => 'destinationAccounts']
);
Route::get('sourceAccounts/{objectType}/{start_date}/{end_date}', ['uses' => 'TransactionController@sourceAccounts', 'as' => 'sourceAccounts']); Route::get('sourceAccounts/{objectType}/{start_date}/{end_date}', ['uses' => 'TransactionController@sourceAccounts', 'as' => 'sourceAccounts']);
// //
} }
@ -481,17 +538,20 @@ Route::group(
* Export controller. * Export controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'export', 'as' => 'export.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'export', 'as' => 'export.'],
static function () {
// index // index
Route::get('', ['uses' => 'Export\IndexController@index', 'as' => 'index']); Route::get('', ['uses' => 'Export\IndexController@index', 'as' => 'index']);
Route::get('export', ['uses' => 'Export\IndexController@export', 'as' => 'export']); Route::get('export', ['uses' => 'Export\IndexController@export', 'as' => 'export']);
}); }
);
/** /**
* Import Controller. * Import Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'import', 'as' => 'import.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'import', 'as' => 'import.'],
static function () {
// index // index
Route::get('', ['uses' => 'Import\IndexController@index', 'as' => 'index']); Route::get('', ['uses' => 'Import\IndexController@index', 'as' => 'index']);
@ -527,7 +587,8 @@ Route::group(
* Help Controller. * Help Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'help', 'as' => 'help.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'help', 'as' => 'help.'],
static function () {
Route::get('{route}', ['uses' => 'HelpController@show', 'as' => 'show']); Route::get('{route}', ['uses' => 'HelpController@show', 'as' => 'show']);
} }
); );
@ -536,7 +597,8 @@ Route::group(
* Budget Controller. * Budget Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'v1/jscript', 'as' => 'javascript.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'v1/jscript', 'as' => 'javascript.'],
static function () {
Route::get('variables', ['uses' => 'JavascriptController@variables', 'as' => 'variables']); Route::get('variables', ['uses' => 'JavascriptController@variables', 'as' => 'variables']);
Route::get('accounts', ['uses' => 'JavascriptController@accounts', 'as' => 'accounts']); Route::get('accounts', ['uses' => 'JavascriptController@accounts', 'as' => 'accounts']);
Route::get('currencies', ['uses' => 'JavascriptController@currencies', 'as' => 'currencies']); Route::get('currencies', ['uses' => 'JavascriptController@currencies', 'as' => 'currencies']);
@ -547,7 +609,8 @@ Route::group(
* JSON Controller(s). * JSON Controller(s).
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'json', 'as' => 'json.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'json', 'as' => 'json.'],
static function () {
// for auto complete // for auto complete
Route::get('accounts', ['uses' => 'Json\AutoCompleteController@accounts', 'as' => 'autocomplete.accounts']); Route::get('accounts', ['uses' => 'Json\AutoCompleteController@accounts', 'as' => 'autocomplete.accounts']);
@ -593,7 +656,8 @@ Route::group(
* NewUser Controller. * NewUser Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'new-user', 'as' => 'new-user.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'new-user', 'as' => 'new-user.'],
static function () {
Route::get('', ['uses' => 'NewUserController@index', 'as' => 'index']); Route::get('', ['uses' => 'NewUserController@index', 'as' => 'index']);
Route::post('submit', ['uses' => 'NewUserController@submit', 'as' => 'submit']); Route::post('submit', ['uses' => 'NewUserController@submit', 'as' => 'submit']);
} }
@ -603,7 +667,8 @@ Route::group(
* Piggy Bank Controller. * Piggy Bank Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'piggy-banks', 'as' => 'piggy-banks.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'piggy-banks', 'as' => 'piggy-banks.'],
static function () {
Route::get('', ['uses' => 'PiggyBankController@index', 'as' => 'index']); Route::get('', ['uses' => 'PiggyBankController@index', 'as' => 'index']);
Route::get('add/{piggyBank}', ['uses' => 'PiggyBankController@add', 'as' => 'add-money']); Route::get('add/{piggyBank}', ['uses' => 'PiggyBankController@add', 'as' => 'add-money']);
Route::get('remove/{piggyBank}', ['uses' => 'PiggyBankController@remove', 'as' => 'remove-money']); Route::get('remove/{piggyBank}', ['uses' => 'PiggyBankController@remove', 'as' => 'remove-money']);
@ -627,7 +692,8 @@ Route::group(
* Preferences Controller. * Preferences Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'preferences', 'as' => 'preferences.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'preferences', 'as' => 'preferences.'],
static function () {
Route::get('', ['uses' => 'PreferencesController@index', 'as' => 'index']); Route::get('', ['uses' => 'PreferencesController@index', 'as' => 'index']);
Route::post('', ['uses' => 'PreferencesController@postIndex', 'as' => 'update']); Route::post('', ['uses' => 'PreferencesController@postIndex', 'as' => 'update']);
} }
@ -637,7 +703,8 @@ Route::group(
* Profile Controller. * Profile Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'profile', 'as' => 'profile.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'profile', 'as' => 'profile.'],
static function () {
Route::get('', ['uses' => 'ProfileController@index', 'as' => 'index']); Route::get('', ['uses' => 'ProfileController@index', 'as' => 'index']);
Route::get('change-email', ['uses' => 'ProfileController@changeEmail', 'as' => 'change-email']); Route::get('change-email', ['uses' => 'ProfileController@changeEmail', 'as' => 'change-email']);
Route::get('change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']); Route::get('change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);
@ -666,7 +733,8 @@ Route::group(
* Recurring Transactions Controller. * Recurring Transactions Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'recurring', 'as' => 'recurring.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'recurring', 'as' => 'recurring.'],
static function () {
Route::get('', ['uses' => 'Recurring\IndexController@index', 'as' => 'index']); Route::get('', ['uses' => 'Recurring\IndexController@index', 'as' => 'index']);
Route::get('show/{recurrence}', ['uses' => 'Recurring\ShowController@show', 'as' => 'show']); Route::get('show/{recurrence}', ['uses' => 'Recurring\ShowController@show', 'as' => 'show']);
@ -688,7 +756,8 @@ Route::group(
* Report Controller. * Report Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'reports', 'as' => 'reports.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'reports', 'as' => 'reports.'],
static function () {
Route::get('', ['uses' => 'ReportController@index', 'as' => 'index']); Route::get('', ['uses' => 'ReportController@index', 'as' => 'index']);
Route::get('options/{reportType}', ['uses' => 'ReportController@options', 'as' => 'options']); Route::get('options/{reportType}', ['uses' => 'ReportController@options', 'as' => 'options']);
Route::get('default/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@defaultReport', 'as' => 'report.default']); Route::get('default/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@defaultReport', 'as' => 'report.default']);
@ -745,54 +814,60 @@ Route::group(
* Report Data Income/Expenses Controller (called financial operations). * Report Data Income/Expenses Controller (called financial operations).
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/operations', ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/operations',
'as' => 'report-data.operations.', ], static function () { 'as' => 'report-data.operations.',],
Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@operations', 'as' => 'operations']); static function () {
Route::get('income/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@income', 'as' => 'income']); Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@operations', 'as' => 'operations']);
Route::get('expenses/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@expenses', 'as' => 'expenses']); Route::get('income/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@income', 'as' => 'income']);
} Route::get('expenses/{accountList}/{start_date}/{end_date}', ['uses' => 'OperationsController@expenses', 'as' => 'expenses']);
}
); );
/** /**
* Report Data Category Controller. * Report Data Category Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/category', ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/category',
'as' => 'report-data.category.', ], static function () { 'as' => 'report-data.category.',],
static function () {
// TODO three routes still in use? // TODO three routes still in use?
Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@operations', 'as' => 'operations']); Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@operations', 'as' => 'operations']);
Route::get('income/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@income', 'as' => 'income']); Route::get('income/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@income', 'as' => 'income']);
Route::get('expenses/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@expenses', 'as' => 'expenses']); Route::get('expenses/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@expenses', 'as' => 'expenses']);
Route::get('accounts/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@accounts', 'as' => 'accounts']); Route::get('accounts/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@accounts', 'as' => 'accounts']);
Route::get('categories/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@categories', 'as' => 'categories']); Route::get('categories/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@categories', 'as' => 'categories']);
Route::get('account-per-category/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@accountPerCategory', 'as' => 'account-per-category']); Route::get(
'account-per-category/{accountList}/{categoryList}/{start_date}/{end_date}',
['uses' => 'CategoryController@accountPerCategory', 'as' => 'account-per-category']
);
Route::get('top-expenses/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@topExpenses', 'as' => 'top-expenses']); Route::get('top-expenses/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@topExpenses', 'as' => 'top-expenses']);
Route::get('avg-expenses/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@avgExpenses', 'as' => 'avg-expenses']); Route::get('avg-expenses/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@avgExpenses', 'as' => 'avg-expenses']);
Route::get('top-income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@topIncome', 'as' => 'top-income']); Route::get('top-income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@topIncome', 'as' => 'top-income']);
Route::get('avg-income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@avgIncome', 'as' => 'avg-income']); Route::get('avg-income/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'CategoryController@avgIncome', 'as' => 'avg-income']);
} }
); );
/** /**
* Report Data TAG Controller. * Report Data TAG Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/tag', ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Report', 'prefix' => 'report-data/tag',
'as' => 'report-data.tag.', ], static function () { 'as' => 'report-data.tag.',],
Route::get('accounts/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@accounts', 'as' => 'accounts']); static function () {
Route::get('tags/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@tags', 'as' => 'tags']); Route::get('accounts/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@accounts', 'as' => 'accounts']);
Route::get('account-per-tag/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@accountPerTag', 'as' => 'account-per-tag']); Route::get('tags/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@tags', 'as' => 'tags']);
Route::get('account-per-tag/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@accountPerTag', 'as' => 'account-per-tag']);
Route::get('top-expenses/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@topExpenses', 'as' => 'top-expenses']); Route::get('top-expenses/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@topExpenses', 'as' => 'top-expenses']);
Route::get('avg-expenses/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@avgExpenses', 'as' => 'avg-expenses']); Route::get('avg-expenses/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@avgExpenses', 'as' => 'avg-expenses']);
Route::get('top-income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@topIncome', 'as' => 'top-income']); Route::get('top-income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@topIncome', 'as' => 'top-income']);
Route::get('avg-income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@avgIncome', 'as' => 'avg-income']); Route::get('avg-income/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'TagController@avgIncome', 'as' => 'avg-income']);
} }
); );
/** /**
@ -818,7 +893,10 @@ Route::group(
Route::get('accounts/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@accounts', 'as' => 'accounts']); Route::get('accounts/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@accounts', 'as' => 'accounts']);
Route::get('budgets/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@budgets', 'as' => 'budgets']); Route::get('budgets/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@budgets', 'as' => 'budgets']);
Route::get('account-per-budget/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@accountPerBudget', 'as' => 'account-per-budget']); Route::get(
'account-per-budget/{accountList}/{budgetList}/{start_date}/{end_date}',
['uses' => 'BudgetController@accountPerBudget', 'as' => 'account-per-budget']
);
Route::get('top-expenses/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@topExpenses', 'as' => 'top-expenses']); Route::get('top-expenses/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@topExpenses', 'as' => 'top-expenses']);
Route::get('avg-expenses/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@avgExpenses', 'as' => 'avg-expenses']); Route::get('avg-expenses/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'BudgetController@avgExpenses', 'as' => 'avg-expenses']);
} }
@ -828,7 +906,8 @@ Route::group(
* Rules Controller. * Rules Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'rules', 'as' => 'rules.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'rules', 'as' => 'rules.'],
static function () {
// create controller // create controller
Route::get('create/{ruleGroup?}', ['uses' => 'Rule\CreateController@create', 'as' => 'create']); Route::get('create/{ruleGroup?}', ['uses' => 'Rule\CreateController@create', 'as' => 'create']);
@ -864,7 +943,8 @@ Route::group(
* Rule Groups Controller. * Rule Groups Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'rule-groups', 'as' => 'rule-groups.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'rule-groups', 'as' => 'rule-groups.'],
static function () {
Route::get('create', ['uses' => 'RuleGroup\CreateController@create', 'as' => 'create']); Route::get('create', ['uses' => 'RuleGroup\CreateController@create', 'as' => 'create']);
Route::get('edit/{ruleGroup}', ['uses' => 'RuleGroup\EditController@edit', 'as' => 'edit']); Route::get('edit/{ruleGroup}', ['uses' => 'RuleGroup\EditController@edit', 'as' => 'edit']);
Route::get('delete/{ruleGroup}', ['uses' => 'RuleGroup\DeleteController@delete', 'as' => 'delete']); Route::get('delete/{ruleGroup}', ['uses' => 'RuleGroup\DeleteController@delete', 'as' => 'delete']);
@ -883,7 +963,8 @@ Route::group(
* Search Controller. * Search Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'search', 'as' => 'search.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'search', 'as' => 'search.'],
static function () {
Route::get('', ['uses' => 'SearchController@index', 'as' => 'index']); Route::get('', ['uses' => 'SearchController@index', 'as' => 'index']);
Route::any('search', ['uses' => 'SearchController@search', 'as' => 'search']); Route::any('search', ['uses' => 'SearchController@search', 'as' => 'search']);
} }
@ -893,7 +974,8 @@ Route::group(
* Tag Controller. * Tag Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'tags', 'as' => 'tags.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'tags', 'as' => 'tags.'],
static function () {
Route::get('', ['uses' => 'TagController@index', 'as' => 'index']); Route::get('', ['uses' => 'TagController@index', 'as' => 'index']);
Route::get('create', ['uses' => 'TagController@create', 'as' => 'create']); Route::get('create', ['uses' => 'TagController@create', 'as' => 'create']);
@ -914,17 +996,18 @@ Route::group(
* Transaction Controller. * Transaction Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'transactions', 'as' => 'transactions.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'transactions', 'as' => 'transactions.'],
static function () {
// show groups: // show groups:
// TODO improve these routes // TODO improve these routes
Route::get('{what}/all', ['uses' => 'Transaction\IndexController@indexAll', 'as' => 'index.all'])->where( Route::get('{what}/all', ['uses' => 'Transaction\IndexController@indexAll', 'as' => 'index.all'])->where(
['what' => 'withdrawal|deposit|transfers|transfer'] ['what' => 'withdrawal|deposit|transfers|transfer']
); );
Route::get('{what}/{start_date?}/{end_date?}', ['uses' => 'Transaction\IndexController@index', 'as' => 'index'])->where( Route::get('{what}/{start_date?}/{end_date?}', ['uses' => 'Transaction\IndexController@index', 'as' => 'index'])->where(
['what' => 'withdrawal|deposit|transfers|transfer'] ['what' => 'withdrawal|deposit|transfers|transfer']
); );
// create group: // create group:
Route::get('create/{objectType}', ['uses' => 'Transaction\CreateController@create', 'as' => 'create']); Route::get('create/{objectType}', ['uses' => 'Transaction\CreateController@create', 'as' => 'create']);
@ -988,11 +1071,12 @@ Route::group(
* Transaction Convert Controller. * Transaction Convert Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/convert', ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Transaction', 'prefix' => 'transactions/convert',
'as' => 'transactions.convert.', ], static function () { 'as' => 'transactions.convert.',],
Route::get('{transactionType}/{transactionGroup}', ['uses' => 'ConvertController@index', 'as' => 'index']); static function () {
Route::post('{transactionType}/{transactionGroup}', ['uses' => 'ConvertController@postIndex', 'as' => 'index.post']); Route::get('{transactionType}/{transactionGroup}', ['uses' => 'ConvertController@index', 'as' => 'index']);
} Route::post('{transactionType}/{transactionGroup}', ['uses' => 'ConvertController@postIndex', 'as' => 'index.post']);
}
); );
/** /**
@ -1016,7 +1100,8 @@ Route::group(
* Report Popup Controller. * Report Popup Controller.
*/ */
Route::group( Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Popup', 'prefix' => 'popup', 'as' => 'popup.'], static function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Popup', 'prefix' => 'popup', 'as' => 'popup.'],
static function () {
Route::get('general', ['uses' => 'ReportController@general', 'as' => 'general']); Route::get('general', ['uses' => 'ReportController@general', 'as' => 'general']);
} }
); );
@ -1025,7 +1110,8 @@ Route::group(
* For the admin routes, the user must be logged in and have the role of 'owner'. * For the admin routes, the user must be logged in and have the role of 'owner'.
*/ */
Route::group( Route::group(
['middleware' => 'admin', 'namespace' => 'FireflyIII\Http\Controllers\Admin', 'prefix' => 'admin', 'as' => 'admin.'], static function () { ['middleware' => 'admin', 'namespace' => 'FireflyIII\Http\Controllers\Admin', 'prefix' => 'admin', 'as' => 'admin.'],
static function () {
// admin home // admin home
Route::get('', ['uses' => 'HomeController@index', 'as' => 'index']); Route::get('', ['uses' => 'HomeController@index', 'as' => 'index']);