kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #346

Browse Source
This commit is contained in:
James Cole
2016-10-06 05:26:38 +02:00
parent 5540697dbd
commit 9920504232
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Support/Steam.php
View File

@@ -124,7 +124,7 @@ class Steam
->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->groupBy('transaction_journals.date')
->get(['transaction_journals.date', DB::raw('SUM(`transactions`.`amount`) as `modified`')]);
->get(['transaction_journals.date', DB::raw('SUM(transactions.amount) AS modified')]);
$currentBalance = $startBalance;
foreach ($set as $entry) {
$modified = is_null($entry->modified) ? '0' : strval($entry->modified);
@@ -164,7 +164,7 @@ class Steam
->where('transaction_journals.date', '<=', $date->format('Y-m-d'))
->groupBy('transactions.account_id')
->whereIn('transactions.account_id', $ids)
->get(['transactions.account_id', DB::raw('sum(`transactions`.`amount`) as aggregate')]);
->get(['transactions.account_id', DB::raw('sum(transactions.amount) AS aggregate')]);
$result = [];
foreach ($balances as $entry) {
@@ -191,7 +191,7 @@ class Steam
$set = auth()->user()->transactions()
->whereIn('transactions.account_id', $accounts)
->groupBy(['transactions.account_id', 'transaction_journals.user_id'])
->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) {
$list[intval($entry->account_id)] = new Carbon($entry->max_date);