kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixed tests

Browse Source
This commit is contained in:
James Cole
2015-05-16 09:25:14 +02:00
parent 0a372b0daf
commit e155d3311c
7 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Repositories/Category/CategoryRepository.php
View File

@@ -170,9 +170,15 @@ class CategoryRepository implements CategoryRepositoryInterface
*
* @return float
*/
public function spentInPeriodSum(Category $category, Carbon $start, Carbon $end)
public function spentInPeriod(Category $category, Carbon $start, Carbon $end, $shared = false)
{
return floatval($category->transactionjournals()->before($end)->after($start)->lessThan(0)->sum('amount')) * -1;
if($shared === false) {
// do something else, SEE budgets.
$sum = floatval($category->transactionjournals()->before($end)->after($start)->lessThan(0)->sum('amount')) * -1;
} else {
$sum = floatval($category->transactionjournals()->before($end)->after($start)->lessThan(0)->sum('amount')) * -1;
}
return $sum;
}
/**

2
app/Repositories/Category/CategoryRepositoryInterface.php
View File

@@ -77,7 +77,7 @@ interface CategoryRepositoryInterface
*
* @return float
*/
public function spentInPeriodSum(Category $category, Carbon $start, Carbon $end);
public function spentInPeriod(Category $category, Carbon $start, Carbon $end, $shared = false);
/**
* @param Category $category