From e87f6ca40e9136d211064f773780368a3f567c60 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 24 Sep 2016 08:55:01 +0200 Subject: [PATCH] Fix some possible NULL values. --- app/Repositories/Account/AccountRepository.php | 4 ++++ app/Support/Steam.php | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 7802ac773c..70c16e3271 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -552,9 +552,13 @@ class AccountRepository implements AccountRepositoryInterface } // remove group by $query->getQuery()->getQuery()->groups = null; + $query->groupBy('aggregate'); // that should do it: $sum = strval($query->sum('destination.amount')); + if (is_null($sum)) { + $sum = '0'; + } $sum = bcmul($sum, '-1'); return $sum; diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 8ffe548cd2..e52eb70118 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -49,7 +49,8 @@ class Steam 'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id' )->where('transaction_journals.date', '<=', $date->format('Y-m-d'))->sum('transactions.amount') ); - $balance = bcadd($balance, $account->virtual_balance); + $virtual = is_null($account->virtual_balance) ? '0' : strval($account->virtual_balance); + $balance = bcadd($balance, $virtual); $cache->store($balance); return $balance; @@ -124,7 +125,8 @@ class Steam ->get(['transaction_journals.date', DB::raw('SUM(`transactions`.`amount`) as `modified`')]); $currentBalance = $startBalance; foreach ($set as $entry) { - $currentBalance = bcadd($currentBalance, $entry->modified); + $modified = is_null($entry->modified) ? '0' : strval($entry->modified); + $currentBalance = bcadd($currentBalance, $modified); $balances[$entry->date] = $currentBalance; }