Author: ashish
Date: Tue Dec 1 09:58:06 2009
New Revision: 885707
URL: http://svn.apache.org/viewvc?rev=885707&view=rev
Log:
Patch from Awdesh Singh Parihar (Thanks for the contribution!).
Show geoName instead of geoId in order confirmation pdf and mail content.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl?rev=885707&r1=885706&r2=885707&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl
Tue Dec 1 09:58:06 2009
@@ -39,8 +39,14 @@
<#if
postalAddress.attnName?has_content><fo:block>${postalAddress.attnName?if_exists}</fo:block></#if>
<fo:block>${postalAddress.address1?if_exists}</fo:block>
<#if
postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if>
- <fo:block>${postalAddress.city?if_exists}<#if
postalAddress.stateProvinceGeoId?has_content>,
${postalAddress.stateProvinceGeoId} </#if><#if
postalAddress.postalCode?has_content>${postalAddress.postalCode}</#if></fo:block>
- <fo:block>${postalAddress.countryGeoId?if_exists}</fo:block>
+ <fo:block>
+ <#assign stateGeo = (delegator.findOne("Geo", {"geoId",
postalAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
+ ${postalAddress.city}<#if stateGeo?has_content>,
${stateGeo.geoName?if_exists}</#if> ${postalAddress.postalCode?if_exists}
+ </fo:block>
+ <fo:block>
+ <#assign countryGeo = (delegator.findOne("Geo", {"geoId",
postalAddress.countryGeoId?if_exists}, false))?if_exists />
+ <#if
countryGeo?has_content>${countryGeo.geoName?if_exists}</#if>
+ </fo:block>
</#if>
</fo:table-cell>
<#else>
@@ -69,7 +75,14 @@
<#if
postalAddress.attnName?has_content><fo:block>${postalAddress.attnName?if_exists}</fo:block></#if>
<fo:block>${postalAddress.address1?if_exists}</fo:block>
<#if
postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if>
- <fo:block>${postalAddress.city?if_exists}<#if
postalAddress.stateProvinceGeoId?has_content>,
${postalAddress.stateProvinceGeoId} </#if><#if
postalAddress.postalCode?has_content>${postalAddress.postalCode}</#if></fo:block>
+ <fo:block>
+ <#assign stateGeo = (delegator.findOne("Geo", {"geoId",
postalAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
+ ${postalAddress.city}<#if stateGeo?has_content>,
${stateGeo.geoName?if_exists}</#if> ${postalAddress.postalCode?if_exists}
+ </fo:block>
+ <fo:block>
+ <#assign countryGeo = (delegator.findOne("Geo", {"geoId",
postalAddress.countryGeoId?if_exists}, false))?if_exists />
+ <#if
countryGeo?has_content>${countryGeo.geoName?if_exists}</#if>
+ </fo:block>
</#if>
</fo:table-cell>
</#if>
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl?rev=885707&r1=885706&r2=885707&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
Tue Dec 1 09:58:06 2009
@@ -92,8 +92,10 @@
<#if
paymentAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}:
${paymentAddress.attnName}</#if>
${paymentAddress.address1}
<#if
paymentAddress.address2?has_content>${paymentAddress.address2}</#if>
- ${paymentAddress.city}<#if
paymentAddress.stateProvinceGeoId?has_content>,
${paymentAddress.stateProvinceGeoId}</#if>
${paymentAddress.postalCode?if_exists}
- ${paymentAddress.countryGeoId}
+ <#assign paymentStateGeo = (delegator.findOne("Geo", {"geoId",
paymentAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
+ ${paymentAddress.city}<#if paymentStateGeo?has_content>,
${paymentStateGeo.geoName?if_exists}</#if>
${paymentAddress.postalCode?if_exists}
+ <#assign paymentCountryGeo = (delegator.findOne("Geo", {"geoId",
paymentAddress.countryGeoId?if_exists}, false))?if_exists />
+ <#if
paymentCountryGeo?has_content>${paymentCountryGeo.geoName?if_exists}</#if>
${uiLabelMap.EcommerceBeSureToIncludeYourOrderNb}
</#if>
<#else>
@@ -193,9 +195,10 @@
<#if
pmBillingAddress.address2?has_content>${pmBillingAddress.address2}</#if>
</li>
<li>
- ${pmBillingAddress.city}<#if
pmBillingAddress.stateProvinceGeoId?has_content>,
${pmBillingAddress.stateProvinceGeoId} </#if>
- ${pmBillingAddress.postalCode?if_exists}
- ${pmBillingAddress.countryGeoId?if_exists}
+ <#assign pmBillingStateGeo = (delegator.findOne("Geo",
{"geoId", pmBillingAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
+ ${pmBillingAddress.city}<#if pmBillingStateGeo?has_content>,
${ pmBillingStateGeo.geoName?if_exists}</#if>
${pmBillingAddress.postalCode?if_exists}
+ <#assign pmBillingCountryGeo = (delegator.findOne("Geo",
{"geoId", pmBillingAddress.countryGeoId?if_exists}, false))?if_exists />
+ <#if
pmBillingCountryGeo?has_content>${pmBillingCountryGeo.geoName?if_exists}</#if>
</li>
</ul>
</li>
@@ -256,11 +259,12 @@
<#if
shippingAddress.address2?has_content>${shippingAddress.address2}</#if>
</li>
<li>
- ${shippingAddress.city}<#if
shippingAddress.stateProvinceGeoId?has_content>,
${shippingAddress.stateProvinceGeoId} </#if>
- ${shippingAddress.postalCode?if_exists}
+ <#assign shippingStateGeo = (delegator.findOne("Geo",
{"geoId", shippingAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
+ ${shippingAddress.city}<#if shippingStateGeo?has_content>,
${shippingStateGeo.geoName?if_exists}</#if>
${shippingAddress.postalCode?if_exists}
</li>
<li>
- ${shippingAddress.countryGeoId?if_exists}
+ <#assign shippingCountryGeo = (delegator.findOne("Geo",
{"geoId", shippingAddress.countryGeoId?if_exists}, false))?if_exists />
+ <#if
shippingCountryGeo?has_content>${shippingCountryGeo.geoName?if_exists}</#if>
</li>
</ul>
</li>
