From 5ed09e3f3823a1295073f0832f9442845c36d91e Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 20 May 2015 06:47:53 +0200 Subject: [PATCH] Call the corrected spent function [skip ci] --- app/Helpers/Report/ReportHelper.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index c1f3863e0e..2b066f726d 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -247,7 +247,7 @@ class ReportHelper implements ReportHelperInterface // no repetition(s) for this budget: if ($repetitions->count() == 0) { - $spent = $repository->spentInPeriod($budget, $start, $end, $shared); + $spent = $repository->spentInPeriodCorrected($budget, $start, $end, $shared); $budgetLine = new BudgetLine; $budgetLine->setBudget($budget); $budgetLine->setOverspent($spent); @@ -262,7 +262,7 @@ class ReportHelper implements ReportHelperInterface $budgetLine = new BudgetLine; $budgetLine->setBudget($budget); $budgetLine->setRepetition($repetition); - $expenses = $repository->spentInPeriod($budget, $repetition->startdate, $repetition->enddate, $shared); + $expenses = $repository->spentInPeriodCorrected($budget, $repetition->startdate, $repetition->enddate, $shared); $left = $expenses < floatval($repetition->amount) ? floatval($repetition->amount) - $expenses : 0; $spent = $expenses > floatval($repetition->amount) ? 0 : $expenses; $overspent = $expenses > floatval($repetition->amount) ? $expenses - floatval($repetition->amount) : 0; @@ -311,7 +311,7 @@ class ReportHelper implements ReportHelperInterface $repository = App::make('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); $set = $repository->getCategories(); foreach ($set as $category) { - $spent = $repository->spentInPeriod($category, $start, $end, $shared); + $spent = $repository->spentInPeriodCorrected($category, $start, $end, $shared); $category->spent = $spent; $object->addCategory($category); $object->addTotal($spent);