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

Experimental count thing.

Browse Source
This commit is contained in:
James Cole 2015-05-23 17:38:16 +02:00
parent 5c55fa5fbb
commit 422f429725
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Support/Steam.php
View File

@ -34,20 +34,21 @@ class Steam
$firstDate = is_null($firstDateObject) ? clone $date : new Carbon($firstDateObject->date); $firstDate = is_null($firstDateObject) ? clone $date : new Carbon($firstDateObject->date);
$date = $date < $firstDate ? $firstDate : $date; $date = $date < $firstDate ? $firstDate : $date;
bcscale(2);
$set = $account->transactions()->leftJoin( $set = $account->transactions()->leftJoin(
'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'))->get(['transactions.*']); )->where('transaction_journals.date', '<=', $date->format('Y-m-d'))->get(['transactions.*']);
$balance = 0; $balance = '0';
foreach($set as $entry) { foreach ($set as $entry) {
$balance += $entry->amount; $balance = bcadd($balance, $entry->amount);
} }
if (!$ignoreVirtualBalance) { if (!$ignoreVirtualBalance) {
$balance += floatval($account->virtual_balance); $balance = bcadd($balance, $account->virtual_balance);
//$balance += floatval($account->virtual_balance);
} }
return $balance; return round($balance, 2);
} }
/** /**