Merge branch 'master' of github.com:domify/registry

This commit is contained in:
Priit Tark 2015-06-03 10:43:27 +03:00
commit 13b60d39ce

View file

@ -395,7 +395,7 @@ class Epp::Domain < Domain
at[:domain_statuses_attributes] += at_add[:domain_statuses_attributes]
if frame.css('registrant').present? && frame.css('registrant').attr('verified').to_s.downcase != 'yes'
registrant_verification_asked!
registrant_verification_asked!
end
self.deliver_emails = true # turn on email delivery for epp
@ -415,7 +415,7 @@ class Epp::Domain < Domain
return false unless valid?
if frame.css('delete').attr('verified').to_s.downcase != 'yes'
registrant_verification_asked!
registrant_verification_asked!
pending_delete!
manage_automatic_statuses
true # aka 1001 pending_delete
@ -550,6 +550,7 @@ class Epp::Domain < Domain
return dt
rescue => _e
add_epp_error('2306', nil, nil, I18n.t('action_failed_due_to_server_error'))
logger.error(e)
raise ActiveRecord::Rollback
end
end