IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-09 23:15:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make fiscal year quick link optional.

Browse Source
This commit is contained in:
James Cole 2016-01-29 07:47:18 +01:00
parent a156dce281
commit 7f54b70c24
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ use FireflyIII\Helpers\Report\ReportHelperInterface;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Preferences;
use Session; use Session;
use View; use View;
@ -166,8 +167,9 @@ class ReportController extends Controller
*/ */
public function index(ARI $repository) public function index(ARI $repository)
{ {
$start = Session::get('first'); $start = Session::get('first');
$months = $this->helper->listOfMonths($start); $months = $this->helper->listOfMonths($start);
$customFiscalYear = Preferences::get('customFiscalYear', 0)->data;
// does the user have shared accounts? // does the user have shared accounts?
$accounts = $repository->getAccounts(['Default account', 'Asset account']); $accounts = $repository->getAccounts(['Default account', 'Asset account']);
@ -180,11 +182,7 @@ class ReportController extends Controller
$accountList = join(',', $accountIds); $accountList = join(',', $accountIds);
return view( return view('reports.index', compact('months', 'accounts', 'start', 'accountList','customFiscalYear'));
'reports.index', compact(
'months', 'accounts', 'start', 'accountList'
)
);
} }
/** /**

2
resources/views/reports/index.twig
View File

@ -108,6 +108,7 @@
accountList accountList
]) }}">{{ 'report_this_year_quick'|_ }}</a> ]) }}">{{ 'report_this_year_quick'|_ }}</a>
</li> </li>
{% if customFiscalYear == 1 %}
<li> <li>
<a href="{{ route('reports.report', <a href="{{ route('reports.report',
['default', ['default',
@ -116,6 +117,7 @@
accountList accountList
]) }}">{{ 'report_this_fiscal_year_quick'|_ }}</a> ]) }}">{{ 'report_this_fiscal_year_quick'|_ }}</a>
</li> </li>
{% endif %}
<li> <li>
<a href="{{ route('reports.report', <a href="{{ route('reports.report',
['default', ['default',