diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 211862c542..7580f30a78 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -152,10 +152,11 @@ class CategoryController extends Controller $set = $repository->getJournals($category, $page); $count = $repository->countJournals($category); $totalSum = $repository->journalsSum($category); + $periodSum = $repository->journalsSum($category, Session::get('start'), Session::get('end')); $journals = new LengthAwarePaginator($set, $count, 50, $page); $journals->setPath('categories/show/' . $category->id); - return view('categories.show', compact('category', 'journals', 'hideCategory', 'totalSum')); + return view('categories.show', compact('category', 'journals', 'hideCategory', 'totalSum', 'periodSum')); } /** diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index 2de14d960b..456e0ef9a1 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -16,6 +16,7 @@ return [ 'from' => 'From', 'to' => 'To', 'total_sum' => 'Total sum', + 'period_sum' => 'Sum for period', 'showEverything' => 'Show everything', 'never' => 'Never', 'search_results_for' => 'Search results for ":query"', diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php index 390f563579..1a1836f8da 100644 --- a/resources/lang/nl/firefly.php +++ b/resources/lang/nl/firefly.php @@ -16,6 +16,7 @@ return [ 'from' => 'Van', 'to' => 'Tot', 'total_sum' => 'Totale som', + 'period_sum' => 'Som van periode', 'showEverything' => 'Laat alles zien', 'never' => 'Nooit', 'search_results_for' => 'Zoekresultaten voor ":query"', diff --git a/resources/twig/categories/show.twig b/resources/twig/categories/show.twig index f5cece5b89..38e95fee51 100644 --- a/resources/twig/categories/show.twig +++ b/resources/twig/categories/show.twig @@ -45,7 +45,7 @@

{{ 'transactions'|_ }}

- {% include 'list/journals' with {showPageSum: true,showTotalSum: true} %} + {% include 'list/journals' with {showPageSum: true, showTotalSum: true, showPeriodSum: true} %}
diff --git a/resources/twig/list/journals.twig b/resources/twig/list/journals.twig index 84e3a92d01..aa739484bb 100644 --- a/resources/twig/list/journals.twig +++ b/resources/twig/list/journals.twig @@ -125,13 +125,18 @@ {{ _sum|formatAmount }} {% endif %} + {% if showPeriodSum %} + + {{ 'period_sum'|_ }} + {{ periodSum|formatAmount }} + + {% endif %} {% if showTotalSum %} {{ 'total_sum'|_ }} {{ totalSum|formatAmount }} {% endif %} -