diff --git a/app/Helpers/Collection/Category.php b/app/Helpers/Collection/Category.php index 76ed0f05de..e365d2c27d 100644 --- a/app/Helpers/Collection/Category.php +++ b/app/Helpers/Collection/Category.php @@ -34,7 +34,8 @@ class Category */ public function addCategory(CategoryModel $category) { - if ($category->spent > 0) { + // spent is minus zero for an expense report: + if ($category->spent < 0) { $this->categories->push($category); } } diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index 095d68ae53..bccc191c87 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -263,7 +263,7 @@ class ReportHelper implements ReportHelperInterface // no repetition(s) for this budget: if ($repetitions->count() == 0) { - $spent = $repository->spentInPeriodCorrected($budget, $start, $end, $shared); + $spent = $repository->balanceInPeriod($budget, $start, $end, $shared); $budgetLine = new BudgetLine; $budgetLine->setBudget($budget); $budgetLine->setOverspent($spent); @@ -278,7 +278,7 @@ class ReportHelper implements ReportHelperInterface $budgetLine = new BudgetLine; $budgetLine->setBudget($budget); $budgetLine->setRepetition($repetition); - $expenses = $repository->spentInPeriodCorrected($budget, $repetition->startdate, $repetition->enddate, $shared); + $expenses = $repository->balanceInPeriod($budget, $repetition->startdate, $repetition->enddate, $shared); $left = $expenses < $repetition->amount ? bcsub($repetition->amount, $expenses) : 0; $spent = $expenses > $repetition->amount ? 0 : $expenses; $overspent = $expenses > $repetition->amount ? bcsub($expenses, $repetition->amount) : 0; @@ -327,7 +327,7 @@ class ReportHelper implements ReportHelperInterface $repository = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); $set = $repository->getCategories(); foreach ($set as $category) { - $spent = $repository->spentInPeriodCorrected($category, $start, $end, $shared); + $spent = $repository->balanceInPeriod($category, $start, $end, $shared); $category->spent = $spent; $object->addCategory($category); $object->addTotal($spent); diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 5e698ee423..02ef9eaece 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -152,7 +152,7 @@ class BudgetController extends Controller foreach ($budgets as $budget) { $date = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end', Carbon::now()->endOfMonth()); - $budget->spent = $repository->spentInPeriodCorrected($budget, $date, $end); + $budget->spent = $repository->balanceInPeriod($budget, $date, $end); $budget->currentRep = $repository->getCurrentRepetition($budget, $date); if ($budget->currentRep) { $budgeted = bcadd($budgeted, $budget->currentRep->amount); diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 70b1b93f9f..d5036356d8 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -68,7 +68,7 @@ class BudgetController extends Controller $end->subDay(); $chartDate = clone $end; $chartDate->startOfMonth(); - $spent = $repository->spentInPeriodCorrected($budget, $first, $end); + $spent = $repository->balanceInPeriod($budget, $first, $end); $entries->push([$chartDate, $spent]); $first = Navigation::addPeriod($first, $range, 0); } @@ -156,13 +156,13 @@ class BudgetController extends Controller foreach ($budgets as $budget) { $repetitions = $repository->getBudgetLimitRepetitions($budget, $start, $end); if ($repetitions->count() == 0) { - $expenses = $repository->spentInPeriodCorrected($budget, $start, $end, true); + $expenses = $repository->balanceInPeriod($budget, $start, $end, true); $allEntries->push([$budget->name, 0, 0, $expenses, 0, 0]); continue; } /** @var LimitRepetition $repetition */ foreach ($repetitions as $repetition) { - $expenses = $repository->spentInPeriodCorrected($budget, $repetition->startdate, $repetition->enddate, true); + $expenses = $repository->balanceInPeriod($budget, $repetition->startdate, $repetition->enddate, true); // $left can be less than zero. // $overspent can be more than zero ( = overspending) @@ -218,7 +218,7 @@ class BudgetController extends Controller // filter empty budgets: foreach ($allBudgets as $budget) { - $spent = $repository->spentInPeriodCorrected($budget, $start, $end, $shared); + $spent = $repository->balanceInPeriod($budget, $start, $end, $shared); if ($spent != 0) { $budgets->push($budget); } @@ -234,7 +234,7 @@ class BudgetController extends Controller // each budget, fill the row: foreach ($budgets as $budget) { - $spent = $repository->spentInPeriodCorrected($budget, $start, $month, $shared); + $spent = $repository->balanceInPeriod($budget, $start, $month, $shared); $row[] = $spent * -1; } $entries->push($row); diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 67553440be..840bc68aed 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -65,7 +65,7 @@ class CategoryController extends Controller while ($start <= $end) { $currentEnd = Navigation::endOfPeriod($start, $range); - $spent = $repository->spentInPeriodCorrected($category, $start, $currentEnd); + $spent = $repository->balanceInPeriod($category, $start, $currentEnd); $entries->push([clone $start, $spent]); $start = Navigation::addPeriod($start, $range, 0); @@ -188,7 +188,7 @@ class CategoryController extends Controller $entries = new Collection; $categories = $allCategories->filter( function (Category $category) use ($repository, $start, $end, $shared) { - $spent = $repository->spentInPeriodCorrected($category, $start, $end, $shared); + $spent = $repository->balanceInPeriod($category, $start, $end, $shared); if ($spent < 0) { return $category; } @@ -203,7 +203,7 @@ class CategoryController extends Controller $row = [clone $start]; // make a row: foreach ($categories as $category) { // each budget, fill the row - $spent = $repository->spentInPeriodCorrected($category, $start, $month, $shared); + $spent = $repository->balanceInPeriod($category, $start, $month, $shared); if ($spent < 0) { $row[] = $spent * -1; } else { @@ -247,7 +247,7 @@ class CategoryController extends Controller $allEntries = new Collection; $categories = $allCategories->filter( function (Category $category) use ($repository, $start, $end, $shared) { - $spent = $repository->spentInPeriodCorrected($category, $start, $end, $shared); + $spent = $repository->balanceInPeriod($category, $start, $end, $shared); if ($spent > 0) { return $category; } @@ -262,7 +262,7 @@ class CategoryController extends Controller $row = [clone $start]; // make a row: foreach ($categories as $category) { // each budget, fill the row - $spent = $repository->spentInPeriodCorrected($category, $start, $month, $shared); + $spent = $repository->balanceInPeriod($category, $start, $month, $shared); if ($spent > 0) { $row[] = $spent; } else { diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index d7f77edcff..7096306b67 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -313,9 +313,9 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn * * @return string */ - public function spentInPeriodCorrected(Budget $budget, Carbon $start, Carbon $end, $shared = true) + public function balanceInPeriod(Budget $budget, Carbon $start, Carbon $end, $shared = true) { - return $this->balanceInPeriod($budget, $start, $end, $shared); + return $this->commonBalanceInPeriod($budget, $start, $end, $shared); } /** diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 12d3d01b93..6ba34a6e66 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -136,7 +136,7 @@ interface BudgetRepositoryInterface * * @return string */ - public function spentInPeriodCorrected(Budget $budget, Carbon $start, Carbon $end, $shared = true); + public function balanceInPeriod(Budget $budget, Carbon $start, Carbon $end, $shared = true); /** * @param array $data diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 74e3e64334..09d7369dec 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -183,9 +183,9 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito * * @return string */ - public function spentInPeriodCorrected(Category $category, Carbon $start, Carbon $end, $shared = false) + public function balanceInPeriod(Category $category, Carbon $start, Carbon $end, $shared = false) { - return $this->balanceInPeriod($category, $start, $end, $shared); + return $this->commonBalanceInPeriod($category, $start, $end, $shared); } /** diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index a24dfb6efe..4c1b631fd5 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -83,7 +83,7 @@ interface CategoryRepositoryInterface * * @return string */ - public function spentInPeriodCorrected(Category $category, Carbon $start, Carbon $end, $shared = false); + public function balanceInPeriod(Category $category, Carbon $start, Carbon $end, $shared = false); /** * diff --git a/app/Repositories/Shared/ComponentRepository.php b/app/Repositories/Shared/ComponentRepository.php index 4dd92309f3..584856fa3d 100644 --- a/app/Repositories/Shared/ComponentRepository.php +++ b/app/Repositories/Shared/ComponentRepository.php @@ -24,7 +24,7 @@ class ComponentRepository * * @return string */ - protected function balanceInPeriod($object, Carbon $start, Carbon $end, $shared = false) + protected function commonBalanceInPeriod($object, Carbon $start, Carbon $end, $shared = false) { $cache = new CacheProperties; // we must cache this. $cache->addProperty($object->id); @@ -32,7 +32,7 @@ class ComponentRepository $cache->addProperty($start); $cache->addProperty($end); $cache->addProperty($shared); - $cache->addProperty('spentInPeriod'); + $cache->addProperty('balanceInPeriod'); if ($cache->has()) { return $cache->get(); // @codeCoverageIgnore