mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Some small updates to piggy banks.
This commit is contained in:
parent
87fbf9c1a5
commit
40892ccfa7
@ -17,350 +17,353 @@ Breadcrumbs::register(
|
|||||||
// accounts
|
// accounts
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'accounts.index', function (Generator $breadcrumbs, $what) {
|
'accounts.index', function (Generator $breadcrumbs, $what) {
|
||||||
$breadcrumbs->parent('home');
|
$breadcrumbs->parent('home');
|
||||||
$breadcrumbs->push(ucfirst($what) . ' accounts', route('accounts.index', $what));
|
$breadcrumbs->push(ucfirst($what) . ' accounts', route('accounts.index', $what));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'accounts.show', function (Generator $breadcrumbs, \Account $account) {
|
'accounts.show', function (Generator $breadcrumbs, \Account $account) {
|
||||||
switch ($account->accountType->type) {
|
switch ($account->accountType->type) {
|
||||||
default:
|
default:
|
||||||
throw new FireflyException('Cannot handle account type "' . e($account->accountType->type) . '"');
|
throw new FireflyException('Cannot handle account type "' . e($account->accountType->type) . '"');
|
||||||
break;
|
break;
|
||||||
case 'Default account':
|
case 'Default account':
|
||||||
case 'Asset account':
|
case 'Asset account':
|
||||||
$what = 'asset';
|
$what = 'asset';
|
||||||
break;
|
break;
|
||||||
case 'Cash account':
|
case 'Cash account':
|
||||||
$what = 'cash';
|
$what = 'cash';
|
||||||
break;
|
break;
|
||||||
case 'Expense account':
|
case 'Expense account':
|
||||||
case 'Beneficiary account':
|
case 'Beneficiary account':
|
||||||
$what = 'expense';
|
$what = 'expense';
|
||||||
break;
|
break;
|
||||||
case 'Revenue account':
|
case 'Revenue account':
|
||||||
$what = 'revenue';
|
$what = 'revenue';
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
$breadcrumbs->parent('accounts.index', $what);
|
|
||||||
$breadcrumbs->push($account->name, route('accounts.show', $account->id));
|
|
||||||
}
|
}
|
||||||
|
$breadcrumbs->parent('accounts.index', $what);
|
||||||
|
$breadcrumbs->push($account->name, route('accounts.show', $account->id));
|
||||||
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'accounts.delete', function (Generator $breadcrumbs, \Account $account) {
|
'accounts.delete', function (Generator $breadcrumbs, \Account $account) {
|
||||||
$breadcrumbs->parent('accounts.show', $account);
|
$breadcrumbs->parent('accounts.show', $account);
|
||||||
$breadcrumbs->push('Delete ' . $account->name, route('accounts.delete', $account->id));
|
$breadcrumbs->push('Delete ' . $account->name, route('accounts.delete', $account->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'accounts.edit', function (Generator $breadcrumbs, \Account $account) {
|
'accounts.edit', function (Generator $breadcrumbs, \Account $account) {
|
||||||
$breadcrumbs->parent('accounts.show', $account);
|
$breadcrumbs->parent('accounts.show', $account);
|
||||||
$breadcrumbs->push('Edit ' . $account->name, route('accounts.edit', $account->id));
|
$breadcrumbs->push('Edit ' . $account->name, route('accounts.edit', $account->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// budgets.
|
// budgets.
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'budgets.index', function (Generator $breadcrumbs) {
|
'budgets.index', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('home');
|
$breadcrumbs->parent('home');
|
||||||
$breadcrumbs->push('Budgets', route('budgets.index'));
|
$breadcrumbs->push('Budgets', route('budgets.index'));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'budgets.create', function (Generator $breadcrumbs) {
|
'budgets.create', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('budgets.index');
|
$breadcrumbs->parent('budgets.index');
|
||||||
$breadcrumbs->push('Create new budget', route('budgets.create'));
|
$breadcrumbs->push('Create new budget', route('budgets.create'));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'budgets.edit', function (Generator $breadcrumbs, Budget $budget) {
|
'budgets.edit', function (Generator $breadcrumbs, Budget $budget) {
|
||||||
$breadcrumbs->parent('budgets.show', $budget);
|
$breadcrumbs->parent('budgets.show', $budget);
|
||||||
$breadcrumbs->push('Edit ' . $budget->name, route('budgets.edit', $budget->id));
|
$breadcrumbs->push('Edit ' . $budget->name, route('budgets.edit', $budget->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'budgets.delete', function (Generator $breadcrumbs, Budget $budget) {
|
'budgets.delete', function (Generator $breadcrumbs, Budget $budget) {
|
||||||
$breadcrumbs->parent('budgets.show', $budget);
|
$breadcrumbs->parent('budgets.show', $budget);
|
||||||
$breadcrumbs->push('Delete ' . $budget->name, route('budgets.delete', $budget->id));
|
$breadcrumbs->push('Delete ' . $budget->name, route('budgets.delete', $budget->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'budgets.show', function (Generator $breadcrumbs, Budget $budget, LimitRepetition $repetition = null) {
|
'budgets.show', function (Generator $breadcrumbs, Budget $budget, LimitRepetition $repetition = null) {
|
||||||
$breadcrumbs->parent('budgets.index');
|
$breadcrumbs->parent('budgets.index');
|
||||||
$breadcrumbs->push($budget->name, route('budgets.show', $budget->id));
|
$breadcrumbs->push($budget->name, route('budgets.show', $budget->id));
|
||||||
if (!is_null($repetition)) {
|
if (!is_null($repetition)) {
|
||||||
$breadcrumbs->push(
|
$breadcrumbs->push(
|
||||||
DateKit::periodShow($repetition->startdate, $repetition->budgetlimit->repeat_freq), route('budgets.show', $budget->id, $repetition->id)
|
DateKit::periodShow($repetition->startdate, $repetition->budgetlimit->repeat_freq), route('budgets.show', $budget->id, $repetition->id)
|
||||||
);
|
);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// categories
|
// categories
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'categories.index', function (Generator $breadcrumbs) {
|
'categories.index', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('home');
|
$breadcrumbs->parent('home');
|
||||||
$breadcrumbs->push('Categories', route('categories.index'));
|
$breadcrumbs->push('Categories', route('categories.index'));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'categories.create', function (Generator $breadcrumbs) {
|
'categories.create', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('categories.index');
|
$breadcrumbs->parent('categories.index');
|
||||||
$breadcrumbs->push('Create new category', route('categories.create'));
|
$breadcrumbs->push('Create new category', route('categories.create'));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'categories.edit', function (Generator $breadcrumbs, Category $category) {
|
'categories.edit', function (Generator $breadcrumbs, Category $category) {
|
||||||
$breadcrumbs->parent('categories.show', $category);
|
$breadcrumbs->parent('categories.show', $category);
|
||||||
$breadcrumbs->push('Edit ' . $category->name, route('categories.edit', $category->id));
|
$breadcrumbs->push('Edit ' . $category->name, route('categories.edit', $category->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'categories.delete', function (Generator $breadcrumbs, Category $category) {
|
'categories.delete', function (Generator $breadcrumbs, Category $category) {
|
||||||
$breadcrumbs->parent('categories.show', $category);
|
$breadcrumbs->parent('categories.show', $category);
|
||||||
$breadcrumbs->push('Delete ' . $category->name, route('categories.delete', $category->id));
|
$breadcrumbs->push('Delete ' . $category->name, route('categories.delete', $category->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'categories.show', function (Generator $breadcrumbs, Category $category) {
|
'categories.show', function (Generator $breadcrumbs, Category $category) {
|
||||||
$breadcrumbs->parent('categories.index');
|
$breadcrumbs->parent('categories.index');
|
||||||
$breadcrumbs->push($category->name, route('categories.show', $category->id));
|
$breadcrumbs->push($category->name, route('categories.show', $category->id));
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
// piggy banks
|
// piggy banks
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'piggyBanks.index', function (Generator $breadcrumbs) {
|
'piggyBanks.index', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('home');
|
$breadcrumbs->parent('home');
|
||||||
$breadcrumbs->push('Piggy banks', route('piggyBanks.index'));
|
$breadcrumbs->push('Piggy banks', route('piggyBanks.index'));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'piggyBanks.create', function (Generator $breadcrumbs) {
|
'piggyBanks.create', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('piggyBanks.index');
|
$breadcrumbs->parent('piggyBanks.index');
|
||||||
$breadcrumbs->push('Create new piggy bank', route('piggyBanks.create'));
|
$breadcrumbs->push('Create new piggy bank', route('piggyBanks.create'));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'piggyBanks.edit', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
|
'piggyBanks.edit', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
|
||||||
$breadcrumbs->parent('piggyBanks.show', $piggyBank);
|
$breadcrumbs->parent('piggyBanks.show', $piggyBank);
|
||||||
$breadcrumbs->push('Edit ' . $piggyBank->name, route('piggyBanks.edit', $piggyBank->id));
|
$breadcrumbs->push('Edit ' . $piggyBank->name, route('piggyBanks.edit', $piggyBank->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'piggyBanks.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
|
'piggyBanks.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
|
||||||
$breadcrumbs->parent('piggyBanks.show', $piggyBank);
|
$breadcrumbs->parent('piggyBanks.show', $piggyBank);
|
||||||
$breadcrumbs->push('Delete ' . $piggyBank->name, route('piggyBanks.delete', $piggyBank->id));
|
$breadcrumbs->push('Delete ' . $piggyBank->name, route('piggyBanks.delete', $piggyBank->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'piggyBanks.show', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
|
'piggyBanks.show', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
|
||||||
$breadcrumbs->parent('piggyBanks.index');
|
$breadcrumbs->parent('piggyBanks.index');
|
||||||
$breadcrumbs->push($piggyBank->name, route('piggyBanks.show', $piggyBank->id));
|
$breadcrumbs->push($piggyBank->name, route('piggyBanks.show', $piggyBank->id));
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// preferences
|
// preferences
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'preferences', function (Generator $breadcrumbs) {
|
'preferences', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('home');
|
$breadcrumbs->parent('home');
|
||||||
$breadcrumbs->push('Preferences', route('preferences'));
|
$breadcrumbs->push('Preferences', route('preferences'));
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// profile
|
// profile
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'profile', function (Generator $breadcrumbs) {
|
'profile', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('home');
|
$breadcrumbs->parent('home');
|
||||||
$breadcrumbs->push('Profile', route('profile'));
|
$breadcrumbs->push('Profile', route('profile'));
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'change-password', function (Generator $breadcrumbs) {
|
'change-password', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('profile');
|
$breadcrumbs->parent('profile');
|
||||||
$breadcrumbs->push('Change your password', route('change-password'));
|
$breadcrumbs->push('Change your password', route('change-password'));
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// recurring transactions
|
// recurring transactions
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'recurring.index', function (Generator $breadcrumbs) {
|
'recurring.index', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('home');
|
$breadcrumbs->parent('home');
|
||||||
$breadcrumbs->push('Recurring transactions', route('recurring.index'));
|
$breadcrumbs->push('Recurring transactions', route('recurring.index'));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'recurring.create', function (Generator $breadcrumbs) {
|
'recurring.create', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('recurring.index');
|
$breadcrumbs->parent('recurring.index');
|
||||||
$breadcrumbs->push('Create new recurring transaction', route('recurring.create'));
|
$breadcrumbs->push('Create new recurring transaction', route('recurring.create'));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'recurring.edit', function (Generator $breadcrumbs, RecurringTransaction $recurring) {
|
'recurring.edit', function (Generator $breadcrumbs, RecurringTransaction $recurring) {
|
||||||
$breadcrumbs->parent('recurring.show', $recurring);
|
$breadcrumbs->parent('recurring.show', $recurring);
|
||||||
$breadcrumbs->push('Edit ' . $recurring->name, route('recurring.edit', $recurring->id));
|
$breadcrumbs->push('Edit ' . $recurring->name, route('recurring.edit', $recurring->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'recurring.delete', function (Generator $breadcrumbs, RecurringTransaction $recurring) {
|
'recurring.delete', function (Generator $breadcrumbs, RecurringTransaction $recurring) {
|
||||||
$breadcrumbs->parent('recurring.show', $recurring);
|
$breadcrumbs->parent('recurring.show', $recurring);
|
||||||
$breadcrumbs->push('Delete ' . $recurring->name, route('recurring.delete', $recurring->id));
|
$breadcrumbs->push('Delete ' . $recurring->name, route('recurring.delete', $recurring->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'recurring.show', function (Generator $breadcrumbs, RecurringTransaction $recurring) {
|
'recurring.show', function (Generator $breadcrumbs, RecurringTransaction $recurring) {
|
||||||
$breadcrumbs->parent('recurring.index');
|
$breadcrumbs->parent('recurring.index');
|
||||||
$breadcrumbs->push($recurring->name, route('recurring.show', $recurring->id));
|
$breadcrumbs->push($recurring->name, route('recurring.show', $recurring->id));
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// reminders
|
// reminders
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'reminders.show', function (Generator $breadcrumbs, Reminder $reminder) {
|
'reminders.show', function (Generator $breadcrumbs, Reminder $reminder) {
|
||||||
$breadcrumbs->parent('home');
|
$breadcrumbs->parent('home');
|
||||||
$breadcrumbs->push('Reminder #' . $reminder->id, route('reminders.show', $reminder->id));
|
$breadcrumbs->push('Reminder #' . $reminder->id, route('reminders.show', $reminder->id));
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// repeated expenses
|
// repeated expenses
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'repeated.index', function (Generator $breadcrumbs) {
|
'repeated.index', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('home');
|
$breadcrumbs->parent('home');
|
||||||
$breadcrumbs->push('Repeated expenses', route('repeated.index'));
|
$breadcrumbs->push('Repeated expenses', route('repeated.index'));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'repeated.create', function (Generator $breadcrumbs) {
|
'repeated.create', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('repeated.index');
|
$breadcrumbs->parent('repeated.index');
|
||||||
$breadcrumbs->push('Create new repeated expense', route('repeated.create'));
|
$breadcrumbs->push('Create new repeated expense', route('repeated.create'));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'repeated.edit', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
|
'repeated.edit', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
|
||||||
$breadcrumbs->parent('repeated.show', $piggyBank);
|
$breadcrumbs->parent('repeated.show', $piggyBank);
|
||||||
$breadcrumbs->push('Edit ' . $piggyBank->name, route('repeated.edit', $piggyBank->id));
|
$breadcrumbs->push('Edit ' . $piggyBank->name, route('repeated.edit', $piggyBank->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'repeated.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
|
'repeated.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
|
||||||
$breadcrumbs->parent('repeated.show', $piggyBank);
|
$breadcrumbs->parent('repeated.show', $piggyBank);
|
||||||
$breadcrumbs->push('Delete ' . $piggyBank->name, route('repeated.delete', $piggyBank->id));
|
$breadcrumbs->push('Delete ' . $piggyBank->name, route('repeated.delete', $piggyBank->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'repeated.show', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
|
'repeated.show', function (Generator $breadcrumbs, PiggyBank $piggyBank) {
|
||||||
$breadcrumbs->parent('repeated.index');
|
$breadcrumbs->parent('repeated.index');
|
||||||
$breadcrumbs->push($piggyBank->name, route('repeated.show', $piggyBank->id));
|
$breadcrumbs->push($piggyBank->name, route('repeated.show', $piggyBank->id));
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// reports
|
// reports
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'reports.index', function (Generator $breadcrumbs) {
|
'reports.index', function (Generator $breadcrumbs) {
|
||||||
$breadcrumbs->parent('home');
|
$breadcrumbs->parent('home');
|
||||||
$breadcrumbs->push('Reports', route('reports.index'));
|
$breadcrumbs->push('Reports', route('reports.index'));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'reports.year', function (Generator $breadcrumbs, Carbon $date) {
|
'reports.year', function (Generator $breadcrumbs, Carbon $date) {
|
||||||
$breadcrumbs->parent('reports.index');
|
$breadcrumbs->parent('reports.index');
|
||||||
$breadcrumbs->push($date->format('Y'), route('reports.year', $date->format('Y')));
|
$breadcrumbs->push($date->format('Y'), route('reports.year', $date->format('Y')));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'reports.budgets', function (Generator $breadcrumbs, Carbon $date) {
|
'reports.month', function (Generator $breadcrumbs, Carbon $date) {
|
||||||
$breadcrumbs->parent('reports.index');
|
$breadcrumbs->parent('reports.index');
|
||||||
$breadcrumbs->push('Budgets in ' . $date->format('F Y'), route('reports.budgets', $date->format('Y')));
|
$breadcrumbs->push('Monthly report for ' . $date->format('F Y'), route('reports.month', $date));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'reports.unbalanced', function (Generator $breadcrumbs, Carbon $date) {
|
'reports.budget', function (Generator $breadcrumbs, Carbon $date) {
|
||||||
$breadcrumbs->parent('reports.index');
|
$breadcrumbs->parent('reports.index');
|
||||||
$breadcrumbs->push('Unbalanced transactions in ' . $date->format('F Y'), route('reports.unbalanced', $date->format('Y')));
|
$breadcrumbs->push('Budget report for ' . $date->format('F Y'), route('reports.budget', $date));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// search
|
// search
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'search', function (Generator $breadcrumbs, $query) {
|
'search', function (Generator $breadcrumbs, $query) {
|
||||||
$breadcrumbs->parent('home');
|
$breadcrumbs->parent('home');
|
||||||
$breadcrumbs->push('Search for "' . e($query) . '"', route('search'));
|
$breadcrumbs->push('Search for "' . e($query) . '"', route('search'));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// transactions
|
// transactions
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'transactions.index', function (Generator $breadcrumbs, $what) {
|
'transactions.index', function (Generator $breadcrumbs, $what) {
|
||||||
$breadcrumbs->parent('home');
|
$breadcrumbs->parent('home');
|
||||||
|
|
||||||
switch ($what) {
|
switch ($what) {
|
||||||
case 'expenses':
|
case 'expenses':
|
||||||
case 'withdrawal':
|
case 'withdrawal':
|
||||||
$subTitle = 'Expenses';
|
$subTitle = 'Expenses';
|
||||||
break;
|
break;
|
||||||
case 'revenue':
|
case 'revenue':
|
||||||
case 'deposit':
|
case 'deposit':
|
||||||
$subTitle = 'Revenue, income and deposits';
|
$subTitle = 'Revenue, income and deposits';
|
||||||
break;
|
break;
|
||||||
case 'transfer':
|
case 'transfer':
|
||||||
case 'transfers':
|
case 'transfers':
|
||||||
$subTitle = 'Transfers';
|
$subTitle = 'Transfers';
|
||||||
break;
|
break;
|
||||||
case 'opening balance':
|
case 'opening balance':
|
||||||
$subTitle = 'Opening balances';
|
$subTitle = 'Opening balances';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw new FireflyException('Cannot handle $what "'.e($what).'" in bread crumbs');
|
throw new FireflyException('Cannot handle $what "' . e($what) . '" in bread crumbs');
|
||||||
}
|
|
||||||
|
|
||||||
$breadcrumbs->push($subTitle, route('transactions.index', $what));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$breadcrumbs->push($subTitle, route('transactions.index', $what));
|
||||||
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'transactions.create', function (Generator $breadcrumbs, $what) {
|
'transactions.create', function (Generator $breadcrumbs, $what) {
|
||||||
$breadcrumbs->parent('transactions.index', $what);
|
$breadcrumbs->parent('transactions.index', $what);
|
||||||
$breadcrumbs->push('Create new ' . $what, route('transactions.create', $what));
|
$breadcrumbs->push('Create new ' . $what, route('transactions.create', $what));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'transactions.edit', function (Generator $breadcrumbs, TransactionJournal $journal) {
|
'transactions.edit', function (Generator $breadcrumbs, TransactionJournal $journal) {
|
||||||
$breadcrumbs->parent('transactions.show', $journal);
|
$breadcrumbs->parent('transactions.show', $journal);
|
||||||
$breadcrumbs->push('Edit ' . $journal->description, route('transactions.edit', $journal ->id));
|
$breadcrumbs->push('Edit ' . $journal->description, route('transactions.edit', $journal->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'transactions.delete', function (Generator $breadcrumbs, TransactionJournal $journal) {
|
'transactions.delete', function (Generator $breadcrumbs, TransactionJournal $journal) {
|
||||||
$breadcrumbs->parent('transactions.show', $journal);
|
$breadcrumbs->parent('transactions.show', $journal);
|
||||||
$breadcrumbs->push('Delete ' . $journal->description, route('transactions.delete', $journal->id));
|
$breadcrumbs->push('Delete ' . $journal->description, route('transactions.delete', $journal->id));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'transactions.show', function (Generator $breadcrumbs, TransactionJournal $journal) {
|
'transactions.show', function (Generator $breadcrumbs, TransactionJournal $journal) {
|
||||||
|
|
||||||
$breadcrumbs->parent('transactions.index', strtolower($journal->transactionType->type));
|
$breadcrumbs->parent('transactions.index', strtolower($journal->transactionType->type));
|
||||||
$breadcrumbs->push($journal->description, route('transactions.show', $journal->id));
|
$breadcrumbs->push($journal->description, route('transactions.show', $journal->id));
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
@ -52,7 +52,7 @@ class ReportController extends BaseController
|
|||||||
$accounts = $this->_repository->getAccountListBudgetOverview($date);
|
$accounts = $this->_repository->getAccountListBudgetOverview($date);
|
||||||
$budgets = $this->_repository->getBudgetsForMonth($date);
|
$budgets = $this->_repository->getBudgetsForMonth($date);
|
||||||
|
|
||||||
return View::make('reports.budget', compact('accounts', 'budgets', 'dayEarly'));
|
return View::make('reports.budget', compact('date', 'accounts', 'budgets', 'dayEarly'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -96,7 +96,7 @@ class ReportController extends BaseController
|
|||||||
|
|
||||||
return View::make(
|
return View::make(
|
||||||
'reports.month',
|
'reports.month',
|
||||||
compact('accounts', 'categories', 'budgets', 'expenses', 'subTitle', 'displaySum', 'subTitleIcon', 'income')
|
compact('date', 'accounts', 'categories', 'budgets', 'expenses', 'subTitle', 'displaySum', 'subTitleIcon', 'income')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -206,7 +206,7 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface
|
|||||||
*/
|
*/
|
||||||
public function get()
|
public function get()
|
||||||
{
|
{
|
||||||
return $this->getUser()->piggyBanks()->where('repeats', 0)->get();
|
return $this->getUser()->piggyBanks()->where('repeats', 0)->orderBy('name')->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,60 +1,66 @@
|
|||||||
@extends('layouts.default')
|
@extends('layouts.default')
|
||||||
@section('content')
|
@section('content')
|
||||||
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) }}
|
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) }}
|
||||||
|
@foreach($piggyBanks as $piggyBank)
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@foreach($piggyBanks as $piggyBank)
|
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||||
<div class="col-lg-6 col-md-6 col-sm-12">
|
<div class="panel panel-default">
|
||||||
<div class="panel panel-default">
|
<div class="panel-heading">
|
||||||
<div class="panel-heading">
|
<i class="fa fa-fw fa-rocket"></i> <a href="{{route('piggy_banks.show',$piggyBank->id)}}" title="{{{$piggyBank->name}}}">{{{$piggyBank->name}}}</a>
|
||||||
<i class="fa fa-fw fa-rocket"></i> <a href="{{route('piggy_banks.show',$piggyBank->id)}}" title="{{{$piggyBank->name}}}">{{{$piggyBank->name}}}</a>
|
</div>
|
||||||
</div>
|
<div class="panel-body">
|
||||||
<div class="panel-body">
|
<div class="row">
|
||||||
<div class="row">
|
<!-- One block -->
|
||||||
<div class="col-lg-2 col-md-3 col-sm-4">
|
<div class="col-lg-1 col-md-4 col-sm-4 col-xs-4">
|
||||||
{{mf($piggyBank->savedSoFar,true)}}
|
<div class="btn-group btn-group-xs">
|
||||||
</div>
|
@if($piggyBank->leftToSave > 0)
|
||||||
<div class="col-lg-8 col-md-6 col-sm-4">
|
<a href="#" class="btn btn-default addMoney" data-id="{{{$piggyBank->id}}}"><span data-id="{{{$piggyBank->id}}}" class="glyphicon glyphicon-plus"></span></a>
|
||||||
<div class="progress progress-striped">
|
@endif
|
||||||
<div
|
<a href="#" class="btn btn-default removeMoney" data-id="{{{$piggyBank->id}}}"><span data-id="{{{$piggyBank->id}}}" class="glyphicon glyphicon-minus"></span></a>
|
||||||
@if($piggyBank->percentage == 100)
|
|
||||||
class="progress-bar progress-bar-success"
|
|
||||||
@else
|
|
||||||
class="progress-bar progress-bar-info"
|
|
||||||
@endif
|
|
||||||
role="progressbar" aria-valuenow="{{$piggyBank->percentage}}" aria-valuemin="0" aria-valuemax="100" style="min-width: 40px;width: {{$piggyBank->percentage}}%;">
|
|
||||||
{{$piggyBank->percentage}}%
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-lg-2 col-md-3 col-sm-4">
|
|
||||||
{{mf($piggyBank->targetamount,true)}}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<!-- One block -->
|
||||||
<div class="col-lg-2 col-md-3 col-sm-4">
|
<div class="col-lg-1 col-md-4 col-sm-4 col-xs-4">
|
||||||
<div class="btn-group btn-group-xs">
|
<div class="btn-group btn-group-xs">
|
||||||
@if($piggyBank->leftToSave > 0)
|
<a href="{{route('piggy_banks.edit',$piggyBank->id)}}" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></a>
|
||||||
<a href="#" class="btn btn-default addMoney" data-id="{{{$piggyBank->id}}}"><span data-id="{{{$piggyBank->id}}}" class="glyphicon glyphicon-plus"></span></a>
|
<a href="{{route('piggy_banks.delete',$piggyBank->id)}}" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span></a>
|
||||||
@endif
|
|
||||||
<a href="#" class="btn btn-default removeMoney" data-id="{{{$piggyBank->id}}}"><span data-id="{{{$piggyBank->id}}}" class="glyphicon glyphicon-minus"></span></a>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-8 col-md-6 col-sm-4">
|
</div>
|
||||||
<div class="btn-group btn-group-xs">
|
<!-- One block -->
|
||||||
<a href="{{route('piggy_banks.edit',$piggyBank->id)}}" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></a>
|
<div class="col-lg-1 col-md-4 col-sm-4 col-xs-4">
|
||||||
<a href="{{route('piggy_banks.delete',$piggyBank->id)}}" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span></a>
|
{{mf($piggyBank->savedSoFar,true)}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<!-- One block -->
|
||||||
<div class="col-lg-2 col-md-3 col-sm-4">
|
<div class="col-lg-7 col-md-12 col-sm-12 col-xs-12">
|
||||||
@if($piggyBank->leftToSave > 0)
|
<div class="progress progress-striped">
|
||||||
{{mf($piggyBank->leftToSave)}}
|
<div
|
||||||
|
@if($piggyBank->percentage == 100)
|
||||||
|
class="progress-bar progress-bar-success"
|
||||||
|
@else
|
||||||
|
class="progress-bar progress-bar-info"
|
||||||
@endif
|
@endif
|
||||||
|
role="progressbar" aria-valuenow="{{$piggyBank->percentage}}" aria-valuemin="0" aria-valuemax="100" style="min-width: 40px;width: {{$piggyBank->percentage}}%;">
|
||||||
|
{{$piggyBank->percentage}}%
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- One block -->
|
||||||
|
<div class="col-lg-1 col-md-6 col-sm-6 col-xs-6">
|
||||||
|
{{mf($piggyBank->targetamount,true)}}
|
||||||
|
</div>
|
||||||
|
<!-- One block -->
|
||||||
|
<div class="col-lg-1 col-md-6 col-sm-6 col-xs-6">
|
||||||
|
@if($piggyBank->leftToSave > 0)
|
||||||
|
{{mf($piggyBank->leftToSave)}}
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@endforeach
|
</div>
|
||||||
|
</div>
|
||||||
|
@endforeach
|
||||||
|
<div class="row">
|
||||||
<div class="col-lg-6 col-md-6 col-sm-12">
|
<div class="col-lg-6 col-md-6 col-sm-12">
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
@extends('layouts.default')
|
@extends('layouts.default')
|
||||||
@section('content')
|
@section('content')
|
||||||
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) }}
|
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $date) }}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-6 col-md-6 col-sm-12">
|
<div class="col-lg-6 col-md-6 col-sm-12">
|
||||||
<table class="table table-bordered table-striped">
|
<table class="table table-bordered table-striped">
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
@extends('layouts.default')
|
@extends('layouts.default')
|
||||||
@section('content')
|
@section('content')
|
||||||
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) }}
|
{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $date) }}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-5 col-md-5 col-sm-12">
|
<div class="col-lg-5 col-md-5 col-sm-12">
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
|
Loading…
Reference in New Issue
Block a user