From 2a7085e593fc777d65174821eab159ebee598f77 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 12 Dec 2015 08:25:08 +0100 Subject: [PATCH] Experimental budget lines. #129 --- app/Helpers/Report/ReportHelper.php | 2 +- resources/twig/partials/reports/budgets.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index 71bc78b8a8..b3cdda48b9 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -567,7 +567,7 @@ class ReportHelper implements ReportHelperInterface $left = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? bcadd($repetition->amount, $expenses) : 0; $spent = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? $expenses : '0'; - $overspent = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? bcadd($expenses, $repetition->amount) : 0; + $overspent = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? '0' : bcadd($expenses, $repetition->amount); $budgetLine->setLeft($left); $budgetLine->setSpent($spent); diff --git a/resources/twig/partials/reports/budgets.twig b/resources/twig/partials/reports/budgets.twig index 2846a12317..aa8c9986e3 100644 --- a/resources/twig/partials/reports/budgets.twig +++ b/resources/twig/partials/reports/budgets.twig @@ -51,7 +51,7 @@ {% if budgetLine.getOverspent != 0 %} - {{ budgetLine.getOverspent|formatAmountPlain }} + {{ budgetLine.getOverspent|formatAmount }} {% endif %}