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

More routes and pages fixed.

Browse Source
This commit is contained in:
James Cole
2016-12-06 08:15:53 +01:00
parent d8f291be6e
commit f4887bbbf7
15 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/en_US/firefly.php
View File

@@ -84,7 +84,7 @@ return [
'destination_accounts' => 'Destination account(s)',
'user_id_is' => 'Your user id is <strong>:user</strong>',
'field_supports_markdown' => 'This field supports <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
'need_more_help' => 'If you need more help using Firefly III, please <a href="https://github.com/JC5/firefly-iii/issues">open a ticker on Github</a>.',
'need_more_help' => 'If you need more help using Firefly III, please <a href="https://github.com/JC5/firefly-iii/issues">open a ticket on Github</a>.',
'nothing_to_display' => 'There are no transactions to show you',
'show_all_no_filter' => 'Show all transactions without grouping them by date.',
'expenses_by_category' => 'Expenses by category',

2
resources/views/import/csv/configure.twig
View File

@@ -22,7 +22,7 @@
</div>
</div>
<form class="form-horizontal" action="{{ route('import.process_configuration', job.key) }}" method="post" enctype="multipart/form-data">
<form class="form-horizontal" action="{{ route('import.process-configuration', job.key) }}" method="post" enctype="multipart/form-data">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="row">

2
resources/views/import/csv/map.twig
View File

@@ -22,7 +22,7 @@
</div>
</div>
<form action="{{ route('import.postSettings', job.key) }}" method="post">
<form action="{{ route('import.post-settings', job.key) }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<input type="hidden" name="settings" value="map"/>

2
resources/views/import/csv/roles.twig
View File

@@ -21,7 +21,7 @@
</div>
</div>
<form action="{{ route('import.postSettings', job.key) }}" method="post">
<form action="{{ route('import.post-settings', job.key) }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<input type="hidden" name="settings" value="roles"/>

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

@@ -170,6 +170,12 @@
var reportType = '{{ reportType }}';
var accountIds = '{{ accountIds }}';
// report uri's
var opChartUri ='{{ route('chart.report.operations', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var sumChartUri='{{ route('chart.report.sum', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
var netWorthUri ='{{ route('chart.report.net-worth', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
// data uri's
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')]) }}';