diff --git a/app/models/bank_transaction.rb b/app/models/bank_transaction.rb index 5b4f30adf..ae4fbf51b 100644 --- a/app/models/bank_transaction.rb +++ b/app/models/bank_transaction.rb @@ -59,8 +59,7 @@ class BankTransaction < ApplicationRecord end invoice = Invoice.find_by(number: invoice_no) - errors.add(:base, I18n.t('invoice_was_not_found')) unless invoice - validate_invoice_data(invoice) if invoice + validate_invoice_data(invoice) return if errors.any? create_internal_payment_record(channel: (manual ? 'admin_payment' : nil), invoice: invoice, @@ -68,6 +67,11 @@ class BankTransaction < ApplicationRecord end def validate_invoice_data(invoice) + unless invoice + errors.add(:base, I18n.t('invoice_was_not_found')) + return + end + if invoice.paid? errors.add(:base, I18n.t('invoice_is_already_binded')) return