diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 0d79d6a3b8..03c165a877 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -336,13 +336,15 @@ class BudgetController extends Controller $range = Preferences::get('viewRange', '1M')->data; /** @var Carbon $date */ - $date = session('start', new Carbon); - $start = Navigation::startOfPeriod($date, $range); - $end = Navigation::endOfPeriod($start, $range); - $key = 'budgetIncomeTotal' . $start->format('Ymd') . $end->format('Ymd'); - $amount = Preferences::get($key, 1000); + $date = session('start', new Carbon); + $start = Navigation::startOfPeriod($date, $range); + $end = Navigation::endOfPeriod($start, $range); + $key = 'budgetIncomeTotal' . $start->format('Ymd') . $end->format('Ymd'); + $amount = Preferences::get($key, 1000); + $displayStart = Navigation::periodShow($start, $range); + $displayEnd = Navigation::periodShow($end, $range); - return view('budgets.income', compact('amount')); + return view('budgets.income', compact('amount', 'displayStart', 'displayEnd')); } } diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 133b37a34d..fc3d38f165 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -471,6 +471,7 @@ return [ 'updated_budget' => 'Updated budget ":name"', 'update_amount' => 'Update amount', 'update_budget' => 'Update budget', + 'update_budget_amount_range' => 'Update (expected) available amount between :start and :end', // bills: 'matching_on' => 'Matching on', diff --git a/resources/views/budgets/income.twig b/resources/views/budgets/income.twig index 501dc93acc..aef412667c 100644 --- a/resources/views/budgets/income.twig +++ b/resources/views/budgets/income.twig @@ -3,7 +3,9 @@