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

Rename export date range in other forms. Makes the rule group runner by @roberthorlings more consistent.

Browse Source
This commit is contained in:
James Cole 2016-02-23 19:59:41 +01:00
parent ce0ca23d79
commit bd9f1d5398
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,8 +119,8 @@ class ExportController extends Controller
$job = $jobs->findByKey($request->get('job')); $job = $jobs->findByKey($request->get('job'));
$settings = [ $settings = [
'accounts' => $repository->get($request->get('accounts')), 'accounts' => $repository->get($request->get('accounts')),
'startDate' => new Carbon($request->get('start_date')), 'startDate' => new Carbon($request->get('export_start_range')),
'endDate' => new Carbon($request->get('end_date')), 'endDate' => new Carbon($request->get('export_end_range')),
'exportFormat' => $request->get('exportFormat'), 'exportFormat' => $request->get('exportFormat'),
'includeAttachments' => intval($request->get('include_attachments')) === 1, 'includeAttachments' => intval($request->get('include_attachments')) === 1,
'includeConfig' => intval($request->get('include_config')) === 1, 'includeConfig' => intval($request->get('include_config')) === 1,

4
app/Http/Requests/ExportFormRequest.php
View File

@ -42,8 +42,8 @@ class ExportFormRequest extends Request
$formats = join(',', array_keys(config('firefly.export_formats'))); $formats = join(',', array_keys(config('firefly.export_formats')));
return [ return [
'start_date' => 'required|date|after:' . $first, 'export_start_range' => 'required|date|after:' . $first,
'end_date' => 'required|date|before:' . $today, 'export_end_range' => 'required|date|before:' . $today,
'accounts' => 'required', 'accounts' => 'required',
'job' => 'required|belongsToUser:export_jobs,key', 'job' => 'required|belongsToUser:export_jobs,key',
'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts', 'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',

6
resources/lang/en_US/form.php
View File

@ -71,8 +71,10 @@ return [
'size' => 'Size', 'size' => 'Size',
'trigger' => 'Trigger', 'trigger' => 'Trigger',
'stop_processing' => 'Stop processing', 'stop_processing' => 'Stop processing',
'start_date' => 'Start of export range', 'start_date' => 'Start of range',
'end_date' => 'End of export range', 'end_date' => 'End of range',
'export_start_range' => 'Start of export range',
'export_end_range' => 'End of export range',
'export_format' => 'File format', 'export_format' => 'File format',
'include_attachments' => 'Include uploaded attachments', 'include_attachments' => 'Include uploaded attachments',
'include_config' => 'Include configuration file', 'include_config' => 'Include configuration file',