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

Small code cleanup.

Browse Source
This commit is contained in:
James Cole 2021-03-12 20:25:15 +01:00
parent 81f5224b11
commit a03e000af1
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
View File

@ -121,7 +121,7 @@ class UpdateRequest extends FormRequest
}
if(array_key_exists('moment', $repetition)) {
$current['moment'] = $repetition['moment'];
$current['moment'] = (string)$repetition['moment'];
}
if(array_key_exists('skip', $repetition)) {
@ -195,9 +195,9 @@ class UpdateRequest extends FormRequest
{
$validator->after(
function (Validator $validator) {
//$this->validateOneRecurrenceTransaction($validator);
//$this->validateOneRepetitionUpdate($validator);
//$this->validateRecurrenceRepetition($validator);
$this->validateOneRecurrenceTransaction($validator);
$this->validateOneRepetitionUpdate($validator);
$this->validateRecurrenceRepetition($validator);
$this->validateRepetitionMoment($validator);
$this->validateForeignCurrencyInformation($validator);
$this->valUpdateAccountInfo($validator);

5
app/Services/Internal/Update/RecurrenceUpdateService.php
View File

@ -100,6 +100,8 @@ class RecurrenceUpdateService
// update each repetition or throw error yay
$this->updateRepetitions($recurrence, $data['repetitions'] ?? []);
}
// update all transactions:
// // update all transactions (and associated meta-data)
// if (array_key_exists('transactions', $data)) {
@ -169,7 +171,8 @@ class RecurrenceUpdateService
'type' => 'repetition_type',
'moment' => 'repetition_moment',
'skip' => 'repetition_skip',
'weekend' => 'weekend',];
'weekend' => 'weekend',
];
foreach ($fields as $field => $column) {
if (array_key_exists($field, $current)) {
$match->$column = $current[$field];