From 6ab332e4fbaf72a057206138d9d3cb3a7bf8d9ea Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 20 Jul 2023 12:55:45 +0200 Subject: [PATCH] fix: nullpointer --- app/Validation/TransactionValidation.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Validation/TransactionValidation.php b/app/Validation/TransactionValidation.php index 265bc41494..1c22bd17c1 100644 --- a/app/Validation/TransactionValidation.php +++ b/app/Validation/TransactionValidation.php @@ -493,7 +493,8 @@ trait TransactionValidation } /** @var TransactionJournal $journal */ foreach ($transactionGroup->transactionJournals as $journal) { - if ((int)$journal->id === (int)$transaction['transaction_journal_id']) { + $journalId = (int)($transaction['transaction_journal_id'] ?? 0); + if ((int)$journal->id === $journalId) { return $journal->transactions()->where('amount', '<', 0)->first()->account; } } @@ -783,8 +784,8 @@ trait TransactionValidation private function compareAccountData(string $type, array $comparison): bool { return match ($type) { - default => $this->compareAccountDataWithdrawal($comparison), - 'deposit' => $this->compareAccountDataDeposit($comparison), + default => $this->compareAccountDataWithdrawal($comparison), + 'deposit' => $this->compareAccountDataDeposit($comparison), 'transfer' => $this->compareAccountDataTransfer($comparison), }; }