diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 8f8d40a535..3222ec9467 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -138,9 +138,10 @@ class HomeController extends Controller /** @var Carbon $start */ $start = session('start', Carbon::now()->startOfMonth()); /** @var Carbon $end */ - $end = session('end', Carbon::now()->endOfMonth()); - $showTour = Preferences::get('tour', true)->data; - $accounts = $repository->getAccountsById($frontPage->data); + $end = session('end', Carbon::now()->endOfMonth()); + $showTour = Preferences::get('tour', true)->data; + $accounts = $repository->getAccountsById($frontPage->data); + $showDepositsFrontpage = Preferences::get('showDepositsFrontpage', false)->data; foreach ($accounts as $account) { $set = $tasker->getJournalsInPeriod(new Collection([$account]), [], $start, $end); @@ -152,7 +153,7 @@ class HomeController extends Controller } return view( - 'index', compact('count', 'showTour', 'title', 'subTitle', 'mainTitleIcon', 'transactions') + 'index', compact('count', 'showTour', 'title', 'subTitle', 'mainTitleIcon', 'transactions','showDepositsFrontpage') ); } diff --git a/public/js/ff/index.js b/public/js/ff/index.js index faeed6f099..c714f83ac7 100644 --- a/public/js/ff/index.js +++ b/public/js/ff/index.js @@ -37,6 +37,7 @@ function drawChart() { stackedColumnChart('chart/budget/frontpage', 'budgets-chart', {beforeDraw: beforeDrawIsEmpty}); columnChart('chart/category/frontpage', 'categories-chart', {beforeDraw: beforeDrawIsEmpty}); columnChart('chart/account/expense', 'expense-accounts-chart', {beforeDraw: beforeDrawIsEmpty}); + columnChart('chart/account/revenue', 'revenue-accounts-chart', {beforeDraw: beforeDrawIsEmpty}); getBoxAmounts(); diff --git a/resources/views/index.twig b/resources/views/index.twig index 88bd28b7e1..14a14c66e3 100644 --- a/resources/views/index.twig +++ b/resources/views/index.twig @@ -101,6 +101,18 @@ + + {% if showDepositsFrontpage %} +