diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 4d981a1ffd..7c25441e3b 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -107,7 +107,6 @@ class HomeController extends Controller */ public function index(AccountRepositoryInterface $repository) { - $result = version_compare(phpversion(), '8.0'); $types = config('firefly.accountTypesByIdentifier.asset'); $count = $repository->count($types); Log::channel('audit')->info('User visits homepage.'); diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index 765120fb10..2bf0ecc4ca 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -141,6 +141,7 @@ class EditController extends Controller 'withdrawal_destination_id' => $array['transactions'][0]['destination_id'], ]; $array['first_date'] = substr($array['first_date'], 0, 10); + $array['repeat_until'] = substr((string)$array['repeat_until'], 0, 10); $array['transactions'][0]['tags'] = implode(',', $array['transactions'][0]['tags'] ?? []); return prefixView( diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index 75c5d16508..83e385b51b 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -56,15 +56,15 @@ class RecurrenceFormRequest extends FormRequest $repetitionData = $this->parseRepetitionData(); $return = [ 'recurrence' => [ - 'type' => $this->string('transaction_type'), - 'title' => $this->string('title'), - 'description' => $this->string('recurring_description'), - 'first_date' => $this->date('first_date'), - 'repeat_until' => $this->date('repeat_until'), - 'repetitions' => $this->integer('repetitions'), - 'apply_rules' => $this->boolean('apply_rules'), - 'active' => $this->boolean('active'), - 'repetition_end' => $this->string('repetition_end'), + 'type' => $this->string('transaction_type'), + 'title' => $this->string('title'), + 'description' => $this->string('recurring_description'), + 'first_date' => $this->date('first_date'), + 'repeat_until' => $this->date('repeat_until'), + 'nr_of_repetitions' => $this->integer('repetitions'), + 'apply_rules' => $this->boolean('apply_rules'), + 'active' => $this->boolean('active'), + 'repetition_end' => $this->string('repetition_end'), ], 'transactions' => [ [ diff --git a/changelog.md b/changelog.md index 080b32a5a0..f1b98df517 100644 --- a/changelog.md +++ b/changelog.md @@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - [Issue 4589](https://github.com/firefly-iii/firefly-iii/issues/4589) It was not possible to change accounts in layout v2. - [Issue 4591](https://github.com/firefly-iii/firefly-iii/issues/4591) It was not possible to create splits in layout v2. +- #4593 Could not change or update recurring repetition data. ### Security - Nothing (yet)