From b5f095dd9166cedc6e796b69ca5509ef6310ec75 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 9 Jan 2022 07:15:30 +0100 Subject: [PATCH] Fix #5510 --- .../TransactionGroup/TransactionGroupRepository.php | 4 +++- resources/views/v1/transactions/show.twig | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepository.php b/app/Repositories/TransactionGroup/TransactionGroupRepository.php index 0c17708cc1..5a8c8037e7 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php @@ -141,7 +141,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface ) ->with(['source', 'destination', 'source.transactions']) ->leftJoin('link_types', 'link_types.id', '=', 'journal_links.link_type_id') - ->get(['journal_links.*', 'link_types.inward', 'link_types.outward']); + ->get(['journal_links.*', 'link_types.inward', 'link_types.outward', 'link_types.editable']); /** @var TransactionJournalLink $entry */ foreach ($set as $entry) { $journalId = in_array($entry->source_id, $journals, true) ? $entry->source_id : $entry->destination_id; @@ -155,6 +155,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface 'link' => $entry->outward, 'group' => $entry->destination->transaction_group_id, 'description' => $entry->destination->description, + 'editable' => 1===$entry->editable, 'amount' => $amount, 'foreign_amount' => $foreignAmount, ]; @@ -167,6 +168,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface 'link' => $entry->inward, 'group' => $entry->source->transaction_group_id, 'description' => $entry->source->description, + 'editable' => 1===$entry->editable, 'amount' => $amount, 'foreign_amount' => $foreignAmount, ]; diff --git a/resources/views/v1/transactions/show.twig b/resources/views/v1/transactions/show.twig index ce50940d90..2df8c22d88 100644 --- a/resources/views/v1/transactions/show.twig +++ b/resources/views/v1/transactions/show.twig @@ -362,7 +362,13 @@ - {{ trans('firefly.'~link.link) }} " + {% if link.editable %} + {{ link.link }} + {% else %} + {{ trans('firefly.'~link.link) }} + {% endif %} + "{{ link.description }}" ({{ link.amount|raw }})