diff --git a/app/Http/Controllers/Transaction/ShowController.php b/app/Http/Controllers/Transaction/ShowController.php index 82d5710481..901e523317 100644 --- a/app/Http/Controllers/Transaction/ShowController.php +++ b/app/Http/Controllers/Transaction/ShowController.php @@ -108,6 +108,7 @@ class ShowController extends Controller if (!Str::contains($transaction['notes'], $search)) { $groupArray['transactions'][$index]['notes'] = e($transaction['notes']); } + $groupArray['transactions'][$index]['tags'] = $this->repository->getTagObjects($groupArray['transactions'][$index]['transaction_journal_id']); } $events = $this->repository->getPiggyEvents($transactionGroup); diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepository.php b/app/Repositories/TransactionGroup/TransactionGroupRepository.php index 066fc03ff7..e1444af843 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php @@ -45,6 +45,7 @@ use FireflyIII\Services\Internal\Update\GroupUpdateService; use FireflyIII\Support\NullArrayObject; use FireflyIII\User; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Support\Collection; use Log; /** @@ -468,4 +469,15 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface return $return; } + + /** + * @inheritDoc + */ + public function getTagObjects(int $journalId): Collection + { + /** @var TransactionJournal $journal */ + $journal = $this->user->transactionJournals()->find($journalId); + + return $journal->tags()->get(); + } } diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php b/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php index 014f49e7d8..2bf572db27 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php @@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\TransactionGroup; use FireflyIII\Support\NullArrayObject; use FireflyIII\User; +use Illuminate\Support\Collection; /** * Interface TransactionGroupRepositoryInterface @@ -122,6 +123,15 @@ interface TransactionGroupRepositoryInterface */ public function getTags(int $journalId): array; + /** + * Get the tags for a journal (by ID) as Tag objects. + * + * @param int $journalId + * + * @return Collection + */ + public function getTagObjects(int $journalId): Collection; + /** * Set the user. * diff --git a/resources/views/v1/transactions/show.twig b/resources/views/v1/transactions/show.twig index fc6b9810e4..c0b3c81da9 100644 --- a/resources/views/v1/transactions/show.twig +++ b/resources/views/v1/transactions/show.twig @@ -260,8 +260,8 @@