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 #151

Browse Source
This commit is contained in:
James Cole
2016-03-12 07:44:20 +01:00
parent 4cded0bf57
commit 1aea4045a3
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -472,13 +472,15 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
}
/**
* @param Carbon $start
* @param Carbon $end
* @param Collection $accounts
* @param Carbon $start
* @param Carbon $end
*
* @return string
*/
public function getWithoutBudgetSum(Carbon $start, Carbon $end): string
public function getWithoutBudgetSum(Collection $accounts, Carbon $start, Carbon $end): string
{
$ids = $accounts->pluck('id')->toArray();
$entry = $this->user
->transactionjournals()
->whereNotIn(
@@ -499,6 +501,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
$join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '<', 0);
}
)
->whereIn('transactions.account_id', $ids)
->transactionTypes([TransactionType::WITHDRAWAL])
->first([DB::raw('SUM(`transactions`.`amount`) as `journalAmount`')]);
if (is_null($entry->journalAmount)) {