kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-26 13:36:15 +00:00
Code Issues Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
James Cole
2020-03-17 16:06:30 +00:00
committed by StyleCI Bot
parent 9a25d6a741
commit ba4c1d95a7
73 changed files with 1163 additions and 1365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
routes/api.php
View File

@@ -2,7 +2,7 @@
/**
* api.php
* Copyright (c) 2019 james@firefly-iii.org
* Copyright (c) 2019 james@firefly-iii.org.
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
@@ -22,11 +22,10 @@
declare(strict_types=1);
Route::group(
[
'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'about',
'as' => 'api.v1.about.'],
'as' => 'api.v1.about.', ],
static function () {
// Accounts API routes:
@@ -35,10 +34,9 @@ Route::group(
}
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'accounts',
'as' => 'api.v1.accounts.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'accounts',
'as' => 'api.v1.accounts.', ],
static function () {
// Accounts API routes:
@@ -50,13 +48,12 @@ Route::group(
Route::get('{account}/piggy_banks', ['uses' => 'AccountController@piggyBanks', 'as' => 'piggy_banks']);
Route::get('{account}/transactions', ['uses' => 'AccountController@transactions', 'as' => 'transactions']);
}
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'attachments',
'as' => 'api.v1.attachments.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'attachments',
'as' => 'api.v1.attachments.', ],
static function () {
// Attachment API routes:
@@ -71,8 +68,8 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'available_budgets',
'as' => 'api.v1.available_budgets.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'available_budgets',
'as' => 'api.v1.available_budgets.', ],
static function () {
// Available Budget API routes:
@@ -85,26 +82,25 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'bills',
'as' => 'api.v1.bills.'], static function () {
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'bills',
'as' => 'api.v1.bills.', ], static function () {
// Bills API routes:
Route::get('', ['uses' => 'BillController@index', 'as' => 'index']);
Route::post('', ['uses' => 'BillController@store', 'as' => 'store']);
Route::get('{bill}', ['uses' => 'BillController@show', 'as' => 'show']);
Route::put('{bill}', ['uses' => 'BillController@update', 'as' => 'update']);
Route::delete('{bill}', ['uses' => 'BillController@delete', 'as' => 'delete']);
Route::get('', ['uses' => 'BillController@index', 'as' => 'index']);
Route::post('', ['uses' => 'BillController@store', 'as' => 'store']);
Route::get('{bill}', ['uses' => 'BillController@show', 'as' => 'show']);
Route::put('{bill}', ['uses' => 'BillController@update', 'as' => 'update']);
Route::delete('{bill}', ['uses' => 'BillController@delete', 'as' => 'delete']);
Route::get('{bill}/attachments', ['uses' => 'BillController@attachments', 'as' => 'attachments']);
Route::get('{bill}/rules', ['uses' => 'BillController@rules', 'as' => 'rules']);
Route::get('{bill}/transactions', ['uses' => 'BillController@transactions', 'as' => 'transactions']);
}
Route::get('{bill}/attachments', ['uses' => 'BillController@attachments', 'as' => 'attachments']);
Route::get('{bill}/rules', ['uses' => 'BillController@rules', 'as' => 'rules']);
Route::get('{bill}/transactions', ['uses' => 'BillController@transactions', 'as' => 'transactions']);
}
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'budgets/limits',
'as' => 'api.v1.budget_limits.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'budgets/limits',
'as' => 'api.v1.budget_limits.', ],
static function () {
// Budget Limit API routes:
@@ -118,8 +114,8 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'budgets',
'as' => 'api.v1.budgets.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'budgets',
'as' => 'api.v1.budgets.', ],
static function () {
// Budget API routes:
@@ -135,8 +131,8 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'categories',
'as' => 'api.v1.categories.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'categories',
'as' => 'api.v1.categories.', ],
static function () {
// Category API routes:
@@ -150,25 +146,24 @@ Route::group(
);
/**
* CHART ROUTES
* CHART ROUTES.
*/
// Accounts
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/account',
'as' => 'api.v1.chart.account.'],
['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/account',
'as' => 'api.v1.chart.account.', ],
static function () {
Route::get('overview', ['uses' => 'AccountController@overview', 'as' => 'overview']);
Route::get('expense', ['uses' => 'AccountController@expenseOverview', 'as' => 'expense']);
Route::get('revenue', ['uses' => 'AccountController@revenueOverview', 'as' => 'revenue']);
}
);
// Available budgets
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/ab',
'as' => 'api.v1.chart.ab.'],
['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/ab',
'as' => 'api.v1.chart.ab.', ],
static function () {
// Overview API routes:
@@ -178,8 +173,8 @@ Route::group(
// Categories
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/category',
'as' => 'api.v1.chart.category.'],
['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/category',
'as' => 'api.v1.chart.category.', ],
static function () {
// Overview API routes:
@@ -187,13 +182,9 @@ Route::group(
}
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'configuration',
'as' => 'api.v1.configuration.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'configuration',
'as' => 'api.v1.configuration.', ],
static function () {
// Configuration API routes:
@@ -203,8 +194,8 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'cer',
'as' => 'api.v1.cer.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'cer',
'as' => 'api.v1.cer.', ],
static function () {
// Currency Exchange Rate API routes:
@@ -213,8 +204,8 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'import',
'as' => 'api.v1.import.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'import',
'as' => 'api.v1.import.', ],
static function () {
// Transaction Links API routes:
@@ -224,8 +215,8 @@ Route::group(
}
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'link_types',
'as' => 'api.v1.link_types.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'link_types',
'as' => 'api.v1.link_types.', ],
static function () {
// Link Type API routes:
@@ -239,8 +230,8 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transaction_links',
'as' => 'api.v1.transaction_links.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transaction_links',
'as' => 'api.v1.transaction_links.', ],
static function () {
// Transaction Links API routes:
@@ -249,13 +240,12 @@ Route::group(
Route::get('{journalLink}', ['uses' => 'TransactionLinkController@show', 'as' => 'show']);
Route::put('{journalLink}', ['uses' => 'TransactionLinkController@update', 'as' => 'update']);
Route::delete('{journalLink}', ['uses' => 'TransactionLinkController@delete', 'as' => 'delete']);
}
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'piggy_banks',
'as' => 'api.v1.piggy_banks.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'piggy_banks',
'as' => 'api.v1.piggy_banks.', ],
static function () {
// Piggy Bank API routes:
@@ -269,8 +259,8 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'preferences',
'as' => 'api.v1.preferences.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'preferences',
'as' => 'api.v1.preferences.', ],
static function () {
// Preference API routes:
@@ -281,8 +271,8 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'recurrences',
'as' => 'api.v1.recurrences.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'recurrences',
'as' => 'api.v1.recurrences.', ],
static function () {
// Recurrence API routes:
@@ -297,8 +287,8 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'rules',
'as' => 'api.v1.rules.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'rules',
'as' => 'api.v1.rules.', ],
static function () {
// Rules API routes:
@@ -315,8 +305,8 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'rule_groups',
'as' => 'api.v1.rule_groups.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'rule_groups',
'as' => 'api.v1.rule_groups.', ],
static function () {
// Rules API routes:
@@ -335,8 +325,8 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers\Search', 'prefix' => 'search',
'as' => 'api.v1.search.'],
['namespace' => 'FireflyIII\Api\V1\Controllers\Search', 'prefix' => 'search',
'as' => 'api.v1.search.', ],
static function () {
// Attachment API routes:
@@ -347,19 +337,18 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'summary',
'as' => 'api.v1.summary.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'summary',
'as' => 'api.v1.summary.', ],
static function () {
// Overview API routes:
Route::get('basic', ['uses' => 'SummaryController@basic', 'as' => 'basic']);
}
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'currencies',
'as' => 'api.v1.currencies.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'currencies',
'as' => 'api.v1.currencies.', ],
static function () {
// Transaction currency API routes:
@@ -385,8 +374,8 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'tags',
'as' => 'api.v1.tags.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'tags',
'as' => 'api.v1.tags.', ],
static function () {
// Tag API routes:
Route::get('', ['uses' => 'TagController@index', 'as' => 'index']);
@@ -399,18 +388,17 @@ Route::group(
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'tag-cloud',
'as' => 'api.v1.tag-cloud.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'tag-cloud',
'as' => 'api.v1.tag-cloud.', ],
static function () {
// Tag cloud API routes (to prevent collisions)
Route::get('', ['uses' => 'TagController@cloud', 'as' => 'cloud']);
}
);
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transactions',
'as' => 'api.v1.transactions.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transactions',
'as' => 'api.v1.transactions.', ],
static function () {
// Transaction API routes:
@@ -427,8 +415,8 @@ Route::group(
// special group for transaction journals
Route::group(
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transaction-journals',
'as' => 'api.v1.journals.'],
['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transaction-journals',
'as' => 'api.v1.journals.', ],
static function () {
// Transaction API routes:
@@ -436,10 +424,9 @@ Route::group(
}
);
Route::group(
['middleware' => ['auth:api', 'bindings', \FireflyIII\Http\Middleware\IsAdmin::class], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'users',
'as' => 'api.v1.users.'],
['middleware' => ['auth:api', 'bindings', \FireflyIII\Http\Middleware\IsAdmin::class], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'users',
'as' => 'api.v1.users.', ],
static function () {
// Users API routes:

260
routes/breadcrumbs.php
View File

@@ -1,7 +1,7 @@
<?php
/**
* breadcrumbs.php
* Copyright (c) 2019 james@firefly-iii.org
* Copyright (c) 2019 james@firefly-iii.org.
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
@@ -68,14 +68,14 @@ try {
// HOME
Breadcrumbs::register(
'home',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->push(trans('breadcrumbs.home'), route('index'));
}
);
Breadcrumbs::register(
'index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->push(trans('breadcrumbs.home'), route('index'));
}
);
@@ -83,7 +83,7 @@ try {
// ACCOUNTS
Breadcrumbs::register(
'accounts.index',
function (BreadcrumbsGenerator $breadcrumbs, string $what) {
static function (BreadcrumbsGenerator $breadcrumbs, string $what) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.' . strtolower(e($what)) . '_accounts'), route('accounts.index', [$what]));
}
@@ -98,7 +98,7 @@ try {
Breadcrumbs::register(
'accounts.create',
function (BreadcrumbsGenerator $breadcrumbs, string $what) {
static function (BreadcrumbsGenerator $breadcrumbs, string $what) {
$breadcrumbs->parent('accounts.index', $what);
$breadcrumbs->push(trans('firefly.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what]));
}
@@ -106,7 +106,7 @@ try {
Breadcrumbs::register(
'accounts.show',
function (BreadcrumbsGenerator $breadcrumbs, Account $account, Carbon $start = null, Carbon $end = null) {
static function (BreadcrumbsGenerator $breadcrumbs, Account $account, Carbon $start = null, Carbon $end = null) {
$what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
$breadcrumbs->parent('accounts.index', $what);
@@ -114,8 +114,8 @@ try {
if (null !== $start && null !== $end) {
$title = trans(
'firefly.between_dates_breadcrumb',
['start' => $start ? $start->formatLocalized((string)trans('config.month_and_day')) : '',
'end' => $end ? $end->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')) : '', ]
);
$breadcrumbs->push($title, route('accounts.show', $account));
}
@@ -124,7 +124,7 @@ try {
Breadcrumbs::register(
'accounts.show.all',
function (BreadcrumbsGenerator $breadcrumbs, Account $account) {
static function (BreadcrumbsGenerator $breadcrumbs, Account $account) {
$what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
$breadcrumbs->parent('accounts.index', $what);
@@ -134,7 +134,7 @@ try {
Breadcrumbs::register(
'accounts.reconcile',
function (BreadcrumbsGenerator $breadcrumbs, Account $account) {
static function (BreadcrumbsGenerator $breadcrumbs, Account $account) {
$breadcrumbs->parent('accounts.show', $account);
$breadcrumbs->push(trans('firefly.reconcile_account', ['account' => $account->name]), route('accounts.reconcile', [$account->id]));
}
@@ -142,7 +142,7 @@ try {
Breadcrumbs::register(
'accounts.reconcile.show',
function (BreadcrumbsGenerator $breadcrumbs, Account $account, TransactionJournal $journal) {
static function (BreadcrumbsGenerator $breadcrumbs, Account $account, TransactionJournal $journal) {
$breadcrumbs->parent('accounts.show', $account);
$title = trans('firefly.reconciliation') . ' "' . $journal->description . '"';
$breadcrumbs->push($title, route('accounts.reconcile.show', [$journal->id]));
@@ -151,7 +151,7 @@ try {
Breadcrumbs::register(
'accounts.delete',
function (BreadcrumbsGenerator $breadcrumbs, Account $account) {
static function (BreadcrumbsGenerator $breadcrumbs, Account $account) {
$breadcrumbs->parent('accounts.show', $account);
$breadcrumbs->push(trans('firefly.delete_account', ['name' => limitStringLength($account->name)]), route('accounts.delete', [$account->id]));
}
@@ -159,7 +159,7 @@ try {
Breadcrumbs::register(
'accounts.edit',
function (BreadcrumbsGenerator $breadcrumbs, Account $account) {
static function (BreadcrumbsGenerator $breadcrumbs, Account $account) {
$breadcrumbs->parent('accounts.show', $account);
$what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
@@ -172,7 +172,7 @@ try {
// ADMIN
Breadcrumbs::register(
'admin.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.administration'), route('admin.index'));
}
@@ -180,7 +180,7 @@ try {
Breadcrumbs::register(
'admin.users',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('admin.index');
$breadcrumbs->push(trans('firefly.list_all_users'), route('admin.users'));
}
@@ -188,21 +188,21 @@ try {
Breadcrumbs::register(
'admin.users.show',
function (BreadcrumbsGenerator $breadcrumbs, User $user) {
static function (BreadcrumbsGenerator $breadcrumbs, User $user) {
$breadcrumbs->parent('admin.users');
$breadcrumbs->push(trans('firefly.single_user_administration', ['email' => $user->email]), route('admin.users.show', [$user->id]));
}
);
Breadcrumbs::register(
'admin.users.edit',
function (BreadcrumbsGenerator $breadcrumbs, User $user) {
static function (BreadcrumbsGenerator $breadcrumbs, User $user) {
$breadcrumbs->parent('admin.users');
$breadcrumbs->push(trans('firefly.edit_user', ['email' => $user->email]), route('admin.users.edit', [$user->id]));
}
);
Breadcrumbs::register(
'admin.users.delete',
function (BreadcrumbsGenerator $breadcrumbs, User $user) {
static function (BreadcrumbsGenerator $breadcrumbs, User $user) {
$breadcrumbs->parent('admin.users');
$breadcrumbs->push(trans('firefly.delete_user', ['email' => $user->email]), route('admin.users.delete', [$user->id]));
}
@@ -210,7 +210,7 @@ try {
Breadcrumbs::register(
'admin.users.domains',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('admin.index');
$breadcrumbs->push(trans('firefly.blocked_domains'), route('admin.users.domains'));
}
@@ -218,14 +218,14 @@ try {
Breadcrumbs::register(
'admin.configuration.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('admin.index');
$breadcrumbs->push(trans('firefly.instance_configuration'), route('admin.configuration.index'));
}
);
Breadcrumbs::register(
'admin.update-check',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('admin.index');
$breadcrumbs->push(trans('firefly.update_check_title'), route('admin.update-check'));
}
@@ -233,7 +233,7 @@ try {
Breadcrumbs::register(
'admin.links.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('admin.index');
$breadcrumbs->push(trans('firefly.journal_link_configuration'), route('admin.links.index'));
}
@@ -241,7 +241,7 @@ try {
Breadcrumbs::register(
'admin.links.create',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('admin.links.index');
$breadcrumbs->push(trans('firefly.create_new_link_type'), route('admin.links.create'));
}
@@ -249,7 +249,7 @@ try {
Breadcrumbs::register(
'admin.links.show',
function (BreadcrumbsGenerator $breadcrumbs, LinkType $linkType) {
static function (BreadcrumbsGenerator $breadcrumbs, LinkType $linkType) {
$breadcrumbs->parent('admin.links.index');
$breadcrumbs->push(trans('firefly.overview_for_link', ['name' => limitStringLength($linkType->name)]), route('admin.links.show', [$linkType->id]));
}
@@ -257,7 +257,7 @@ try {
Breadcrumbs::register(
'admin.links.edit',
function (BreadcrumbsGenerator $breadcrumbs, LinkType $linkType) {
static function (BreadcrumbsGenerator $breadcrumbs, LinkType $linkType) {
$breadcrumbs->parent('admin.links.index');
$breadcrumbs->push(trans('firefly.edit_link_type', ['name' => limitStringLength($linkType->name)]), route('admin.links.edit', [$linkType->id]));
}
@@ -265,7 +265,7 @@ try {
Breadcrumbs::register(
'admin.links.delete',
function (BreadcrumbsGenerator $breadcrumbs, LinkType $linkType) {
static function (BreadcrumbsGenerator $breadcrumbs, LinkType $linkType) {
$breadcrumbs->parent('admin.links.index');
$breadcrumbs->push(trans('firefly.delete_link_type', ['name' => limitStringLength($linkType->name)]), route('admin.links.delete', [$linkType->id]));
}
@@ -289,7 +289,7 @@ try {
Breadcrumbs::register(
'transactions.link.delete',
function (BreadcrumbsGenerator $breadcrumbs, TransactionJournalLink $link) {
static function (BreadcrumbsGenerator $breadcrumbs, TransactionJournalLink $link) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('breadcrumbs.delete_journal_link'), route('transactions.link.delete', $link->id));
}
@@ -298,7 +298,7 @@ try {
// ATTACHMENTS
Breadcrumbs::register(
'attachments.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.attachments'), route('attachments.index'));
}
@@ -306,7 +306,7 @@ try {
Breadcrumbs::register(
'attachments.edit',
function (BreadcrumbsGenerator $breadcrumbs, Attachment $attachment) {
static function (BreadcrumbsGenerator $breadcrumbs, Attachment $attachment) {
$object = $attachment->attachable;
if ($object instanceof TransactionJournal) {
$group = $object->transactionGroup;
@@ -323,7 +323,7 @@ try {
);
Breadcrumbs::register(
'attachments.delete',
function (BreadcrumbsGenerator $breadcrumbs, Attachment $attachment) {
static function (BreadcrumbsGenerator $breadcrumbs, Attachment $attachment) {
$object = $attachment->attachable;
if ($object instanceof TransactionJournal) {
$breadcrumbs->parent('transactions.show', $object->transactionGroup);
@@ -340,14 +340,14 @@ try {
// BILLS
Breadcrumbs::register(
'bills.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('breadcrumbs.bills'), route('bills.index'));
}
);
Breadcrumbs::register(
'bills.create',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('bills.index');
$breadcrumbs->push(trans('breadcrumbs.newBill'), route('bills.create'));
}
@@ -355,14 +355,14 @@ try {
Breadcrumbs::register(
'bills.edit',
function (BreadcrumbsGenerator $breadcrumbs, Bill $bill) {
static function (BreadcrumbsGenerator $breadcrumbs, Bill $bill) {
$breadcrumbs->parent('bills.show', $bill);
$breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => limitStringLength($bill->name)]), route('bills.edit', [$bill->id]));
}
);
Breadcrumbs::register(
'bills.delete',
function (BreadcrumbsGenerator $breadcrumbs, Bill $bill) {
static function (BreadcrumbsGenerator $breadcrumbs, Bill $bill) {
$breadcrumbs->parent('bills.show', $bill);
$breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => limitStringLength($bill->name)]), route('bills.delete', [$bill->id]));
}
@@ -370,7 +370,7 @@ try {
Breadcrumbs::register(
'bills.show',
function (BreadcrumbsGenerator $breadcrumbs, Bill $bill) {
static function (BreadcrumbsGenerator $breadcrumbs, Bill $bill) {
$breadcrumbs->parent('bills.index');
$breadcrumbs->push(limitStringLength($bill->name), route('bills.show', [$bill->id]));
}
@@ -379,14 +379,14 @@ try {
// BUDGETS
Breadcrumbs::register(
'budgets.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.budgets'), route('budgets.index'));
}
);
Breadcrumbs::register(
'budgets.create',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('budgets.index');
$breadcrumbs->push(trans('firefly.create_new_budget'), route('budgets.create'));
}
@@ -394,14 +394,14 @@ try {
Breadcrumbs::register(
'budgets.edit',
function (BreadcrumbsGenerator $breadcrumbs, Budget $budget) {
static function (BreadcrumbsGenerator $breadcrumbs, Budget $budget) {
$breadcrumbs->parent('budgets.show', $budget);
$breadcrumbs->push(trans('firefly.edit_budget', ['name' => limitStringLength($budget->name)]), route('budgets.edit', [$budget->id]));
}
);
Breadcrumbs::register(
'budgets.delete',
function (BreadcrumbsGenerator $breadcrumbs, Budget $budget) {
static function (BreadcrumbsGenerator $breadcrumbs, Budget $budget) {
$breadcrumbs->parent('budgets.show', $budget);
$breadcrumbs->push(trans('firefly.delete_budget', ['name' => limitStringLength($budget->name)]), route('budgets.delete', [$budget->id]));
}
@@ -409,14 +409,14 @@ try {
Breadcrumbs::register(
'budgets.no-budget',
function (BreadcrumbsGenerator $breadcrumbs, Carbon $start = null, Carbon $end = null) {
static function (BreadcrumbsGenerator $breadcrumbs, Carbon $start = null, Carbon $end = null) {
$breadcrumbs->parent('budgets.index');
$breadcrumbs->push(trans('firefly.journals_without_budget'), route('budgets.no-budget'));
if (null !== $start && null !== $end) {
$title = trans(
'firefly.between_dates_breadcrumb',
['start' => $start->formatLocalized((string)trans('config.month_and_day')),
'end' => $end->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')), ]
);
$breadcrumbs->push($title, route('budgets.no-budget'));
}
@@ -425,7 +425,7 @@ try {
Breadcrumbs::register(
'budgets.no-budget-all',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('budgets.index');
$breadcrumbs->push(trans('firefly.journals_without_budget'), route('budgets.no-budget'));
$breadcrumbs->push(trans('firefly.everything'), route('budgets.no-budget-all'));
@@ -434,7 +434,7 @@ try {
Breadcrumbs::register(
'budgets.show',
function (BreadcrumbsGenerator $breadcrumbs, Budget $budget) {
static function (BreadcrumbsGenerator $breadcrumbs, Budget $budget) {
$breadcrumbs->parent('budgets.index');
$breadcrumbs->push(limitStringLength($budget->name), route('budgets.show', [$budget->id]));
$breadcrumbs->push(trans('firefly.everything'), route('budgets.show', [$budget->id]));
@@ -443,14 +443,14 @@ try {
Breadcrumbs::register(
'budgets.show.limit',
function (BreadcrumbsGenerator $breadcrumbs, Budget $budget, BudgetLimit $budgetLimit) {
static function (BreadcrumbsGenerator $breadcrumbs, Budget $budget, BudgetLimit $budgetLimit) {
$breadcrumbs->parent('budgets.index');
$breadcrumbs->push(limitStringLength($budget->name), route('budgets.show', [$budget->id]));
$title = trans(
'firefly.between_dates_breadcrumb',
['start' => $budgetLimit->start_date->formatLocalized((string)trans('config.month_and_day')),
'end' => $budgetLimit->end_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')), ]
);
$breadcrumbs->push(
@@ -463,14 +463,14 @@ try {
// CATEGORIES
Breadcrumbs::register(
'categories.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.categories'), route('categories.index'));
}
);
Breadcrumbs::register(
'categories.create',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('categories.index');
$breadcrumbs->push(trans('firefly.new_category'), route('categories.create'));
}
@@ -478,14 +478,14 @@ try {
Breadcrumbs::register(
'categories.edit',
function (BreadcrumbsGenerator $breadcrumbs, Category $category) {
static function (BreadcrumbsGenerator $breadcrumbs, Category $category) {
$breadcrumbs->parent('categories.show.all', $category);
$breadcrumbs->push(trans('firefly.edit_category', ['name' => limitStringLength($category->name)]), route('categories.edit', [$category->id]));
}
);
Breadcrumbs::register(
'categories.delete',
function (BreadcrumbsGenerator $breadcrumbs, Category $category) {
static function (BreadcrumbsGenerator $breadcrumbs, Category $category) {
$breadcrumbs->parent('categories.show', $category);
$breadcrumbs->push(trans('firefly.delete_category', ['name' => limitStringLength($category->name)]), route('categories.delete', [$category->id]));
}
@@ -493,14 +493,14 @@ try {
Breadcrumbs::register(
'categories.show',
function (BreadcrumbsGenerator $breadcrumbs, Category $category, Carbon $start = null, Carbon $end = null) {
static function (BreadcrumbsGenerator $breadcrumbs, Category $category, Carbon $start = null, Carbon $end = null) {
$breadcrumbs->parent('categories.index');
$breadcrumbs->push(limitStringLength($category->name), route('categories.show', [$category->id]));
if (null !== $start && null !== $end) {
$title = trans(
'firefly.between_dates_breadcrumb',
['start' => $start->formatLocalized((string)trans('config.month_and_day')),
'end' => $end->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')), ]
);
$breadcrumbs->push($title, route('categories.show', [$category->id]));
}
@@ -509,7 +509,7 @@ try {
Breadcrumbs::register(
'categories.show.all',
function (BreadcrumbsGenerator $breadcrumbs, Category $category) {
static function (BreadcrumbsGenerator $breadcrumbs, Category $category) {
$breadcrumbs->parent('categories.index');
$breadcrumbs->push(limitStringLength($category->name), route('categories.show', [$category->id]));
$breadcrumbs->push(trans('firefly.everything'), route('categories.show.all', [$category->id]));
@@ -518,24 +518,23 @@ try {
Breadcrumbs::register(
'categories.no-category',
function (BreadcrumbsGenerator $breadcrumbs, Carbon $start = null, Carbon $end = null) {
static function (BreadcrumbsGenerator $breadcrumbs, Carbon $start = null, Carbon $end = null) {
$breadcrumbs->parent('categories.index');
$breadcrumbs->push(trans('firefly.journals_without_category'), route('categories.no-category'));
if (null !== $start && null !== $end) {
$title = trans(
'firefly.between_dates_breadcrumb',
['start' => $start->formatLocalized((string)trans('config.month_and_day')),
'end' => $end->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')), ]
);
$breadcrumbs->push($title, route('categories.no-category'));
}
}
);
Breadcrumbs::register(
'categories.no-category.all',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('categories.index');
$breadcrumbs->push(trans('firefly.journals_without_category'), route('categories.no-category'));
$breadcrumbs->push(trans('firefly.everything'), route('categories.no-category.all'));
@@ -545,7 +544,7 @@ try {
// CURRENCIES
Breadcrumbs::register(
'currencies.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.currencies'), route('currencies.index'));
}
@@ -553,7 +552,7 @@ try {
Breadcrumbs::register(
'currencies.create',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('currencies.index');
$breadcrumbs->push(trans('firefly.create_currency'), route('currencies.create'));
}
@@ -561,14 +560,14 @@ try {
Breadcrumbs::register(
'currencies.edit',
function (BreadcrumbsGenerator $breadcrumbs, TransactionCurrency $currency) {
static function (BreadcrumbsGenerator $breadcrumbs, TransactionCurrency $currency) {
$breadcrumbs->parent('currencies.index');
$breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => $currency->name]), route('currencies.edit', [$currency->id]));
}
);
Breadcrumbs::register(
'currencies.delete',
function (BreadcrumbsGenerator $breadcrumbs, TransactionCurrency $currency) {
static function (BreadcrumbsGenerator $breadcrumbs, TransactionCurrency $currency) {
$breadcrumbs->parent('currencies.index');
$breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => $currency->name]), route('currencies.delete', [$currency->id]));
}
@@ -577,7 +576,7 @@ try {
// EXPORT
Breadcrumbs::register(
'export.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.export_data_bc'), route('export.index'));
}
@@ -586,14 +585,14 @@ try {
// PIGGY BANKS
Breadcrumbs::register(
'piggy-banks.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.piggyBanks'), route('piggy-banks.index'));
}
);
Breadcrumbs::register(
'piggy-banks.create',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('piggy-banks.index');
$breadcrumbs->push(trans('breadcrumbs.newPiggyBank'), route('piggy-banks.create'));
}
@@ -601,14 +600,14 @@ try {
Breadcrumbs::register(
'piggy-banks.edit',
function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
static function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
$breadcrumbs->parent('piggy-banks.show', $piggyBank);
$breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => $piggyBank->name]), route('piggy-banks.edit', [$piggyBank->id]));
}
);
Breadcrumbs::register(
'piggy-banks.delete',
function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
static function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
$breadcrumbs->parent('piggy-banks.show', $piggyBank);
$breadcrumbs->push(trans('firefly.delete_piggy_bank', ['name' => $piggyBank->name]), route('piggy-banks.delete', [$piggyBank->id]));
}
@@ -616,7 +615,7 @@ try {
Breadcrumbs::register(
'piggy-banks.show',
function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
static function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
$breadcrumbs->parent('piggy-banks.index');
$breadcrumbs->push($piggyBank->name, route('piggy-banks.show', [$piggyBank->id]));
}
@@ -624,7 +623,7 @@ try {
Breadcrumbs::register(
'piggy-banks.add-money-mobile',
function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
static function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
$breadcrumbs->parent('piggy-banks.show', $piggyBank);
$breadcrumbs->push(trans('firefly.add_money_to_piggy', ['name' => $piggyBank->name]), route('piggy-banks.add-money-mobile', [$piggyBank->id]));
}
@@ -632,7 +631,7 @@ try {
Breadcrumbs::register(
'piggy-banks.remove-money-mobile',
function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
static function (BreadcrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
$breadcrumbs->parent('piggy-banks.show', $piggyBank);
$breadcrumbs->push(
trans('firefly.remove_money_from_piggy_title', ['name' => $piggyBank->name]),
@@ -644,7 +643,7 @@ try {
// IMPORT
Breadcrumbs::register(
'import.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.import_index_title'), route('import.index'));
}
@@ -652,7 +651,7 @@ try {
Breadcrumbs::register(
'import.prerequisites.index',
function (BreadcrumbsGenerator $breadcrumbs, string $importProvider) {
static function (BreadcrumbsGenerator $breadcrumbs, string $importProvider) {
$breadcrumbs->parent('import.index');
$breadcrumbs->push(trans('import.prerequisites_breadcrumb_' . $importProvider), route('import.prerequisites.index', [$importProvider]));
}
@@ -660,7 +659,7 @@ try {
Breadcrumbs::register(
'import.job.configuration.index',
function (BreadcrumbsGenerator $breadcrumbs, ImportJob $job) {
static function (BreadcrumbsGenerator $breadcrumbs, ImportJob $job) {
$breadcrumbs->parent('import.index');
$breadcrumbs->push(trans('import.job_configuration_breadcrumb', ['key' => $job->key]), route('import.job.configuration.index', [$job->key]));
}
@@ -668,17 +667,16 @@ try {
Breadcrumbs::register(
'import.job.status.index',
function (BreadcrumbsGenerator $breadcrumbs, ImportJob $job) {
static function (BreadcrumbsGenerator $breadcrumbs, ImportJob $job) {
$breadcrumbs->parent('import.index');
$breadcrumbs->push(trans('import.job_status_breadcrumb', ['key' => $job->key]), route('import.job.status.index', [$job->key]));
}
);
// PREFERENCES
Breadcrumbs::register(
'preferences.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('breadcrumbs.preferences'), route('preferences.index'));
}
@@ -686,7 +684,7 @@ try {
Breadcrumbs::register(
'profile.code',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('breadcrumbs.profile'), route('profile.index'));
}
@@ -694,7 +692,7 @@ try {
Breadcrumbs::register(
'profile.new-backup-codes',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('breadcrumbs.profile'), route('profile.index'));
}
@@ -703,14 +701,14 @@ try {
// PROFILE
Breadcrumbs::register(
'profile.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('breadcrumbs.profile'), route('profile.index'));
}
);
Breadcrumbs::register(
'profile.change-password',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('profile.index');
$breadcrumbs->push(trans('breadcrumbs.changePassword'), route('profile.change-password'));
}
@@ -718,7 +716,7 @@ try {
Breadcrumbs::register(
'profile.change-email',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('profile.index');
$breadcrumbs->push(trans('breadcrumbs.change_email'), route('profile.change-email'));
}
@@ -726,7 +724,7 @@ try {
Breadcrumbs::register(
'profile.delete-account',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('profile.index');
$breadcrumbs->push(trans('firefly.delete_account'), route('profile.delete-account'));
}
@@ -735,7 +733,7 @@ try {
// REPORTS
Breadcrumbs::register(
'reports.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('breadcrumbs.reports'), route('reports.index'));
}
@@ -743,7 +741,7 @@ try {
Breadcrumbs::register(
'reports.report.audit',
function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) {
static function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) {
$breadcrumbs->parent('reports.index');
$monthFormat = (string)trans('config.month_and_day');
@@ -756,7 +754,7 @@ try {
);
Breadcrumbs::register(
'reports.report.budget',
function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $budgetIds, Carbon $start, Carbon $end) {
static function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $budgetIds, Carbon $start, Carbon $end) {
$breadcrumbs->parent('reports.index');
$monthFormat = (string)trans('config.month_and_day');
@@ -770,7 +768,7 @@ try {
Breadcrumbs::register(
'reports.report.tag',
function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $tagTags, Carbon $start, Carbon $end) {
static function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $tagTags, Carbon $start, Carbon $end) {
$breadcrumbs->parent('reports.index');
$monthFormat = (string)trans('config.month_and_day');
@@ -784,7 +782,7 @@ try {
Breadcrumbs::register(
'reports.report.category',
function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $categoryIds, Carbon $start, Carbon $end) {
static function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $categoryIds, Carbon $start, Carbon $end) {
$breadcrumbs->parent('reports.index');
$monthFormat = (string)trans('config.month_and_day');
@@ -798,7 +796,7 @@ try {
Breadcrumbs::register(
'reports.report.double',
function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $doubleIds, Carbon $start, Carbon $end) {
static function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $doubleIds, Carbon $start, Carbon $end) {
$breadcrumbs->parent('reports.index');
$monthFormat = (string)trans('config.month_and_day');
@@ -812,7 +810,7 @@ try {
Breadcrumbs::register(
'reports.report.default',
function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) {
static function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) {
$breadcrumbs->parent('reports.index');
$monthFormat = (string)trans('config.month_and_day');
@@ -827,7 +825,7 @@ try {
// New user Controller
Breadcrumbs::register(
'new-user.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.getting_started'), route('new-user.index'));
}
@@ -836,14 +834,14 @@ try {
// Recurring transactions controller:
Breadcrumbs::register(
'recurring.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.recurrences'), route('recurring.index'));
}
);
Breadcrumbs::register(
'recurring.show',
function (BreadcrumbsGenerator $breadcrumbs, Recurrence $recurrence) {
static function (BreadcrumbsGenerator $breadcrumbs, Recurrence $recurrence) {
$breadcrumbs->parent('recurring.index');
$breadcrumbs->push($recurrence->title, route('recurring.show', [$recurrence->id]));
}
@@ -851,7 +849,7 @@ try {
Breadcrumbs::register(
'recurring.delete',
function (BreadcrumbsGenerator $breadcrumbs, Recurrence $recurrence) {
static function (BreadcrumbsGenerator $breadcrumbs, Recurrence $recurrence) {
$breadcrumbs->parent('recurring.index');
$breadcrumbs->push(trans('firefly.delete_recurring', ['title' => $recurrence->title]), route('recurring.delete', [$recurrence->id]));
}
@@ -859,7 +857,7 @@ try {
Breadcrumbs::register(
'recurring.edit',
function (BreadcrumbsGenerator $breadcrumbs, Recurrence $recurrence) {
static function (BreadcrumbsGenerator $breadcrumbs, Recurrence $recurrence) {
$breadcrumbs->parent('recurring.index');
$breadcrumbs->push(trans('firefly.edit_recurrence', ['title' => $recurrence->title]), route('recurring.edit', [$recurrence->id]));
}
@@ -867,7 +865,7 @@ try {
Breadcrumbs::register(
'recurring.create',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('recurring.index');
$breadcrumbs->push(trans('firefly.create_new_recurrence'), route('recurring.create'));
}
@@ -876,7 +874,7 @@ try {
// Rules
Breadcrumbs::register(
'rules.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.rules'), route('rules.index'));
}
@@ -884,7 +882,7 @@ try {
Breadcrumbs::register(
'rules.create',
function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup = null) {
static function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup = null) {
$breadcrumbs->parent('rules.index');
if (null === $ruleGroup) {
$breadcrumbs->push(trans('firefly.make_new_rule_no_group'), route('rules.create'));
@@ -892,13 +890,12 @@ try {
if (null !== $ruleGroup) {
$breadcrumbs->push(trans('firefly.make_new_rule', ['title' => $ruleGroup->title]), route('rules.create', [$ruleGroup]));
}
}
);
Breadcrumbs::register(
'rules.create-from-bill',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('rules.index');
$breadcrumbs->push(trans('firefly.make_new_rule_no_group'), route('rules.create'));
}
@@ -906,7 +903,7 @@ try {
Breadcrumbs::register(
'rules.create-from-journal',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('rules.index');
$breadcrumbs->push(trans('firefly.make_new_rule_no_group'), route('rules.create'));
}
@@ -914,35 +911,35 @@ try {
Breadcrumbs::register(
'rules.edit',
function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) {
static function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) {
$breadcrumbs->parent('rules.index');
$breadcrumbs->push(trans('firefly.edit_rule', ['title' => $rule->title]), route('rules.edit', [$rule]));
}
);
Breadcrumbs::register(
'rules.delete',
function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) {
static function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) {
$breadcrumbs->parent('rules.index');
$breadcrumbs->push(trans('firefly.delete_rule', ['title' => $rule->title]), route('rules.delete', [$rule]));
}
);
Breadcrumbs::register(
'rule-groups.create',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('rules.index');
$breadcrumbs->push(trans('firefly.make_new_rule_group'), route('rule-groups.create'));
}
);
Breadcrumbs::register(
'rule-groups.edit',
function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) {
static function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) {
$breadcrumbs->parent('rules.index');
$breadcrumbs->push(trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]), route('rule-groups.edit', [$ruleGroup]));
}
);
Breadcrumbs::register(
'rule-groups.delete',
function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) {
static function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) {
$breadcrumbs->parent('rules.index');
$breadcrumbs->push(trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]), route('rule-groups.delete', [$ruleGroup]));
}
@@ -950,7 +947,7 @@ try {
Breadcrumbs::register(
'rules.select-transactions',
function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) {
static function (BreadcrumbsGenerator $breadcrumbs, Rule $rule) {
$breadcrumbs->parent('rules.index');
$breadcrumbs->push(
trans('firefly.rule_select_transactions', ['title' => $rule->title]), route('rules.select-transactions', [$rule])
@@ -960,7 +957,7 @@ try {
Breadcrumbs::register(
'rule-groups.select-transactions',
function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) {
static function (BreadcrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) {
$breadcrumbs->parent('rules.index');
$breadcrumbs->push(
trans('firefly.rule_group_select_transactions', ['title' => $ruleGroup->title]), route('rule-groups.select-transactions', [$ruleGroup])
@@ -971,7 +968,7 @@ try {
// SEARCH
Breadcrumbs::register(
'search.index',
function (BreadcrumbsGenerator $breadcrumbs, $query) {
static function (BreadcrumbsGenerator $breadcrumbs, $query) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('breadcrumbs.search_result', ['query' => $query]), route('search.index'));
}
@@ -980,7 +977,7 @@ try {
// TAGS
Breadcrumbs::register(
'tags.index',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('breadcrumbs.tags'), route('tags.index'));
}
@@ -988,7 +985,7 @@ try {
Breadcrumbs::register(
'tags.create',
function (BreadcrumbsGenerator $breadcrumbs) {
static function (BreadcrumbsGenerator $breadcrumbs) {
$breadcrumbs->parent('tags.index');
$breadcrumbs->push(trans('breadcrumbs.createTag'), route('tags.create'));
}
@@ -996,7 +993,7 @@ try {
Breadcrumbs::register(
'tags.edit',
function (BreadcrumbsGenerator $breadcrumbs, Tag $tag) {
static function (BreadcrumbsGenerator $breadcrumbs, Tag $tag) {
$breadcrumbs->parent('tags.show', $tag);
$breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => $tag->tag]), route('tags.edit', [$tag->id]));
}
@@ -1004,7 +1001,7 @@ try {
Breadcrumbs::register(
'tags.delete',
function (BreadcrumbsGenerator $breadcrumbs, Tag $tag) {
static function (BreadcrumbsGenerator $breadcrumbs, Tag $tag) {
$breadcrumbs->parent('tags.show', $tag);
$breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => $tag->tag]), route('tags.delete', [$tag->id]));
}
@@ -1012,25 +1009,24 @@ try {
Breadcrumbs::register(
'tags.show',
function (BreadcrumbsGenerator $breadcrumbs, Tag $tag, Carbon $start = null, Carbon $end = null) {
static function (BreadcrumbsGenerator $breadcrumbs, Tag $tag, Carbon $start = null, Carbon $end = null) {
$breadcrumbs->parent('tags.index');
$breadcrumbs->push($tag->tag, route('tags.show', [$tag->id, $start, $end]));
if (null !== $start && $end !== null) {
if (null !== $start && null !== $end) {
$title = trans(
'firefly.between_dates_breadcrumb',
['start' => $start->formatLocalized((string)trans('config.month_and_day')),
'end' => $end->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')), ]
);
$breadcrumbs->push($title, route('tags.show', [$tag->id, $start, $end]));
}
}
);
Breadcrumbs::register(
'tags.show.all',
function (BreadcrumbsGenerator $breadcrumbs, Tag $tag) {
static function (BreadcrumbsGenerator $breadcrumbs, Tag $tag) {
$breadcrumbs->parent('tags.index');
$breadcrumbs->push($tag->tag, route('tags.show', [$tag->id]));
$title = (string)trans('firefly.all_journals_for_tag', ['tag' => $tag->tag]);
@@ -1042,7 +1038,7 @@ try {
Breadcrumbs::register(
'transactions.index',
function (BreadcrumbsGenerator $breadcrumbs, string $what, Carbon $start = null, Carbon $end = null) {
static function (BreadcrumbsGenerator $breadcrumbs, string $what, Carbon $start = null, Carbon $end = null) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what]));
@@ -1050,8 +1046,8 @@ try {
// add date range:
$title = trans(
'firefly.between_dates_breadcrumb',
['start' => $start->formatLocalized((string)trans('config.month_and_day')),
'end' => $end->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')), ]
);
$breadcrumbs->push($title, route('transactions.index', [$what, $start, $end]));
}
@@ -1060,7 +1056,7 @@ try {
Breadcrumbs::register(
'transactions.index.all',
function (BreadcrumbsGenerator $breadcrumbs, string $what) {
static function (BreadcrumbsGenerator $breadcrumbs, string $what) {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what]));
}
@@ -1068,7 +1064,7 @@ try {
Breadcrumbs::register(
'transactions.create',
function (BreadcrumbsGenerator $breadcrumbs, string $objectType) {
static function (BreadcrumbsGenerator $breadcrumbs, string $objectType) {
$breadcrumbs->parent('transactions.index', $objectType);
$breadcrumbs->push(trans('breadcrumbs.create_new_transaction'), route('transactions.create', [$objectType]));
}
@@ -1076,7 +1072,7 @@ try {
Breadcrumbs::register(
'transactions.edit',
function (BreadcrumbsGenerator $breadcrumbs, TransactionGroup $group) {
static function (BreadcrumbsGenerator $breadcrumbs, TransactionGroup $group) {
$breadcrumbs->parent('transactions.show', $group);
/** @var TransactionJournal $first */
@@ -1091,7 +1087,7 @@ try {
// also edit reconciliations:
Breadcrumbs::register(
'accounts.reconcile.edit',
function (BreadcrumbsGenerator $breadcrumbs, TransactionJournal $journal) {
static function (BreadcrumbsGenerator $breadcrumbs, TransactionJournal $journal) {
$breadcrumbs->parent('transactions.show', $journal);
$breadcrumbs->push(
trans('breadcrumbs.edit_reconciliation', ['description' => limitStringLength($journal->description)]),
@@ -1123,14 +1119,16 @@ try {
if ($group->transactionJournals()->count() > 1) {
$title = limitStringLength($group->title);
}
if('opening balance' === $type) {
if ('opening balance' === $type) {
// TODO link to account.
$breadcrumbs->push($title, route('transactions.show', [$group->id]));
return;
}
if('reconciliation' === $type) {
if ('reconciliation' === $type) {
// TODO link to account.
$breadcrumbs->push($title, route('transactions.show', [$group->id]));
return;
}
@@ -1141,7 +1139,7 @@ try {
Breadcrumbs::register(
'transactions.convert.index',
function (BreadcrumbsGenerator $breadcrumbs, TransactionGroup $group, string $groupTitle) {
static function (BreadcrumbsGenerator $breadcrumbs, TransactionGroup $group, string $groupTitle) {
$breadcrumbs->parent('transactions.show', $group);
$breadcrumbs->push(
trans('firefly.breadcrumb_convert_group', ['description' => limitStringLength($groupTitle)]),
@@ -1194,7 +1192,7 @@ try {
// SPLIT
Breadcrumbs::register(
'transactions.split.edit',
function (BreadcrumbsGenerator $breadcrumbs, TransactionJournal $journal) {
static function (BreadcrumbsGenerator $breadcrumbs, TransactionJournal $journal) {
$breadcrumbs->parent('transactions.show', $journal);
$breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.split.edit', [$journal->id]));
}

9
routes/channels.php
View File

@@ -2,7 +2,7 @@
/**
* channels.php
* Copyright (c) 2019 james@firefly-iii.org
* Copyright (c) 2019 james@firefly-iii.org.
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
@@ -22,7 +22,6 @@
declare(strict_types=1);
/*
|--------------------------------------------------------------------------
| Broadcast Channels
@@ -35,7 +34,7 @@ declare(strict_types=1);
*/
Broadcast::channel(
'App.User.{id}', function ($user, $id) {
return (int)$user->id === (int)$id;
}
'App.User.{id}', static function ($user, $id) {
return (int)$user->id === (int)$id;
}
);

3
routes/console.php
View File

@@ -2,7 +2,7 @@
/**
* console.php
* Copyright (c) 2019 james@firefly-iii.org
* Copyright (c) 2019 james@firefly-iii.org.
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
@@ -21,4 +21,3 @@
*/
declare(strict_types=1);

927
routes/web.php
View File

File diff suppressed because it is too large Load Diff