IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-28 09:51:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fine tune income.

Browse Source
This commit is contained in:
James Cole 2015-03-10 20:00:43 +01:00
parent e5c19b7562
commit 2396b75e3c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Helpers/Report/ReportQuery.php
View File

@ -479,6 +479,8 @@ class ReportQuery implements ReportQueryInterface
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id'); ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
if ($showSharedReports === false) { if ($showSharedReports === false) {
// show queries where transfer type is deposit, and its not to a shared account
// or where its a transfer and its from a shared account (both count as incomes)
$query->where( $query->where(
function ($query) { function ($query) {
$query->where( $query->where(
@ -495,6 +497,9 @@ class ReportQuery implements ReportQueryInterface
); );
} }
); );
} else {
// any deposit goes:
$query->where('transaction_types.type', 'Deposit');
} }
$query->before($end)->after($start) $query->before($end)->after($start)
->where('transaction_journals.user_id', Auth::user()->id) ->where('transaction_journals.user_id', Auth::user()->id)