svn commit: r1056072 - /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1056072 - /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl

jleroux@apache.org
Author: jleroux
Date: Thu Jan  6 20:57:48 2011
New Revision: 1056072

URL: http://svn.apache.org/viewvc?rev=1056072&view=rev
Log:
Fix bugs reported by Jeremy Wickersheimer at "Error in order email confirmation template" (https://issues.apache.org/jira/browse/OFBIZ-4096) - OFBIZ-4096

In: specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl:123

<#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress")>

is missing the ?if_exists causing errors in some cases.

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl

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=1056072&r1=1056071&r2=1056072&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl Thu Jan  6 20:57:48 2011
@@ -120,7 +120,7 @@ under the License.
           <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId && creditCard?has_content>
             <#if outputted?default(false)>
             </#if>
-            <#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress")>
+            <#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress")?if_exists>
             <li>
               <ul>
                 <li> ${uiLabelMap.AccountingCreditCard}
@@ -162,7 +162,7 @@ under the License.
           <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId && eftAccount?has_content>
             <#if outputted?default(false)>
             </#if>
-            <#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress")>
+            <#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress")?if_exists>
             <li>
               <ul>
                 <li>