From 101187687279abbc5d03e09fd991f9268088f0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Wed, 12 Feb 2020 17:49:41 +0200 Subject: [PATCH] Link bank transaction with AccountActivity --- app/models/bank_transaction.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/bank_transaction.rb b/app/models/bank_transaction.rb index ca41e8840..f53a286ba 100644 --- a/app/models/bank_transaction.rb +++ b/app/models/bank_transaction.rb @@ -59,9 +59,7 @@ class BankTransaction < ApplicationRecord if create_activity(registrar, invoice) payment_order.paid! else - payment_order.failed! - payment_order.notes = 'Failed to create activity' - payment_order.save! + payment_order.update(notes: 'Failed to create activity', status: 'failed') end end @@ -95,10 +93,12 @@ class BankTransaction < ApplicationRecord end def create_activity(registrar, invoice) - activity = AccountActivity.new(account: registrar.cash_account, - invoice: invoice, sum: invoice.subtotal, - currency: currency, description: description, - activity_type: AccountActivity::ADD_CREDIT) + activity = AccountActivity.new( + account: registrar.cash_account, bank_transaction: self, + invoice: invoice, sum: invoice.subtotal, + currency: currency, description: description, + activity_type: AccountActivity::ADD_CREDIT + ) if activity.save reset_pending_registrar_balance_reload true