kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-18 20:38:57 +00:00
Code Issues Projects Releases Wiki Activity

Fixed some tests. [skip ci]

Browse Source
This commit is contained in:
James Cole
2017-04-08 10:20:34 +02:00
parent fd01b54a14
commit 6765f08b07
4 changed files with 74 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Chart/BudgetReportController.php
View File

@@ -16,7 +16,7 @@ namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Generator\Report\Category\MonthReportGenerator;
use FireflyIII\Generator\Report\Support;
use FireflyIII\Helpers\Chart\MetaPieChartInterface;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
@@ -237,7 +237,7 @@ class BudgetReportController extends Controller
->setBudgets($budgets)->withOpposingAccount()->disableFilter();
$accountIds = $accounts->pluck('id')->toArray();
$transactions = $collector->getJournals();
$set = MonthReportGenerator::filterExpenses($transactions, $accountIds);
$set = Support::filterExpenses($transactions, $accountIds);
return $set;
}

4
app/Http/Controllers/Report/CategoryController.php
View File

@@ -45,8 +45,6 @@ class CategoryController extends Controller
$cache->addProperty('category-period-expenses-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
Log::debug('Return report from cache');
return $cache->get(); // @codeCoverageIgnore
}
/** @var CategoryRepositoryInterface $repository */
@@ -79,8 +77,6 @@ class CategoryController extends Controller
$cache->addProperty('category-period-income-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
Log::debug('Return report from cache');
return $cache->get(); // @codeCoverageIgnore
}
/** @var CategoryRepositoryInterface $repository */