IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-30 20:54:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Possible fix for reports [skip ci]

Browse Source
This commit is contained in:
James Cole 2016-09-16 09:36:08 +02:00
parent fb649779d6
commit 2f8263f53a
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/ReportController.php
View File

@ -50,18 +50,11 @@ class ReportController extends Controller
/** /**
* *
*
* @param ReportHelperInterface $helper
*/ */
public function __construct(ReportHelperInterface $helper) public function __construct()
{ {
parent::__construct(); parent::__construct();
$this->helper = $helper;
$this->accountHelper = app(AccountReportHelperInterface::class);
$this->budgetHelper = app(BudgetReportHelperInterface::class);
$this->balanceHelper = app(BalanceReportHelperInterface::class);
View::share('title', trans('firefly.reports')); View::share('title', trans('firefly.reports'));
View::share('mainTitleIcon', 'fa-line-chart'); View::share('mainTitleIcon', 'fa-line-chart');
@ -74,6 +67,7 @@ class ReportController extends Controller
*/ */
public function index(AccountCrudInterface $crud) public function index(AccountCrudInterface $crud)
{ {
$this->createRepositories();
/** @var Carbon $start */ /** @var Carbon $start */
$start = clone session('first'); $start = clone session('first');
$months = $this->helper->listOfMonths($start); $months = $this->helper->listOfMonths($start);
@ -104,6 +98,7 @@ class ReportController extends Controller
*/ */
public function report(string $reportType, Carbon $start, Carbon $end, Collection $accounts) public function report(string $reportType, Carbon $start, Carbon $end, Collection $accounts)
{ {
$this->createRepositories();
// throw an error if necessary. // throw an error if necessary.
if ($end < $start) { if ($end < $start) {
throw new FireflyException('End date cannot be before start date, silly!'); throw new FireflyException('End date cannot be before start date, silly!');
@ -216,7 +211,7 @@ class ReportController extends Controller
$accountIds = join(',', $accounts->pluck('id')->toArray()); $accountIds = join(',', $accounts->pluck('id')->toArray());
$hideable = ['buttons', 'icon', 'description', 'balance_before', 'amount', 'balance_after', 'date', $hideable = ['buttons', 'icon', 'description', 'balance_before', 'amount', 'balance_after', 'date',
'interest_date','book_date', 'process_date', 'interest_date', 'book_date', 'process_date',
// three new optional fields. // three new optional fields.
'due_date', 'payment_date', 'invoice_date', 'due_date', 'payment_date', 'invoice_date',
'from', 'to', 'budget', 'category', 'bill', 'from', 'to', 'budget', 'category', 'bill',
@ -230,6 +225,17 @@ class ReportController extends Controller
return view('reports.audit.report', compact('start', 'end', 'reportType', 'accountIds', 'accounts', 'auditData', 'hideable', 'defaultShow')); return view('reports.audit.report', compact('start', 'end', 'reportType', 'accountIds', 'accounts', 'auditData', 'hideable', 'defaultShow'));
} }
/**
*
*/
private function createRepositories()
{
$this->helper = app(ReportHelperInterface::class);
$this->accountHelper = app(AccountReportHelperInterface::class);
$this->budgetHelper = app(BudgetReportHelperInterface::class);
$this->balanceHelper = app(BalanceReportHelperInterface::class);
}
/** /**
* @param $reportType * @param $reportType
* @param Carbon $start * @param Carbon $start