diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index 1ac4532632..adf6639de0 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -194,7 +194,9 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface */ private function summarizeByBudget(Collection $collection): array { - $result = []; + $result = [ + 'sum' => '0', + ]; /** @var Transaction $transaction */ foreach ($collection as $transaction) { $jrnlBudId = intval($transaction->transaction_journal_budget_id); @@ -202,6 +204,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface $budgetId = max($jrnlBudId, $transBudId); $result[$budgetId] = $result[$budgetId] ?? '0'; $result[$budgetId] = bcadd($transaction->transaction_amount, $result[$budgetId]); + $result['sum'] = bcadd($result['sum'], $transaction->transaction_amount); } return $result; diff --git a/app/Generator/Report/Support.php b/app/Generator/Report/Support.php index f169bc59bc..aca9c005ba 100644 --- a/app/Generator/Report/Support.php +++ b/app/Generator/Report/Support.php @@ -133,7 +133,7 @@ class Support } $return[$objectId]['earned'] = $entry; - $return['sum']['earned'] = bcadd($return['sum']['earned'], $entry); + $return['sum']['earned'] = bcadd($return['sum']['earned'], $entry); } return $return; @@ -146,12 +146,15 @@ class Support */ protected function summarizeByAccount(Collection $collection): array { - $result = []; + $result = [ + 'sum' => '0', + ]; /** @var Transaction $transaction */ foreach ($collection as $transaction) { $accountId = $transaction->account_id; $result[$accountId] = $result[$accountId] ?? '0'; $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]); + $result['sum'] = bcadd($result['sum'], $transaction->transaction_amount); } return $result; diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig index 4939a20eba..e1e1dcd757 100644 --- a/resources/views/reports/budget/month.twig +++ b/resources/views/reports/budget/month.twig @@ -35,6 +35,12 @@ {% endfor %} +
+