gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-22 11:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update some queries.

Browse Source
This commit is contained in:
James Cole
2015-12-13 20:39:26 +01:00
parent 80edd47d36
commit ea9af8366d
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,33 +123,19 @@ class ReportQuery implements ReportQueryInterface
} }
// OR is a deposit // OR is a deposit
// OR is a transfer FROM a shared account to NOT a shared account. // OR any transfer TO the accounts in $accounts, not FROM any of the accounts in $accounts.
//
// New idea: from the perspective of a shared account,
// a transfer from a not-shared account is income!
// so:
// OR is a transfer from NOT a shared account to a shared account.
$query->where( $query->where(
function (Builder $query) { function (Builder $query) use ($ids) {
$query->where( $query->where(
function (Builder $q) { function (Builder $q) {
$q->where('transaction_types.type', TransactionType::DEPOSIT); $q->where('transaction_types.type', TransactionType::DEPOSIT);
} }
); );
$query->orWhere( $query->orWhere(
function (Builder $q) { function (Builder $q) use ($ids) {
$q->where('transaction_types.type', TransactionType::TRANSFER); $q->where('transaction_types.type', TransactionType::TRANSFER);
$q->where('acm_from.data', '=', '"sharedAsset"'); $q->whereIn('ac_from.id',$ids);
$q->where('acm_to.data', '!=', '"sharedAsset"'); $q->whereNotIn('ac_to.id', $ids);
}
);
$query->orWhere(
function (Builder $q) {
$q->where('transaction_types.type', TransactionType::TRANSFER);
$q->where('acm_from.data', '!=', '"sharedAsset"');
$q->where('acm_to.data', '=', '"sharedAsset"');
} }
); );
} }
@@ -210,7 +196,7 @@ class ReportQuery implements ReportQueryInterface
$query = $this->queryJournalsWithTransactions($start, $end); $query = $this->queryJournalsWithTransactions($start, $end);
// withdrawals from any account are an expense. // withdrawals from any account are an expense.
// transfers away, to an account not in the list, but shared, are an expense. // transfers away, from an account in the list, to an account not in the list, are an expense.
$query->where( $query->where(
function (Builder $query) use ($ids) { function (Builder $query) use ($ids) {
@@ -222,8 +208,8 @@ class ReportQuery implements ReportQueryInterface
$query->orWhere( $query->orWhere(
function (Builder $q) use ($ids) { function (Builder $q) use ($ids) {
$q->where('transaction_types.type', TransactionType::TRANSFER); $q->where('transaction_types.type', TransactionType::TRANSFER);
$q->whereIn('ac_from.id', $ids);
$q->whereNotIn('ac_to.id', $ids); $q->whereNotIn('ac_to.id', $ids);
$q->where('acm_to.data', '=', '"sharedAsset"');
} }
); );
} }