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

More routes fixed.

Browse Source
This commit is contained in:
James Cole
2016-12-06 07:06:20 +01:00
parent bebfbf0b90
commit 02257e3887
8 changed files with 59 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/views/budgets/show.twig
View File

@@ -49,7 +49,7 @@
<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><a
href="{{ route('budgets.showWithRepetition',[budget.id,limit.id]) }}">{{ limit.startdate.formatLocalized(monthFormat) }}</a>
href="{{ route('budgets.show.repetition',[budget.id,limit.id]) }}">{{ limit.startdate.formatLocalized(monthFormat) }}</a>
</h3>
</div>
<div class="box-body">
@@ -98,10 +98,12 @@
<script type="text/javascript">
var budgetID = {{ budget.id }};
{% if repetition.id %}
var repetitionID = {{ repetition.id }};
var year = {{ repetition.startdate.format('Y') }};
var repetitionID = {{ repetition.id }};
var year = {{ repetition.startdate.format('Y') }};
var budgetChartUri = '{{ route('chart.budget.budget-limit', [budget.id, repetition.id] ) }}';
{% else %}
var year = {{ Session.get('start').format('Y') }};
var year = {{ Session.get('start').format('Y') }};
var budgetChartUri = '{{ route('chart.budget.budget', [budget.id] ) }}';
{% endif %}
</script>

15
resources/views/reports/default/year.twig
View File

@@ -170,14 +170,15 @@
var reportType = '{{ reportType }}';
var accountIds = '{{ accountIds }}';
var accountReportUri = '{{ route('report-data.account.general', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
var incomeReportUri = '{{ route('report-data.operations.income', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
var expenseReportUri = '{{ route('report-data.operations.expenses', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
var incExpReportUri = '{{ route('report-data.operations.operations', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
var accountReportUri = '{{ route('report-data.account.general', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var incomeReportUri = '{{ route('report-data.operations.income', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var expenseReportUri = '{{ route('report-data.operations.expenses', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var incExpReportUri = '{{ route('report-data.operations.operations', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var budgetPeriodReportUri = '{{ route('report-data.budget.period', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var categoryExpenseUri = '{{ route('report-data.category.expenses', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var categoryIncomeUri = '{{ route('report-data.category.income', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var budgetPeriodReportUri = '{{ route('report-data.budget.period', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
var categoryExpenseUri = '{{ route('report-data.category.expenses', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
var categoryIncomeUri = '{{ route('report-data.category.income', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}';
</script>