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

Convert raw XORs to a construct compatible with Laravel's query builder

Browse Source
This commit is contained in:
Sander Kleykens
2016-10-06 21:18:43 +02:00
parent 9920504232
commit 5c239c91db
4 changed files with 81 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Helpers/Report/ReportHelper.php
View File

@@ -257,9 +257,19 @@ class ReportHelper implements ReportHelperInterface
->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->where(
function (Builder $q) use ($ids) {
$q->whereIn('source.account_id', $ids)
->whereIn('destination.account_id', $ids, 'xor');
// source.account_id in accountIds XOR destination.account_id in accountIds
function (Builder $sourceXorDestinationQuery) use ($ids) {
$sourceXorDestinationQuery->where(
function (Builder $inSourceButNotDestinationQuery) use ($ids) {
$inSourceButNotDestinationQuery->whereIn('source.account_id', $ids)
->whereNotIn('destination.account_id', $ids);
}
)->orWhere(
function (Builder $inDestinationButNotSourceQuery) use ($ids) {
$inDestinationButNotSourceQuery->whereIn('destination.account_id', $ids)
->whereNotIn('source.account_id', $ids);
}
);
}
)
->get(['tags.id', 'tags.tag', 'transaction_journals.id as journal_id', 'destination.amount']);