From c9301b8070ac1f3527731579cce4a501826c5bd1 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Tue, 10 Mar 2015 14:52:45 +0200 Subject: [PATCH] Fixed contact info xml output --- .../epp/contacts/_postal_info.xml.builder | 13 ------------ app/views/epp/contacts/info.xml.builder | 20 +++++++++++++++---- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/app/views/epp/contacts/_postal_info.xml.builder b/app/views/epp/contacts/_postal_info.xml.builder index f84f177c9..e69de29bb 100644 --- a/app/views/epp/contacts/_postal_info.xml.builder +++ b/app/views/epp/contacts/_postal_info.xml.builder @@ -1,13 +0,0 @@ -xml.tag!('contact:postalInfo', type: 'int') do - xml.tag!('contact:name', @contact.name) #if @disclosure.try(:[], :name) || @owner - xml.tag!('contact:org', @contact.org_name) #if @disclosure.try(:[], :org_name) || @owner - # if @disclosure.try(:addr) || @owner - xml.tag!('contact:addr') do - xml.tag!('contact:street', @contact.street) - xml.tag!('contact:city', @contact.city) - xml.tag!('contact:pc', @contact.zip) - xml.tag!('contact:sp', @contact.state) - xml.tag!('contact:cc', @contact.country_code) - end - # end -end diff --git a/app/views/epp/contacts/info.xml.builder b/app/views/epp/contacts/info.xml.builder index 8e2bf362e..2cd7114c5 100644 --- a/app/views/epp/contacts/info.xml.builder +++ b/app/views/epp/contacts/info.xml.builder @@ -7,10 +7,22 @@ xml.epp_head do xml.resData do xml.tag!('contact:infData', 'xmlns:contact' => 'urn:ietf:params:xml:ns:contact-1.0') do xml.tag!('contact:id', @contact.code) - xml << render('/epp/contacts/postal_info') - xml.tag!('contact:voice', @contact.phone) #if @disclosure.try(:phone) || @owner - xml.tag!('contact:fax', @contact.fax) #if @disclosure.try(:fax) || @owner - xml.tag!('contact:email', @contact.email) #if @disclosure.try(:email) || @owner + xml.tag!('contact:voice', @contact.phone) + xml.tag!('contact:email', @contact.email) + xml.tag!('contact:fax', @contact.fax) if @contact.fax.present? + + xml.tag!('contact:postalInfo', type: 'int') do + xml.tag!('contact:name', @contact.name) + xml.tag!('contact:org', @contact.org_name) if @contact.org_name.present? + xml.tag!('contact:addr') do + xml.tag!('contact:street', @contact.street) + xml.tag!('contact:city', @contact.city) + xml.tag!('contact:pc', @contact.zip) + xml.tag!('contact:sp', @contact.state) + xml.tag!('contact:cc', @contact.country_code) + end + end + xml.tag!('contact:clID', @contact.registrar.try(:name)) xml.tag!('contact:crID', @contact.creator.try(:registrar)) xml.tag!('contact:crDate', @contact.created_at)