zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-05 17:28:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '107821878-emails' into staging

Browse source
This commit is contained in:
Stas 2015-11-24 17:05:17 +02:00
commit 89ed513f0f
9 changed files with 49 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/models/domain.rb
View file

@ -241,7 +241,7 @@ class Domain < ActiveRecord::Base
DomainMailer.pending_update_expired_notification_for_new_registrant(id).deliver
end
if domain.pending_delete? || domain.pending_delete_confirmation?
DomainMailer.pending_delete_expired_notification(id).deliver
DomainMailer.pending_delete_expired_notification(id, deliver_emails).deliver
end
domain.clean_pendings!
unless Rails.env.test?
@ -449,8 +449,8 @@ class Domain < ActiveRecord::Base
new_registrant_email = registrant.email
new_registrant_name = registrant.name
DomainMailer.pending_update_request_for_old_registrant(id).deliver
DomainMailer.pending_update_notification_for_new_registrant(id).deliver
DomainMailer.pending_update_request_for_old_registrant(id, deliver_emails).deliver
DomainMailer.pending_update_notification_for_new_registrant(id, deliver_emails).deliver
reload # revert back to original
@ -510,7 +510,7 @@ class Domain < ActiveRecord::Base
pending_delete_confirmation!
save(validate: false) # should check if this did succeed
DomainMailer.pending_deleted(id).deliver
DomainMailer.pending_deleted(id, deliver_emails).deliver
end
def cancel_pending_delete
@ -646,7 +646,7 @@ class Domain < ActiveRecord::Base
registrar.messages.create!(
body: I18n.t('force_delete_set_on_domain', domain: name)
)
DomainMailer.force_delete(id).deliver
DomainMailer.force_delete(id, deliver_emails).deliver
return true
end
false