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

First full transaction list (again) and removed some google table references.

Browse Source
This commit is contained in:
James Cole
2014-11-14 09:34:53 +01:00
parent a58a560bbb
commit 0530c0402c
7 changed files with 122 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/lib/FireflyIII/Database/Account.php
View File

@@ -483,5 +483,25 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
}
public function getTransactionJournals(\Account $account, $limit = 50)
{
$start = \Session::get('start');
$end = \Session::get('end');
$offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $limit : 0;
$set = $this->getUser()->transactionJournals()->withRelevantData()->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.account_id', $account->id)->take($limit)->offset($offset)->before($end)->after($start)->orderBy('date', 'DESC')
->get(['transaction_journals.*']);
$count = $this->getUser()->transactionJournals()->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->before($end)->after($start)->orderBy('date', 'DESC')->where('transactions.account_id', $account->id)->count();
$items = [];
foreach ($set as $entry) {
$items[] = $entry;
}
return \Paginator::make($items, $count, $limit);
}
}