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

Expanded account view.

Browse Source
This commit is contained in:
James Cole
2015-03-02 15:27:36 +01:00
parent edda470bf8
commit 08ca3c89d3
5 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/AccountController.php
View File

@@ -12,6 +12,7 @@ use Input;
use Redirect;
use Session;
use View;
use Steam;
/**
* Class AccountController
@@ -124,6 +125,22 @@ class AccountController extends Controller
}]
)->accountTypeIn($types)->get(['accounts.*']);
// last activity:
$accounts->each(
function (Account $account) {
$lastTransaction = $account->transactions()->leftJoin(
'transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id'
)->orderBy('transaction_journals.date', 'DESC')->first(['transactions.*', 'transaction_journals.date']);
if ($lastTransaction) {
$account->lastActivityDate = $lastTransaction->transactionjournal->date;
} else {
$account->lastActivityDate = null;
}
$account->startBalance = Steam::balance($account, Session::get('start'));
$account->endBalance = Steam::balance($account, Session::get('end'));
}
);
return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'accounts'));
}

4
app/Http/Controllers/ReportController.php
View File

@@ -10,7 +10,7 @@ use FireflyIII\Models\Account;
use Illuminate\Database\Query\JoinClause;
use Steam;
use View;
use Session;
/**
* Class ReportController
*
@@ -115,7 +115,7 @@ class ReportController extends Controller
*/
public function index(ReportHelperInterface $helper)
{
$start = $helper->firstDate();
$start = Session::get('first');
$months = $helper->listOfMonths($start);
$years = $helper->listOfYears($start);
$title = 'Reports';