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

Will now warn about non-existent attachments.

Browse Source
This commit is contained in:
James Cole
2018-11-11 07:03:36 +01:00
parent 7380c5096e
commit edf764aaf4
5 changed files with 79 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,6 @@ use FireflyIII\Factory\TransactionJournalFactory;
use FireflyIII\Factory\TransactionJournalMetaFactory;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Helpers\Filter\InternalTransferFilter;
use FireflyIII\Helpers\Filter\TransferFilter;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\PiggyBankEvent;
@@ -263,6 +262,18 @@ class JournalRepository implements JournalRepositoryInterface
return null;
}
/**
* Return all attachments for journal.
*
* @param TransactionJournal $journal
*
* @return Collection
*/
public function getAttachments(TransactionJournal $journal): Collection
{
return $journal->attachments;
}
/**
* Returns the first positive transaction for the journal. Useful when editing journals.
*
@@ -585,10 +596,10 @@ class JournalRepository implements JournalRepositoryInterface
public function getTransactionsById(array $transactionIds): Collection
{
$journalIds = Transaction::whereIn('id', $transactionIds)->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
$journals = new Collection;
foreach($journalIds as $journalId) {
$journals = new Collection;
foreach ($journalIds as $journalId) {
$result = $this->findNull((int)$journalId);
if(null !== $result) {
if (null !== $result) {
$journals->push($result);
}
}
@@ -600,6 +611,7 @@ class JournalRepository implements JournalRepositoryInterface
//$collector->addFilter(TransferFilter::class);
$collector->setJournals($journals)->withOpposingAccount();
return $collector->getTransactions();
}

10
app/Repositories/Journal/JournalRepositoryInterface.php
View File

@@ -38,6 +38,16 @@ use Illuminate\Support\MessageBag;
*/
interface JournalRepositoryInterface
{
/**
* Return all attachments for journal.
*
* @param TransactionJournal $journal
*
* @return Collection
*/
public function getAttachments(TransactionJournal $journal): Collection;
/** @noinspection MoreThanThreeArgumentsInspection */
/**
* @param TransactionJournal $journal