Merge pull request #131 from internetee/117702653-wrong_registrar_name

117702653-csv_fix
This commit is contained in:
Timo Võhmar 2016-05-10 16:35:03 +03:00
commit e722880500

View file

@ -6,7 +6,6 @@ class AccountActivity < ActiveRecord::Base
belongs_to :bank_transaction
belongs_to :invoice
attr_accessor :registrar
CREATE = 'create'
RENEW = 'renew'
@ -24,14 +23,15 @@ class AccountActivity < ActiveRecord::Base
end
def to_csv
attributes = %w(registrar description activity_type created_at sum)
attributes = %w(description activity_type created_at sum)
CSV.generate(headers: true) do |csv|
csv << %w(registrar description activity_type receipt_date sum)
all.each do |x| # rubocop:disable Rails/FindEach
x.registrar = Registrar.find(x.account_id).try(:code)
csv << attributes.map { |attr| x.send(attr) }
attrs = [x.account.registrar.try(:code)]
attrs += attributes.map { |attr| x.send(attr) }
csv << attrs
end
end
end