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

Experimental budget lines. #129

Browse Source
This commit is contained in:
James Cole 2015-12-12 08:21:46 +01:00
parent e59fd098a3
commit 8316afb176
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Helpers/Report/ReportHelper.php
View File

@ -560,10 +560,9 @@ class ReportHelper implements ReportHelperInterface
$budgetLine->setBudget($budget);
$budgetLine->setRepetition($repetition);
$expenses = $repository->balanceInPeriodForList($budget, $start, $end, $accounts);
$expenses = $expenses * -1;
$left = $expenses < $repetition->amount ? bcsub($repetition->amount, $expenses) : 0;
$spent = $expenses > $repetition->amount ? 0 : $expenses;
$overspent = $expenses > $repetition->amount ? bcsub($expenses, $repetition->amount) : 0;
$left = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? bcadd($repetition->amount, $expenses) : 0;
$spent = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? 0 : $expenses;
$overspent = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? bcadd($expenses, $repetition->amount) : 0;
$budgetLine->setLeft($left);
$budgetLine->setSpent($spent);

2
resources/twig/partials/reports/budgets.twig
View File

@ -39,7 +39,7 @@
</td>
<td>
{% if budgetLine.getSpent != 0 %}
<span class="text-danger">{{ budgetLine.getSpent|formatAmountPlain }}</span>
{{ budgetLine.getSpent|formatAmount }}
{% endif %}
{% if budgetLine.getSpent == 0 %}