diff --git a/app/Http/Controllers/Budget/AvailableBudgetController.php b/app/Http/Controllers/Budget/AvailableBudgetController.php index 3ca5f7d7c4..f3d7402505 100644 --- a/app/Http/Controllers/Budget/AvailableBudgetController.php +++ b/app/Http/Controllers/Budget/AvailableBudgetController.php @@ -196,7 +196,7 @@ class AvailableBudgetController extends Controller } session()->flash('success', trans('firefly.set_ab')); - return redirect(route('budgets.index')); + return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')])); } /** diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index d8292f71ef..94dde17cdd 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -86,6 +86,7 @@ class IndexController extends Controller } /** + * TODO the "budgeted" progress bar doesn't update. * Show all budgets. * * @param Request $request @@ -194,9 +195,6 @@ class IndexController extends Controller return view( 'budgets.index', compact( 'availableBudgets', - //'available', - //'currentMonth', 'next', 'nextText', 'prev', - //'prevText', 'previousLoop', 'nextLoop', 'budgeted', 'spent', 'prevLoop', 'nextLoop', 'budgets', diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php index e614303262..bc3931fea7 100644 --- a/app/Http/Requests/ReportFormRequest.php +++ b/app/Http/Requests/ReportFormRequest.php @@ -155,7 +155,7 @@ class ReportFormRequest extends Request { /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); - $set = $this->get('exp_rev'); + $set = $this->get('double'); $collection = new Collection; if (is_array($set)) { foreach ($set as $accountId) { diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index e2a14df35d..a32747323c 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -356,9 +356,10 @@ class TagRepository implements TagRepositoryInterface // return value for tag cloud: $return[$tag->id] = [ - 'size' => $fontSize, - 'tag' => $tag->tag, - 'id' => $tag->id, + 'size' => $fontSize, + 'tag' => $tag->tag, + 'id' => $tag->id, + 'created_at' => $tag->created_at, ]; } @@ -481,7 +482,7 @@ class TagRepository implements TagRepositoryInterface $tagQuery->where('tags.date', '>=', $year . '-01-01 00:00:00')->where('tags.date', '<=', $year . '-12-31 23:59:59'); } - return $tagQuery->get(['tags.id', 'tags.tag', DB::raw('SUM(transactions.amount) as amount_sum')]); + return $tagQuery->get(['tags.id', 'tags.tag','tags.created_at', DB::raw('SUM(transactions.amount) as amount_sum')]); } } diff --git a/resources/views/v1/budgets/index.twig b/resources/views/v1/budgets/index.twig index 25ddb2e786..0a74eb922a 100644 --- a/resources/views/v1/budgets/index.twig +++ b/resources/views/v1/budgets/index.twig @@ -25,12 +25,12 @@
{% for tagInfo in entries %} {{ tagInfo.tag }} {% endfor %}
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 93443cd5a3..d75c3a3330 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -774,16 +774,16 @@ try { ); Breadcrumbs::register( - 'reports.report.account', - function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $expenseIds, Carbon $start, Carbon $end) { + 'reports.report.double', + function (BreadcrumbsGenerator $breadcrumbs, string $accountIds, string $doubleIds, Carbon $start, Carbon $end) { $breadcrumbs->parent('reports.index'); $monthFormat = (string)trans('config.month_and_day'); $startString = $start->formatLocalized($monthFormat); $endString = $end->formatLocalized($monthFormat); - $title = (string)trans('firefly.report_account', ['start' => $startString, 'end' => $endString]); + $title = (string)trans('firefly.report_double', ['start' => $startString, 'end' => $endString]); - $breadcrumbs->push($title, route('reports.report.account', [$accountIds, $expenseIds, $start->format('Ymd'), $end->format('Ymd')])); + $breadcrumbs->push($title, route('reports.report.double', [$accountIds, $doubleIds, $start->format('Ymd'), $end->format('Ymd')])); } );