From bd9f1d5398e95a369151d4d2ed94a709d6db999b Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 23 Feb 2016 19:59:41 +0100 Subject: [PATCH] Rename export date range in other forms. Makes the rule group runner by @roberthorlings more consistent. --- app/Http/Controllers/ExportController.php | 4 ++-- app/Http/Requests/ExportFormRequest.php | 4 ++-- resources/lang/en_US/form.php | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index b0f15e5d1a..f67b540f13 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -119,8 +119,8 @@ class ExportController extends Controller $job = $jobs->findByKey($request->get('job')); $settings = [ 'accounts' => $repository->get($request->get('accounts')), - 'startDate' => new Carbon($request->get('start_date')), - 'endDate' => new Carbon($request->get('end_date')), + 'startDate' => new Carbon($request->get('export_start_range')), + 'endDate' => new Carbon($request->get('export_end_range')), 'exportFormat' => $request->get('exportFormat'), 'includeAttachments' => intval($request->get('include_attachments')) === 1, 'includeConfig' => intval($request->get('include_config')) === 1, diff --git a/app/Http/Requests/ExportFormRequest.php b/app/Http/Requests/ExportFormRequest.php index d88b10702f..dc21562ec4 100644 --- a/app/Http/Requests/ExportFormRequest.php +++ b/app/Http/Requests/ExportFormRequest.php @@ -42,8 +42,8 @@ class ExportFormRequest extends Request $formats = join(',', array_keys(config('firefly.export_formats'))); return [ - 'start_date' => 'required|date|after:' . $first, - 'end_date' => 'required|date|before:' . $today, + 'export_start_range' => 'required|date|after:' . $first, + 'export_end_range' => 'required|date|before:' . $today, 'accounts' => 'required', 'job' => 'required|belongsToUser:export_jobs,key', 'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts', diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php index f404dbfc69..760257be4c 100644 --- a/resources/lang/en_US/form.php +++ b/resources/lang/en_US/form.php @@ -71,8 +71,10 @@ return [ 'size' => 'Size', 'trigger' => 'Trigger', 'stop_processing' => 'Stop processing', - 'start_date' => 'Start of export range', - 'end_date' => 'End of export range', + 'start_date' => 'Start of range', + 'end_date' => 'End of range', + 'export_start_range' => 'Start of export range', + 'export_end_range' => 'End of export range', 'export_format' => 'File format', 'include_attachments' => 'Include uploaded attachments', 'include_config' => 'Include configuration file',