kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-26 05:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Add timezone to date objects

Browse Source
This commit is contained in:
James Cole
2024-11-06 11:57:12 +01:00
parent 038790a5d6
commit 7af9dce33b
22 changed files with 169 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Services/Internal/Update/BillUpdateService.php
View File

@@ -145,7 +145,8 @@ class BillUpdateService
$bill->amount_max = $data['amount_max'];
}
if (array_key_exists('date', $data) && '' !== (string)$data['date']) {
$bill->date = $data['date'];
$bill->date = $data['date'];
$bill->date_tz = $data['date']->format('e');
}
if (array_key_exists('repeat_freq', $data) && '' !== (string)$data['repeat_freq']) {
$bill->repeat_freq = $data['repeat_freq'];
@@ -157,10 +158,12 @@ class BillUpdateService
$bill->active = $data['active'];
}
if (array_key_exists('end_date', $data)) {
$bill->end_date = $data['end_date'];
$bill->end_date = $data['end_date'];
$bill->end_date_tz = $data['end_date']->format('e');
}
if (array_key_exists('extension_date', $data)) {
$bill->extension_date = $data['extension_date'];
$bill->extension_date = $data['extension_date'];
$bill->extension_date_tz = $data['extension_date']->format('e');
}
$bill->match = 'EMPTY';

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

@@ -65,9 +65,11 @@ class RecurrenceUpdateService
}
if (array_key_exists('first_date', $info)) {
$recurrence->first_date = $info['first_date'];
$recurrence->first_date_tz = $info['first_date']?->format('e');
}
if (array_key_exists('repeat_until', $info)) {
$recurrence->repeat_until = $info['repeat_until'];
$recurrence->repeat_until_tz = $info['repeat_until']?->format('e');
$recurrence->repetitions = 0;
}
if (array_key_exists('nr_of_repetitions', $info)) {