kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix for #1825

Browse Source
This commit is contained in:
James Cole
2018-10-27 05:10:49 +02:00
parent 749d373c95
commit 970cc91938
3 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Repositories/Journal/JournalRepository.php
View File

@@ -27,6 +27,8 @@ use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\TransactionJournalFactory;
use FireflyIII\Factory\TransactionJournalMetaFactory;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Filter\TransferFilter;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\PiggyBankEvent;
@@ -581,14 +583,21 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function getTransactionsById(array $transactionIds): Collection
{
$set = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->whereIn('transactions.id', $transactionIds)
->where('transaction_journals.user_id', $this->user->id)
->whereNull('transaction_journals.deleted_at')
->whereNull('transactions.deleted_at')
->get(['transactions.*']);
$journalIds = Transaction::whereIn('id', $transactionIds)->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
$journals = new Collection;
foreach($journalIds as $journalId) {
$result = $this->findNull((int)$journalId);
if(null !== $result) {
$journals->push($result);
}
}
/** @var TransactionCollectorInterface $collector */
$collector = app(TransactionCollectorInterface::class);
$collector->setUser($this->user);
$collector->addFilter(TransferFilter::class);
return $set;
$collector->setJournals($journals)->withOpposingAccount();
return $collector->getTransactions();
}
/**