diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php index a30954ec7b..f1abe0b96e 100644 --- a/app/Http/Controllers/Report/OperationsController.php +++ b/app/Http/Controllers/Report/OperationsController.php @@ -48,8 +48,9 @@ class OperationsController extends Controller if ($cache->has()) { return $cache->get(); } - $expenses = $this->getExpenseReport($start, $end, $accounts); - $result = view('reports.partials.expenses', compact('expenses'))->render(); + $entries = $this->getExpenseReport($start, $end, $accounts); + $type = 'expense-entry'; + $result = view('reports.partials.income-expenses', compact('entries', 'type'))->render(); $cache->store($result); return $result; @@ -74,9 +75,10 @@ class OperationsController extends Controller if ($cache->has()) { return $cache->get(); } - $income = $this->getIncomeReport($start, $end, $accounts); + $entries = $this->getIncomeReport($start, $end, $accounts); + $type = 'income-entry'; + $result = view('reports.partials.income-expenses', compact('entries', 'type'))->render(); - $result = view('reports.partials.income', compact('income'))->render(); $cache->store($result); return $result; @@ -227,15 +229,22 @@ class OperationsController extends Controller $name = $transaction->opposing_account_name; if (!isset($expenses[$opposingId])) { $expenses[$opposingId] = [ - 'id' => $opposingId, - 'name' => $name, - 'sum' => '0', - 'count' => 0, + 'id' => $opposingId, + 'name' => $name, + 'sum' => '0', + 'average' => '0', + 'count' => 0, ]; } $expenses[$opposingId]['sum'] = bcadd($expenses[$opposingId]['sum'], $transaction->transaction_amount); $expenses[$opposingId]['count']++; } + // do averages: + foreach ($expenses as $key => $entry) { + if ($expenses[$key]['count'] > 1) { + $expenses[$key]['average'] = bcdiv($expenses[$key]['sum'], strval($expenses[$key]['count'])); + } + } return $expenses; diff --git a/resources/views/reports/partials/expenses.twig b/resources/views/reports/partials/expenses.twig deleted file mode 100644 index e1d7956087..0000000000 --- a/resources/views/reports/partials/expenses.twig +++ /dev/null @@ -1,41 +0,0 @@ - - - {% set sum = 0 %} - {% for expense in expenses %} - {% set sum = sum + expense.sum %} - {% if loop.index > listLength %} - - {% else %} - - {% endif %} - - - - {% endfor %} - - - {% if expenses|length > listLength %} - - - - {% endif %} - - - - - -
- {{ expense.name }} - {% if expense.count > 1 %} -
- - {{ expense.count }} {{ 'transactions'|_|lower }} - - - {% endif %} -
- {{ (expense.sum)|formatAmount }} -
- {{ trans('firefly.show_full_list',{number:incomeTopLength}) }} -
{{ 'sum'|_ }}{{ (sum)|formatAmount }}
diff --git a/resources/views/reports/partials/income-expenses.twig b/resources/views/reports/partials/income-expenses.twig new file mode 100644 index 0000000000..de978da6fc --- /dev/null +++ b/resources/views/reports/partials/income-expenses.twig @@ -0,0 +1,55 @@ + + + + + + + + + + {% set sum = 0 %} + {% for entry in entries %} + {% set sum = sum + entry.sum %} + {% if loop.index > listLength %} + + {% else %} + + {% endif %} + + + + + {% endfor %} + + + {% if entries|length > listLength %} + + + + {% endif %} + + + + + +
{{ 'name'|_ }}{{ 'total'|_ }}
+ {{ entry.name }} + {% if entry.count > 1 %} +
+ + {{ entry.count }} {{ 'transactions'|_|lower }} + + + {% endif %} +
+ {{ (entry.sum)|formatAmount }} +
+ {{ trans('firefly.show_full_list',{number:incomeTopLength}) }} +
{{ 'sum'|_ }}{{ (sum)|formatAmount }}
diff --git a/resources/views/reports/partials/income.twig b/resources/views/reports/partials/income.twig deleted file mode 100644 index be2e37dcd0..0000000000 --- a/resources/views/reports/partials/income.twig +++ /dev/null @@ -1,41 +0,0 @@ - - - {% set sum = 0 %} - {% for row in income %} - {% set sum = sum + row.sum %} - {% if loop.index > listLength %} - - {% else %} - - {% endif %} - - - - - {% endfor %} - - - {% if income|length > listLength %} - - - - {% endif %} - - - - - -
- {{ row.name }} - {% if row.count > 1 %} -
- - {{ row.count }} {{ 'transactions'|_|lower }} - - - - {% endif %} -
{{ row.sum|formatAmount }}
- {{ trans('firefly.show_full_list',{ number:listLength } ) }} -
{{ 'sum'|_ }}{{ sum|formatAmount }}