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

Fix more date issues

Browse Source
This commit is contained in:
James Cole 2020-06-21 19:16:21 +02:00
parent 7196ac3ec9
commit 4fef316ddd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Repositories/TransactionGroup/TransactionGroupRepository.php
View File

@ -208,7 +208,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
$return = []; $return = [];
foreach ($query as $row) { foreach ($query as $row) {
$return[$row->name] = new Carbon(json_decode($row->data)); $return[$row->name] = new Carbon(json_decode($row->data, true, 512, JSON_THROW_ON_ERROR));
} }
return new NullArrayObject($return); return new NullArrayObject($return);

7
app/Support/Steam.php
View File

@ -244,7 +244,8 @@ class Steam
} }
$currentBalance = bcadd($currentBalance, $amount); $currentBalance = bcadd($currentBalance, $amount);
$carbon = new Carbon($entry->date); $carbon = new Carbon($entry->date, 'UTC');
$carbon->setTimezone(env('TZ'));
$date = $carbon->format('Y-m-d'); $date = $carbon->format('Y-m-d');
$balances[$date] = $currentBalance; $balances[$date] = $currentBalance;
} }
@ -502,7 +503,9 @@ class Steam
->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) AS max_date')]); ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) AS max_date')]);
foreach ($set as $entry) { foreach ($set as $entry) {
$list[(int)$entry->account_id] = new Carbon($entry->max_date); $date = new Carbon($entry->max_date,'UTC');
$date->setTimezone(env('TZ'));
$list[(int)$entry->account_id] = $date;
} }
return $list; return $list;