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

Fix #1134

Browse Source
This commit is contained in:
James Cole
2018-01-17 09:22:45 +01:00
parent 493543c1f5
commit ccf1a6c182
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Report/PopupReport.php
View File

@@ -136,7 +136,7 @@ class PopupReport implements PopupReportInterface
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setAccounts($attributes['accounts'])->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) $collector->setAccounts($attributes['accounts'])->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
->setRange($attributes['startDate'], $attributes['endDate']) ->setRange($attributes['startDate'], $attributes['endDate'])->withOpposingAccount()
->setCategory($category); ->setCategory($category);
$journals = $collector->getJournals(); $journals = $collector->getJournals();

8
app/Http/Controllers/Popup/ReportController.php
View File

@@ -59,16 +59,16 @@ class ReportController extends Controller
parent::__construct(); parent::__construct();
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
// @var AccountRepositoryInterface $repository /** @var AccountRepositoryInterface accountRepository */
$this->accountRepository = app(AccountRepositoryInterface::class); $this->accountRepository = app(AccountRepositoryInterface::class);
// @var BudgetRepositoryInterface $repository /** @var BudgetRepositoryInterface budgetRepository */
$this->budgetRepository = app(BudgetRepositoryInterface::class); $this->budgetRepository = app(BudgetRepositoryInterface::class);
// @var CategoryRepositoryInterface categoryRepository /** @var CategoryRepositoryInterface categoryRepository */
$this->categoryRepository = app(CategoryRepositoryInterface::class); $this->categoryRepository = app(CategoryRepositoryInterface::class);
// @var PopupReportInterface popupHelper /** @var PopupReportInterface popupHelper */
$this->popupHelper = app(PopupReportInterface::class); $this->popupHelper = app(PopupReportInterface::class);
return $next($request); return $next($request);