kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 09:52:20 +00:00
Code Issues Projects Releases Wiki Activity

Code for #1126

Browse Source
This commit is contained in:
James Cole
2018-01-11 20:49:55 +01:00
parent 9614310208
commit 554b38ccff
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/BillController.php
View File

@@ -262,7 +262,7 @@ class BillController extends Controller
} }
$bill->nextExpectedMatch = $repository->nextExpectedMatch($bill, $lastPaidDate); $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill, $lastPaidDate);
$hideBill = true; $hideBill = true;
$subTitle = e($bill->name); $subTitle = $bill->name;
return view('bills.show', compact('transactions', 'yearAverage', 'overallAverage', 'year', 'hideBill', 'bill', 'subTitle')); return view('bills.show', compact('transactions', 'yearAverage', 'overallAverage', 'year', 'hideBill', 'bill', 'subTitle'));
} }

2
app/Http/Controllers/PiggyBankController.php
View File

@@ -383,7 +383,7 @@ class PiggyBankController extends Controller
{ {
$note = $piggyBank->notes()->first(); $note = $piggyBank->notes()->first();
$events = $repository->getEvents($piggyBank); $events = $repository->getEvents($piggyBank);
$subTitle = e($piggyBank->name); $subTitle = $piggyBank->name;
return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'note')); return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'note'));
} }

44
routes/breadcrumbs.php
View File

