IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #2522

Browse Source
This commit is contained in:
James Cole
2019-09-03 16:56:46 +02:00
parent b3cbbeecf0
commit e113fea8f0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Helpers/Report/BudgetReportHelper.php
View File

@@ -108,7 +108,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
'budgeted' => $limit->amount, 'budgeted' => $limit->amount,
'spent' => '0', 'spent' => '0',
'left' => $limit->amount, 'left' => $limit->amount,
'overspent' => null, 'overspent' => '0',
'currency_id' => $currency->id, 'currency_id' => $currency->id,
'currency_code' => $currency->code, 'currency_code' => $currency->code,
'currency_name' => $currency->name, 'currency_name' => $currency->name,
@@ -128,7 +128,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
'budgeted' => null, 'budgeted' => null,
'spent' => $expense['amount'], 'spent' => $expense['amount'],
'left' => null, 'left' => null,
'overspent' => null, 'overspent' => '0',
'currency_id' => $expense['currency_id'], 'currency_id' => $expense['currency_id'],
'currency_code' => $expense['currency_name'], 'currency_code' => $expense['currency_name'],
'currency_name' => $expense['currency_name'], 'currency_name' => $expense['currency_name'],
@@ -146,7 +146,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
$row['left'] = -1 === bccomp(bcadd($limit->amount, $row['spent']), '0') ? '0' : bcadd($limit->amount, $row['spent']); $row['left'] = -1 === bccomp(bcadd($limit->amount, $row['spent']), '0') ? '0' : bcadd($limit->amount, $row['spent']);
// spent > budgeted? then sum, otherwise other sum // spent > budgeted? then sum, otherwise other sum
$row['overspent'] = 1 === bccomp($row['spent'], $row['budgeted']) ? bcadd($row['spent'], $row['budgeted']) : '0'; $row['overspent'] = 1 === bccomp(bcmul($row['spent'],'-1'), $row['budgeted']) ? bcadd($row['spent'], $row['budgeted']) : '0';
} }
$entry['rows'][] = $row; $entry['rows'][] = $row;
} }