Merge branch '109367018-email-pending-update-mention-old-registrant' into staging

This commit is contained in:
Matt Farnsworth 2015-12-03 16:53:50 +02:00
commit 75e7246ef1

View file

@ -439,7 +439,6 @@ class Domain < ActiveRecord::Base
end
def pending_update!
old_registrant_id = registrant_id
return true if pending_update?
self.epp_pending_update = true # for epp
@ -451,8 +450,8 @@ class Domain < ActiveRecord::Base
new_registrant_email = registrant.email
new_registrant_name = registrant.name
DomainMailer.pending_update_request_for_old_registrant(id, old_registrant_id, deliver_emails).deliver
DomainMailer.pending_update_notification_for_new_registrant(id, old_registrant_id, deliver_emails).deliver
DomainMailer.pending_update_request_for_old_registrant(id, registrant_id_was, deliver_emails).deliver
DomainMailer.pending_update_notification_for_new_registrant(id, registrant_id_was, deliver_emails).deliver
reload # revert back to original