@@ -104,7 +104,7 @@ Breadcrumbs::register(
'accounts.reconcile', 'accounts.reconcile',
function (BreadCrumbsGenerator $breadcrumbs, Account $account) { function (BreadCrumbsGenerator $breadcrumbs, Account $account) {
$breadcrumbs->parent('accounts.show', $account, '(nothing)', new Carbon, new Carbon); $breadcrumbs->parent('accounts.show', $account, '(nothing)', new Carbon, new Carbon);
$breadcrumbs->push(trans('firefly.reconcile_account', ['account' => e($account->name)]), route('accounts.reconcile', [$account->id])); $breadcrumbs->push(trans('firefly.reconcile_account', ['account' =>$account->name]), route('accounts.reconcile', [$account->id]));
} }
); );
@@ -121,7 +121,7 @@ Breadcrumbs::register(
'accounts.delete', 'accounts.delete',
function (BreadCrumbsGenerator $breadcrumbs, Account $account) { function (BreadCrumbsGenerator $breadcrumbs, Account $account) {
$breadcrumbs->parent('accounts.show', $account, '(nothing)', new Carbon, new Carbon); $breadcrumbs->parent('accounts.show', $account, '(nothing)', new Carbon, new Carbon);
$breadcrumbs->push(trans('firefly.delete_account', ['name' => e($account->name)]), route('accounts.delete', [$account->id])); $breadcrumbs->push(trans('firefly.delete_account', ['name' => $account->name]), route('accounts.delete', [$account->id]));
} }
); );
@@ -131,7 +131,7 @@ Breadcrumbs::register(
$breadcrumbs->parent('accounts.show', $account, '(nothing)', new Carbon, new Carbon); $breadcrumbs->parent('accounts.show', $account, '(nothing)', new Carbon, new Carbon);
$what = config('firefly.shortNamesByFullName.' . $account->accountType->type); $what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
$breadcrumbs->push(trans('firefly.edit_' . $what . '_account', ['name' => e($account->name)]), route('accounts.edit', [$account->id])); $breadcrumbs->push(trans('firefly.edit_' . $what . '_account', ['name' => $account->name]), route('accounts.edit', [$account->id]));
} }
); );
@@ -291,14 +291,14 @@ Breadcrumbs::register(
'bills.edit', 'bills.edit',
function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) { function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) {
$breadcrumbs->parent('bills.show', $bill); $breadcrumbs->parent('bills.show', $bill);
$breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => e($bill->name)]), route('bills.edit', [$bill->id])); $breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => $bill->name]), route('bills.edit', [$bill->id]));
} }
); );
Breadcrumbs::register( Breadcrumbs::register(
'bills.delete', 'bills.delete',
function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) { function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) {
$breadcrumbs->parent('bills.show', $bill); $breadcrumbs->parent('bills.show', $bill);
$breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => e($bill->name)]), route('bills.delete', [$bill->id])); $breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => $bill->name]), route('bills.delete', [$bill->id]));
} }
); );
@@ -306,7 +306,7 @@ Breadcrumbs::register(
'bills.show', 'bills.show',
function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) { function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) {
$breadcrumbs->parent('bills.index'); $breadcrumbs->parent('bills.index');
$breadcrumbs->push(e($bill->name), route('bills.show', [$bill->id])); $breadcrumbs->push($bill->name, route('bills.show', [$bill->id]));
} }
); );
@@ -330,14 +330,14 @@ Breadcrumbs::register(
'budgets.edit', 'budgets.edit',
function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) { function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) {
$breadcrumbs->parent('budgets.show', $budget); $breadcrumbs->parent('budgets.show', $budget);
$breadcrumbs->push(trans('firefly.edit_budget', ['name' => e($budget->name)]), route('budgets.edit', [$budget->id])); $breadcrumbs->push(trans('firefly.edit_budget', ['name' => $budget->name]), route('budgets.edit', [$budget->id]));
} }
); );
Breadcrumbs::register( Breadcrumbs::register(
'budgets.delete', 'budgets.delete',
function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) { function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) {
$breadcrumbs->parent('budgets.show', $budget); $breadcrumbs->parent('budgets.show', $budget);
$breadcrumbs->push(trans('firefly.delete_budget', ['name' => e($budget->name)]), route('budgets.delete', [$budget->id])); $breadcrumbs->push(trans('firefly.delete_budget', ['name' => $budget->name]), route('budgets.delete', [$budget->id]));
} }
); );
@@ -367,7 +367,7 @@ Breadcrumbs::register(
'budgets.show', 'budgets.show',
function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) { function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) {
$breadcrumbs->parent('budgets.index'); $breadcrumbs->parent('budgets.index');
$breadcrumbs->push(e($budget->name), route('budgets.show', [$budget->id])); $breadcrumbs->push($budget->name, route('budgets.show', [$budget->id]));
$breadcrumbs->push(trans('firefly.everything'), route('budgets.show', [$budget->id])); $breadcrumbs->push(trans('firefly.everything'), route('budgets.show', [$budget->id]));
} }
); );
@@ -376,7 +376,7 @@ Breadcrumbs::register(
'budgets.show.limit', 'budgets.show.limit',
function (BreadCrumbsGenerator $breadcrumbs, Budget $budget, BudgetLimit $budgetLimit) { function (BreadCrumbsGenerator $breadcrumbs, Budget $budget, BudgetLimit $budgetLimit) {
$breadcrumbs->parent('budgets.index'); $breadcrumbs->parent('budgets.index');
$breadcrumbs->push(e($budget->name), route('budgets.show', [$budget->id])); $breadcrumbs->push($budget->name, route('budgets.show', [$budget->id]));
$title = trans( $title = trans(
'firefly.between_dates_breadcrumb', 'firefly.between_dates_breadcrumb',
@@ -411,14 +411,14 @@ Breadcrumbs::register(
'categories.edit', 'categories.edit',
function (BreadCrumbsGenerator $breadcrumbs, Category $category) { function (BreadCrumbsGenerator $breadcrumbs, Category $category) {
$breadcrumbs->parent('categories.show', $category, '(nothing)', new Carbon, new Carbon); $breadcrumbs->parent('categories.show', $category, '(nothing)', new Carbon, new Carbon);
$breadcrumbs->push(trans('firefly.edit_category', ['name' => e($category->name)]), route('categories.edit', [$category->id])); $breadcrumbs->push(trans('firefly.edit_category', ['name' => $category->name]), route('categories.edit', [$category->id]));
} }
); );
Breadcrumbs::register( Breadcrumbs::register(
'categories.delete', 'categories.delete',
function (BreadCrumbsGenerator $breadcrumbs, Category $category) { function (BreadCrumbsGenerator $breadcrumbs, Category $category) {
$breadcrumbs->parent('categories.show', $category, '(nothing)', new Carbon, new Carbon); $breadcrumbs->parent('categories.show', $category, '(nothing)', new Carbon, new Carbon);
$breadcrumbs->push(trans('firefly.delete_category', ['name' => e($category->name)]), route('categories.delete', [$category->id])); $breadcrumbs->push(trans('firefly.delete_category', ['name' => $category->name]), route('categories.delete', [$category->id]));
} }
); );
@@ -487,14 +487,14 @@ Breadcrumbs::register(
'currencies.edit', 'currencies.edit',
function (BreadCrumbsGenerator $breadcrumbs, TransactionCurrency $currency) { function (BreadCrumbsGenerator $breadcrumbs, TransactionCurrency $currency) {
$breadcrumbs->parent('currencies.index'); $breadcrumbs->parent('currencies.index');
$breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => e($currency->name)]), route('currencies.edit', [$currency->id])); $breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => $currency->name]), route('currencies.edit', [$currency->id]));
} }
); );
Breadcrumbs::register( Breadcrumbs::register(
'currencies.delete', 'currencies.delete',
function (BreadCrumbsGenerator $breadcrumbs, TransactionCurrency $currency) { function (BreadCrumbsGenerator $breadcrumbs, TransactionCurrency $currency) {
$breadcrumbs->parent('currencies.index'); $breadcrumbs->parent('currencies.index');
$breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => e($currency->name)]), route('currencies.delete', [$currency->id])); $breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => $currency->name]), route('currencies.delete', [$currency->id]));
} }
); );
@@ -527,14 +527,14 @@ Breadcrumbs::register(
'piggy-banks.edit', 'piggy-banks.edit',
function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
$breadcrumbs->parent('piggy-banks.show', $piggyBank); $breadcrumbs->parent('piggy-banks.show', $piggyBank);
$breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.edit', [$piggyBank->id])); $breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => $piggyBank->name]), route('piggy-banks.edit', [$piggyBank->id]));
} }
); );
Breadcrumbs::register( Breadcrumbs::register(
'piggy-banks.delete', 'piggy-banks.delete',
function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
$breadcrumbs->parent('piggy-banks.show', $piggyBank); $breadcrumbs->parent('piggy-banks.show', $piggyBank);
$breadcrumbs->push(trans('firefly.delete_piggy_bank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', [$piggyBank->id])); $breadcrumbs->push(trans('firefly.delete_piggy_bank', ['name' => $piggyBank->name]), route('piggy-banks.delete', [$piggyBank->id]));
} }
); );
@@ -542,7 +542,7 @@ Breadcrumbs::register(
'piggy-banks.show', 'piggy-banks.show',
function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
$breadcrumbs->parent('piggy-banks.index'); $breadcrumbs->parent('piggy-banks.index');
$breadcrumbs->push(e($piggyBank->name), route('piggy-banks.show', [$piggyBank->id])); $breadcrumbs->push($piggyBank->name, route('piggy-banks.show', [$piggyBank->id]));
} }
); );
@@ -827,7 +827,7 @@ Breadcrumbs::register(
'search.index', 'search.index',
function (BreadCrumbsGenerator $breadcrumbs, $query) { function (BreadCrumbsGenerator $breadcrumbs, $query) {
$breadcrumbs->parent('home'); $breadcrumbs->parent('home');
$breadcrumbs->push(trans('breadcrumbs.search_result', ['query' => e($query)]), route('search.index')); $breadcrumbs->push(trans('breadcrumbs.search_result', ['query' => $query]), route('search.index'));
} }
); );
@@ -852,7 +852,7 @@ Breadcrumbs::register(
'tags.edit', 'tags.edit',
function (BreadCrumbsGenerator $breadcrumbs, Tag $tag) { function (BreadCrumbsGenerator $breadcrumbs, Tag $tag) {
$breadcrumbs->parent('tags.show', $tag, '(nothing)', new Carbon, new Carbon); $breadcrumbs->parent('tags.show', $tag, '(nothing)', new Carbon, new Carbon);
$breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => e($tag->tag)]), route('tags.edit', [$tag->id])); $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => $tag->tag]), route('tags.edit', [$tag->id]));
} }
); );
@@ -860,7 +860,7 @@ Breadcrumbs::register(
'tags.delete', 'tags.delete',
function (BreadCrumbsGenerator $breadcrumbs, Tag $tag) { function (BreadCrumbsGenerator $breadcrumbs, Tag $tag) {
$breadcrumbs->parent('tags.show', $tag, '(nothing)', new Carbon, new Carbon); $breadcrumbs->parent('tags.show', $tag, '(nothing)', new Carbon, new Carbon);
$breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => e($tag->tag)]), route('tags.delete', [$tag->id])); $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => $tag->tag]), route('tags.delete', [$tag->id]));
} }
); );
@@ -868,7 +868,7 @@ Breadcrumbs::register(
'tags.show', 'tags.show',
function (BreadCrumbsGenerator $breadcrumbs, Tag $tag, string $moment, Carbon $start, Carbon $end) { function (BreadCrumbsGenerator $breadcrumbs, Tag $tag, string $moment, Carbon $start, Carbon $end) {
$breadcrumbs->parent('tags.index'); $breadcrumbs->parent('tags.index');
$breadcrumbs->push(e($tag->tag), route('tags.show', [$tag->id, $moment])); $breadcrumbs->push($tag->tag, route('tags.show', [$tag->id, $moment]));
if ('all' === $moment) { if ('all' === $moment) {
$breadcrumbs->push(trans('firefly.everything'), route('tags.show', [$tag->id, $moment])); $breadcrumbs->push(trans('firefly.everything'), route('tags.show', [$tag->id, $moment]));
} }
@@ -937,7 +937,7 @@ Breadcrumbs::register(
'transactions.delete', 'transactions.delete',
function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) { function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) {
$breadcrumbs->parent('transactions.show', $journal); $breadcrumbs->parent('transactions.show', $journal);
$breadcrumbs->push(trans('breadcrumbs.delete_journal', ['description' => e($journal->description)]), route('transactions.delete', [$journal->id])); $breadcrumbs->push(trans('breadcrumbs.delete_journal', ['description' => $journal->description]), route('transactions.delete', [$journal->id]));
} }
); );