From aeca5c9134ef2ffd2fc1153b35cd2073c2126dfd Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Sat, 2 May 2015 17:55:28 -0700
Subject: [PATCH] Added country Geo to PostalAddres Info, display alpha code 3
 in output template if present

---
 mantle-usl/service/mantle/party/ContactServices.xml | 8 ++++++--
 mantle-usl/template/party/ContactInfo.html.gstring  | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mantle-usl/service/mantle/party/ContactServices.xml b/mantle-usl/service/mantle/party/ContactServices.xml
index 5a3d67b7..4b959780 100644
--- a/mantle-usl/service/mantle/party/ContactServices.xml
+++ b/mantle-usl/service/mantle/party/ContactServices.xml
@@ -32,6 +32,7 @@ This Work includes contributions authored by David E. Jones, not as a
             <parameter name="postalContactMechPurposeId"/>
             <parameter name="postalAddress" type="EntityValue"/>
             <parameter name="postalAddressStateGeo" type="EntityValue"/>
+            <parameter name="postalAddressCountryGeo" type="EntityValue"/>
             <parameter name="postalAddressGeoPoint" type="EntityValue"/>
             <parameter name="telecomContactMechId"/>
             <parameter name="telecomContactMech" type="EntityValue"/>
@@ -66,6 +67,7 @@ This Work includes contributions authored by David E. Jones, not as a
                     </entity-find-one>
                 </if>
                 <entity-find-related-one value-field="postalAddress" relationship-name="StateProvince#moqui.basic.Geo" to-value-field="postalAddressStateGeo"/>
+                <entity-find-related-one value-field="postalAddress" relationship-name="Country#moqui.basic.Geo" to-value-field="postalAddressCountryGeo"/>
                 <entity-find-related-one value-field="postalAddress" relationship-name="moqui.basic.GeoPoint" to-value-field="postalAddressGeoPoint"/>
             </if>
 
@@ -158,6 +160,7 @@ This Work includes contributions authored by David E. Jones, not as a
                 <parameter name="postalContactMechPurposeId"/>
                 <parameter name="postalContactMechPurpose" type="EntityValue"/>
                 <parameter name="postalAddress" type="EntityValue"/>
+                <parameter name="postalAddressCountryGeo" type="EntityValue"/>
                 <parameter name="postalAddressStateGeo" type="EntityValue"/>
                 <parameter name="postalAddressGeoPoint" type="EntityValue"/>
                 <parameter name="telecomContactMechId"/>
@@ -211,6 +214,7 @@ This Work includes contributions authored by David E. Jones, not as a
                         <field-map field-name="contactMechPurposeId" from="postalPcm.contactMechPurposeId"/>
                     </entity-find-one>
                     <entity-find-related-one value-field="postalAddress" relationship-name="StateProvince#moqui.basic.Geo" to-value-field="postalAddressStateGeo"/>
+                    <entity-find-related-one value-field="postalAddress" relationship-name="Country#moqui.basic.Geo" to-value-field="postalAddressCountryGeo"/>
                     <entity-find-related-one value-field="postalAddress" relationship-name="moqui.basic.GeoPoint" to-value-field="postalAddressGeoPoint"/>
 
                     <if condition="postalAddress.telecomContactMechId">
@@ -231,8 +235,8 @@ This Work includes contributions authored by David E. Jones, not as a
 
                     <set field="postalAddressInfo" from="[postalContactMechId:postalContactMechId, postalContactMech:postalContactMech,
                             postalContactMechPurposeId:postalPcm.contactMechPurposeId, postalContactMechPurpose:postalContactMechPurpose,
-                            postalAddress:postalAddress,
-                            postalAddressStateGeo:postalAddressStateGeo, postalAddressGeoPoint:postalAddressGeoPoint,
+                            postalAddress:postalAddress, postalAddressStateGeo:postalAddressStateGeo,
+                            postalAddressCountryGeo:postalAddressCountryGeo, postalAddressGeoPoint:postalAddressGeoPoint,
                             telecomContactMechId:telecomContactMechId, telecomContactMech:telecomContactMech, telecomNumber:telecomNumber,
                             emailContactMechId:emailContactMechId, emailContactMech:emailContactMech, emailAddress:emailContactMech?.infoString]"/>
                     <script>postalAddressList.add(postalAddressInfo)</script>
diff --git a/mantle-usl/template/party/ContactInfo.html.gstring b/mantle-usl/template/party/ContactInfo.html.gstring
index 219a8cc2..f649bafc 100644
--- a/mantle-usl/template/party/ContactInfo.html.gstring
+++ b/mantle-usl/template/party/ContactInfo.html.gstring
@@ -2,6 +2,6 @@ ${contactInfo?.postalAddress?.toName ? '<p>To: ' + contactInfo.postalAddress.toN
 ${contactInfo?.postalAddress?.attnName ? '<p>Attn: ' + contactInfo.postalAddress.attnName + '</p>' : ''}
 ${contactInfo?.postalAddress?.address1 ? '<p>' + contactInfo.postalAddress.address1 + (contactInfo.postalAddress.unitNumber ? ' #' + contactInfo.postalAddress.unitNumber : '') + '</p>' : ''}
 ${contactInfo?.postalAddress?.address2 ? '<p>' + contactInfo.postalAddress.address2 + '</p>' : ''}
-${contactInfo?.postalAddress ? '<p>' + (contactInfo.postalAddress.city ?: '') + (contactInfo.postalAddressStateGeo?.geoCodeAlpha2 ? ', ' + contactInfo.postalAddressStateGeo.geoCodeAlpha2 : '') + ' ' + (contactInfo.postalAddress.postalCode ?: '') + (contactInfo.postalAddress.postalCodeExt ? '-' + contactInfo.postalAddress.postalCodeExt : '') + '</p>' : ''}
+${contactInfo?.postalAddress ? '<p>' + (contactInfo.postalAddress.city ?: '') + (contactInfo.postalAddressStateGeo?.geoCodeAlpha2 ? ', ' + contactInfo.postalAddressStateGeo.geoCodeAlpha2 : '') + ' ' + (contactInfo.postalAddress.postalCode ?: '') + (contactInfo.postalAddress.postalCodeExt ? '-' + contactInfo.postalAddress.postalCodeExt : '') + (contactInfo.postalAddressCountryGeo?.geoCodeAlpha3 ? ' ' + contactInfo.postalAddressCountryGeo.geoCodeAlpha3 : '') + '</p>' : ''}
 ${contactInfo?.telecomNumber ? '<p>' + (contactInfo.telecomNumber.countryCode ? contactInfo.telecomNumber.countryCode + '-' : '') + (contactInfo.telecomNumber.areaCode ? contactInfo.telecomNumber.areaCode + '-' : '') + (contactInfo.telecomNumber.contactNumber ?: '') + '</p>' : ''}
 ${contactInfo?.emailAddress ? '<p>' + contactInfo.emailAddress + '</p>' : ''}