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

Code cleanup [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-05-23 09:09:25 +02:00
parent ff3c9676b5
commit 7a20835571
2 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Repositories/Budget/BudgetRepository.php
View File

@@ -250,9 +250,8 @@ class BudgetRepository implements BudgetRepositoryInterface
)
->after($start)
->before($end)
->lessThan(0)
->transactionTypes(['Withdrawal'])
->sum('transactions.amount');
->get(['transaction_journals.*'])->sum('amount');
return floatval($noBudgetSet) * -1;
}
@@ -269,13 +268,12 @@ class BudgetRepository implements BudgetRepositoryInterface
{
if ($shared === true) {
// get everything:
$sum = floatval($budget->transactionjournals()->before($end)->after($start)->lessThan(0)->get(['transaction_journals.*'])->sum('amount'));
$sum = floatval($budget->transactionjournals()->before($end)->after($start)->get(['transaction_journals.*'])->sum('amount'));
} else {
// get all journals in this month where the asset account is NOT shared.
$sum = $budget->transactionjournals()
->before($end)
->after($start)
->lessThan(0)
->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
->leftJoin(
'account_meta', function (JoinClause $join) {