From c4dbc2bc7fcd6a3dfadbd836630815ef85e0ba55 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 1 Oct 2021 04:55:33 +0200 Subject: [PATCH] Fix #5145 --- app/Factory/TransactionJournalFactory.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index 8c624acfeb..8002dea61a 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -342,7 +342,13 @@ class TransactionJournalFactory } if (null !== $result) { Log::warning(sprintf('Found a duplicate in errorIfDuplicate because hash %s is not unique!', $hash)); - throw new DuplicateTransactionException(sprintf('Duplicate of transaction #%d.', $result->transactionJournal->transaction_group_id)); + $journal = $result->transactionJournal()->withTrashed()->first(); + $group = $journal?->transactionGroup()->withTrashed()->first(); + $groupId = $group?->id; + if (null === $group) { + $groupId = 0; + } + throw new DuplicateTransactionException(sprintf('Duplicate of transaction #%d.', $groupId)); } }