svn commit: r1343156 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl

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

svn commit: r1343156 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl

jacopoc
Author: jacopoc
Date: Mon May 28 07:36:41 2012
New Revision: 1343156

URL: http://svn.apache.org/viewvc?rev=1343156&view=rev
Log:
Replaced "!= null" with "??" (that is a replacement for the deprecated "exists" built-in).

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.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=1343156&r1=1343155&r2=1343156&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Mon May 28 07:36:41 2012
@@ -81,7 +81,7 @@ under the License.
     <#list orderPaymentPreferences as orderPaymentPreference>
         <fo:block text-indent="0.2in">
             <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType")?if_exists>
-            <#if ((orderPaymentPreference != null) && (orderPaymentPreference.getString("paymentMethodTypeId") == "CREDIT_CARD") && (orderPaymentPreference.getString("paymentMethodId")?has_content))>
+            <#if (orderPaymentPreference?? && (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>