svn commit: r578291 - /ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl

Author: jleroux
Date: Fri Sep 21 15:19:19 2007
New Revision: 578291

URL: http://svn.apache.org/viewvc?rev=578291&view=rev
Log:
Applied fix from trunk for revision: 573353

Modified:
    ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl

Modified: ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=578291&r1=578290&r2=578291&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Fri Sep 21 15:19:19 2007
@@ -324,19 +324,25 @@
       <td width="5">&nbsp;</td>
       <td nowrap>
          <select name="paymentMethodId" class="selectBox">
-         <#list paymentMethodValueMaps as paymentMethodValueMap>
-         <#assign paymentMethod = paymentMethodValueMap.paymentMethod/>
-         <option value="${paymentMethod.get("paymentMethodId")?if_exists}">
-         <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
-            <#assign creditCard = paymentMethodValueMap.creditCard/>
-            ${creditCard.cardType?if_exists} ${creditCard.cardNumber?if_exists} ${creditCard.expireDate?if_exists}                    
-         <#else>
-            ${paymentMethod.paymentMethodTypeId?if_exists}
-            <#if paymentMethod.description?exists>${paymentMethod.description}</#if>
-            (${paymentMethod.paymentMethodId})
-         </#if>
-         </option>
-         </#list>
+           <#list paymentMethodValueMaps as paymentMethodValueMap>
+             <#assign paymentMethod = paymentMethodValueMap.paymentMethod/>
+             <option value="${paymentMethod.get("paymentMethodId")?if_exists}">
+               <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
+                 <#assign creditCard = paymentMethodValueMap.creditCard/>
+                 <#if (creditCard?has_content)>
+                   <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)>
+                     ${creditCard.cardType?if_exists} ${creditCard.cardNumber?if_exists} ${creditCard.expireDate?if_exists}
+                   <#else>
+                     ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
+                   </#if>
+                 </#if>
+               <#else>
+                 ${paymentMethod.paymentMethodTypeId?if_exists}
+                 <#if paymentMethod.description?exists>${paymentMethod.description}</#if>
+                   (${paymentMethod.paymentMethodId})
+                 </#if>
+               </option>
+           </#list>
          </select>
       </td>
    </tr>