Merge pull request #37 from internetee/109163582-contact-filter

109163582 contact filter
This commit is contained in:
Timo Võhmar 2015-12-15 14:32:38 +02:00
commit fbe73c64b2
6 changed files with 240 additions and 30 deletions

View file

@ -203,6 +203,21 @@ class Contact < ActiveRecord::Base
['DeleteProhibited', SERVER_DELETE_PROHIBITED]
]
end
def to_csv
CSV.generate do |csv|
csv << column_names
all.each do |contact|
csv << contact.attributes.values_at(*column_names)
end
end
end
def pdf(html)
kit = PDFKit.new(html)
kit.to_pdf
end
end
def roid

View file

@ -241,7 +241,7 @@ class Domain < ActiveRecord::Base
DomainMailer.pending_update_expired_notification_for_new_registrant(domain.id).deliver
end
if domain.pending_delete? || domain.pending_delete_confirmation?
DomainMailer.pending_delete_expired_notification(domain.id, deliver_emails).deliver
DomainMailer.pending_delete_expired_notification(domain.id, true).deliver
end
domain.clean_pendings!
unless Rails.env.test?