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

Restore original functionality.

Browse Source
This commit is contained in:
James Cole 2016-02-23 07:31:01 +01:00
parent 537b4ae003
commit 3f829a3114
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ExportController.php
View File

@ -97,7 +97,7 @@ class ExportController extends Controller
$checked = array_keys($accountList);
$formats = array_keys(Config::get('firefly.export_formats'));
$defaultFormat = Preferences::get('export_format', Config::get('firefly.default_export_format'))->data;
$first = Carbon::create()->subWeek()->format('Y-m-d');
$first = session('first')->format('Y-m-d');
$today = Carbon::create()->format('Y-m-d');
return view('export.index', compact('job', 'checked', 'accountList', 'formats', 'defaultFormat', 'first', 'today'));

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

@ -58,6 +58,7 @@ return [
'include_config_help' => 'For easy re-import into Firefly III',
'include_old_uploads_help' => 'Firefly III does not throw away the original CSV files you have imported in the past. You can include them in your export.',
'do_export' => 'Export',
'export_status_never_started' => 'The export has not started yet',
'export_status_make_exporter' => 'Creating exporter thing...',
'export_status_collecting_journals' => 'Collecting your transactions...',
'export_status_collected_journals' => 'Collected your transactions!',