From 4fef316dddf0339427b2c121d0b0be18adddd7ed Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 21 Jun 2020 19:16:21 +0200
Subject: [PATCH] Fix more date issues

---
 .../TransactionGroup/TransactionGroupRepository.php        | 2 +-
 app/Support/Steam.php                                      | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepository.php b/app/Repositories/TransactionGroup/TransactionGroupRepository.php
index 98c489b8b7..962b4b8f5f 100644
--- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php
+++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php
@@ -208,7 +208,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
         $return = [];
 
         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);
diff --git a/app/Support/Steam.php b/app/Support/Steam.php
index c3d033aa97..0842414269 100644
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -244,7 +244,8 @@ class Steam
             }
 
             $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');
             $balances[$date] = $currentBalance;
         }
@@ -502,7 +503,9 @@ class Steam
                      ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) AS max_date')]);
 
         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;