svn commit: r421950 - /incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl

[sichen]

Author: sichen
Date: Fri Jul 14 10:03:42 2006
New Revision: 421950

URL: http://svn.apache.org/viewvc?rev=421950&view=rev
Log:
Fixed potential crash on order PDF when the payment preference is a manually received offline Credit Card

Modified:
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl?rev=421950&r1=421949&r2=421950&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl Fri Jul 14 10:03:42 2006
@@ -136,7 +136,7 @@
                    <#if orderPaymentPreferences?has_content>
                       <#list orderPaymentPreferences as orderPaymentPreference>
                          <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType")?if_exists>
-                         <#if orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD">
+                         <#if ((orderPaymentPreference != null) && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
                            <#assign creditCard = orderPaymentPreference.getRelatedOne("PaymentMethod").getRelatedOne("CreditCard")>
                              ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
                          <#else>