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 some possible NULL values.

Browse Source
This commit is contained in:
James Cole
2016-09-24 08:55:01 +02:00
parent 1f34e33d8c
commit e87f6ca40e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Repositories/Account/AccountRepository.php
View File

@@ -552,9 +552,13 @@ class AccountRepository implements AccountRepositoryInterface
} }
// remove group by // remove group by
$query->getQuery()->getQuery()->groups = null; $query->getQuery()->getQuery()->groups = null;
$query->groupBy('aggregate');
// that should do it: // that should do it:
$sum = strval($query->sum('destination.amount')); $sum = strval($query->sum('destination.amount'));
if (is_null($sum)) {
$sum = '0';
}
$sum = bcmul($sum, '-1'); $sum = bcmul($sum, '-1');
return $sum; return $sum;

6
app/Support/Steam.php
View File

@@ -49,7 +49,8 @@ class Steam
'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id' 'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
)->where('transaction_journals.date', '<=', $date->format('Y-m-d'))->sum('transactions.amount') )->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); $cache->store($balance);
return $balance; return $balance;
@@ -124,7 +125,8 @@ class Steam
->get(['transaction_journals.date', DB::raw('SUM(`transactions`.`amount`) as `modified`')]); ->get(['transaction_journals.date', DB::raw('SUM(`transactions`.`amount`) as `modified`')]);
$currentBalance = $startBalance; $currentBalance = $startBalance;
foreach ($set as $entry) { 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; $balances[$entry->date] = $currentBalance;
} }