Merge branch '116209751-verified_option' into staging

This commit is contained in:
Stas 2016-04-18 18:36:10 +03:00
commit 58d3ed2cf9
2 changed files with 11 additions and 9 deletions

View file

@ -91,7 +91,9 @@ gem 'digidoc_client', '0.2.1'
# epp
gem 'epp', '1.4.2', github: 'internetee/epp'
gem 'epp-xml', '1.0.4' # EIS EPP XMLs
gem 'epp-xml', '1.0.4',
github: 'internetee/epp-xml',
ref: '287fe8705ca2f344ea670b922dd9f08635efc7af' # EIS EPP XMLs
gem 'uuidtools', '2.1.5' # For unique IDs (used by the epp gem)
# que

View file

@ -66,8 +66,9 @@ module Depp
def delete(domain_params)
xml = epp_xml.delete({
name: { value: domain_params[:name] }
}, Depp::Domain.construct_custom_params_hash(domain_params))
name: { value: domain_params[:name] }},
Depp::Domain.construct_custom_params_hash(domain_params),
(domain_params[:verified].present? && 'yes'))
current_user.request(xml)
end
@ -187,12 +188,6 @@ module Depp
}
end
if domain_params[:verified].present?
custom_params[:_anonymus] << {
registrant_verified: { value: 'yes' }
}
end
if domain_params[:reserved_pw].present?
custom_params[:_anonymus] << { reserved: { pw: { value: domain_params[:reserved_pw] } } }
end
@ -223,6 +218,11 @@ module Depp
chg = [{ registrant: { value: domain_params[:registrant] } }]
end
if domain_params[:registrant] != old_domain_params[:registrant]
chg = [{ registrant: { value: domain_params[:registrant] } }] if !domain_params[:verified].present?
chg = [{ registrant: { value: domain_params[:registrant], attrs: { verified: 'yes' } } }] if domain_params[:verified]
end
add_arr = nil if add_arr.none?
rem_arr = nil if rem_arr.none?