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

This fixes #303

Browse Source
This commit is contained in:
James Cole 2016-09-03 04:54:57 +02:00
parent 2ce5142b06
commit 29af4bd1b9
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,16 +89,23 @@ class AccountRepository implements AccountRepositoryInterface
} }
); );
$query->whereIn('source.account_id', $accountIds); $query->whereIn('source.account_id', $accountIds);
$query->whereNull('source.deleted_at');
} }
// remove group by // remove group by
$query->getQuery()->getQuery()->groups = null; $query->getQuery()->getQuery()->groups = null;
// that should do it: // get id's
$sum = strval($query->sum('source.amount')); $ids = $query->get(['transaction_journals.id'])->pluck('id')->toArray();
$sum = bcmul($sum, '-1');
return $sum; // that should do it:
$sum = $this->user->transactions()
->whereIn('transaction_journal_id', $ids)
->where('amount', '>', '0')
->whereNull('transactions.deleted_at')
->sum('amount');
return strval($sum);
} }
@ -139,7 +146,9 @@ class AccountRepository implements AccountRepositoryInterface
} }
// remove group by // remove group by
$query->getQuery()->getQuery()->groups = null; $query->getQuery()->getQuery()->groups = null;
$ids = $query->get(['transaction_journals.id'])->pluck('id')->toArray();
// get id's
$ids = $query->get(['transaction_journals.id'])->pluck('id')->toArray();
// that should do it: // that should do it:
@ -185,6 +194,7 @@ class AccountRepository implements AccountRepositoryInterface
if (in_array($journal->source_account_id, $accountIds)) { if (in_array($journal->source_account_id, $accountIds)) {
return true; return true;
} }
return false; return false;
} }
); );
@ -370,6 +380,7 @@ class AccountRepository implements AccountRepositoryInterface
if (in_array($journal->destination_account_id, $accountIds)) { if (in_array($journal->destination_account_id, $accountIds)) {
return true; return true;
} }
return false; return false;
} }
); );