kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix #4593

Browse Source
This commit is contained in:
James Cole
2021-04-04 12:48:44 +02:00
parent 1b8eb3cd68
commit d3502c56d3
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/HomeController.php
View File

@@ -107,7 +107,6 @@ class HomeController extends Controller
*/ */
public function index(AccountRepositoryInterface $repository) public function index(AccountRepositoryInterface $repository)
{ {
$result = version_compare(phpversion(), '8.0');
$types = config('firefly.accountTypesByIdentifier.asset'); $types = config('firefly.accountTypesByIdentifier.asset');
$count = $repository->count($types); $count = $repository->count($types);
Log::channel('audit')->info('User visits homepage.'); Log::channel('audit')->info('User visits homepage.');

1
app/Http/Controllers/Recurring/EditController.php
View File

@@ -141,6 +141,7 @@ class EditController extends Controller
'withdrawal_destination_id' => $array['transactions'][0]['destination_id'], 'withdrawal_destination_id' => $array['transactions'][0]['destination_id'],
]; ];
$array['first_date'] = substr($array['first_date'], 0, 10); $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'] ?? []); $array['transactions'][0]['tags'] = implode(',', $array['transactions'][0]['tags'] ?? []);
return prefixView( return prefixView(

18
app/Http/Requests/RecurrenceFormRequest.php
View File

@@ -56,15 +56,15 @@ class RecurrenceFormRequest extends FormRequest
$repetitionData = $this->parseRepetitionData(); $repetitionData = $this->parseRepetitionData();
$return = [ $return = [
'recurrence' => [ 'recurrence' => [
'type' => $this->string('transaction_type'), 'type' => $this->string('transaction_type'),
'title' => $this->string('title'), 'title' => $this->string('title'),
'description' => $this->string('recurring_description'), 'description' => $this->string('recurring_description'),
'first_date' => $this->date('first_date'), 'first_date' => $this->date('first_date'),
'repeat_until' => $this->date('repeat_until'), 'repeat_until' => $this->date('repeat_until'),
'repetitions' => $this->integer('repetitions'), 'nr_of_repetitions' => $this->integer('repetitions'),
'apply_rules' => $this->boolean('apply_rules'), 'apply_rules' => $this->boolean('apply_rules'),
'active' => $this->boolean('active'), 'active' => $this->boolean('active'),
'repetition_end' => $this->string('repetition_end'), 'repetition_end' => $this->string('repetition_end'),
], ],
'transactions' => [ 'transactions' => [
[ [

1
changelog.md
View File

@@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
- [Issue 4589](https://github.com/firefly-iii/firefly-iii/issues/4589) It was not possible to change accounts in layout v2. - [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. - [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 ### Security
- Nothing (yet) - Nothing (yet)