diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 1f419a9e97..875adce839 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -170,16 +170,21 @@ class PiggyBankController extends Controller $subTitle = trans('firefly.update_piggy_title', ['name' => $piggyBank->name]); $subTitleIcon = 'fa-pencil'; $targetDate = null; + $startDate = null; $note = $piggyBank->notes()->first(); // Flash some data to fill the form. if (null !== $piggyBank->targetdate) { $targetDate = $piggyBank->targetdate->format('Y-m-d'); } + if (null !== $piggyBank->startdate) { + $startDate = $piggyBank->startdate->format('Y-m-d'); + } $preFilled = ['name' => $piggyBank->name, 'account_id' => $piggyBank->account_id, 'targetamount' => $piggyBank->targetamount, 'targetdate' => $targetDate, + 'startdate' => $startDate, 'note' => null === $note ? '' : $note->text, ]; Session::flash('preFilled', $preFilled); @@ -390,9 +395,13 @@ class PiggyBankController extends Controller */ public function store(PiggyBankFormRequest $request, PiggyBankRepositoryInterface $repository) { - $data = $request->getPiggyBankData(); + $data = $request->getPiggyBankData(); + if (null === $data['startdate']) { + $data['startdate'] = new Carbon; + } $piggyBank = $repository->store($data); + Session::flash('success', strval(trans('firefly.stored_piggy_bank', ['name' => $piggyBank->name]))); Preferences::mark(); diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankFormRequest.php index f882835309..38c209887a 100644 --- a/app/Http/Requests/PiggyBankFormRequest.php +++ b/app/Http/Requests/PiggyBankFormRequest.php @@ -45,7 +45,7 @@ class PiggyBankFormRequest extends Request { return [ 'name' => $this->string('name'), - 'startdate' => new Carbon, + 'startdate' => $this->date('startdate'), 'account_id' => $this->integer('account_id'), 'targetamount' => $this->string('targetamount'), 'targetdate' => $this->date('targetdate'), diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php index 24d6519276..6d7a98c2fe 100644 --- a/resources/lang/en_US/form.php +++ b/resources/lang/en_US/form.php @@ -91,6 +91,7 @@ return [ 'deletePermanently' => 'Delete permanently', 'cancel' => 'Cancel', 'targetdate' => 'Target date', + 'startdate' => 'Start date', 'tag' => 'Tag', 'under' => 'Under', 'symbol' => 'Symbol', diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twig index 1aca53ee8e..d6bac800fb 100644 --- a/resources/views/piggy-banks/edit.twig +++ b/resources/views/piggy-banks/edit.twig @@ -32,6 +32,7 @@

{{ 'optionalFields'|_ }}

+ {{ ExpandedForm.date('startdate') }} {{ ExpandedForm.date('targetdate') }} {{ ExpandedForm.textarea('note', null, {helpText: trans('firefly.field_supports_markdown')}) }}