kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-17 23:28:20 +00:00
Code Issues Projects Releases Wiki Activity

Stuff for recurring transactions [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-08-07 07:44:37 +02:00
parent 23d69c0dd9
commit cdd5a6c225
19 changed files with 523 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/lib/Firefly/Helper/Controllers/Budget.php
View File

@@ -134,15 +134,23 @@ class Budget implements BudgetInterface
}
$query = $budget->transactionjournals()->with(
'transactions', 'transactions.account', 'components', 'transactiontype',
'transactions.account.accounttype'
)->whereNotIn(
'transaction_journals.id', $inRepetition
if (count($inRepetition) > 0) {
$query = $budget->transactionjournals()->with(
'transactions', 'transactions.account', 'components', 'transactiontype',
'transactions.account.accounttype'
)->whereNotIn(
'transaction_journals.id', $inRepetition
)->orderBy('date', 'DESC')->orderBy(
'transaction_journals.id', 'DESC'
);
} else {
$query = $budget->transactionjournals()->with(
'transactions', 'transactions.account', 'components', 'transactiontype',
'transactions.account.accounttype'
)->orderBy('date', 'DESC')->orderBy(
'transaction_journals.id', 'DESC'
);
'transaction_journals.id', 'DESC'
);
}
// build paginator:
$perPage = 25;