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 a bug where the category list in a monthly report would be empty.

Browse Source
This commit is contained in:
James Cole
2015-08-02 07:04:43 +02:00
parent af7952f204
commit 4f0ed97410
10 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Repositories/Budget/BudgetRepository.php
View File

@@ -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);
}
/**

2
app/Repositories/Budget/BudgetRepositoryInterface.php
View File

@@ -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

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

@@ -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);
}
/**

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

@@ -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);
/**
*

4
app/Repositories/Shared/ComponentRepository.php
View File

@@ -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