svn commit: r533009 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.properties webapp/ordermgr/order/orderpaymentinfo.ftl

[jacopoc]

Author: jacopoc
Date: Fri Apr 27 01:05:43 2007
New Revision: 533009

URL: http://svn.apache.org/viewvc?view=rev&rev=533009
Log:
Added the billing address associated at the order to the top of the payment box.
This is in my opinion a rather important information, that was not present in the screen; in fact it was only shown the bill to address associated with the payment method (that could be different from the billing address associated to the order, that is the one used when the invoice is created).

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.properties
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?view=diff&rev=533009&r1=533008&r2=533009
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Fri Apr 27 01:05:43 2007
@@ -150,6 +150,7 @@
 OrderBackOrdered=Backordered
 OrderBackOrders=Backorders
 OrderBeSureIncludeOrder=Be sure to include your order
+OrderBillingAddress=Billing Address
 OrderCancelAllItems=Cancel all Items
 OrderCancelled=Cancelled
 OrderCannotBeChanged=(cannot be changed without clearing order.)

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?view=diff&rev=533009&r1=533008&r2=533009
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Fri Apr 27 01:05:43 2007
@@ -23,6 +23,24 @@
   </div>
   <div class="screenlet-body">
      <table width="100%" border="0" cellpadding="1" cellspacing="0">
+     <#if billingAddress?has_content>
+       <tr>
+         <td align="right" valign="top" width="15%">
+           <b>${uiLabelMap.OrderBillingAddress}</b>
+         </td>
+         <td width="5">&nbsp;</td>
+         <td align="left" valign="top" width="80%">
+             <#if billingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${billingAddress.toName}<br/></#if>
+             <#if billingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${billingAddress.attnName}<br/></#if>
+             ${billingAddress.address1}<br/>
+             <#if billingAddress.address2?has_content>${billingAddress.address2}<br/></#if>
+             ${billingAddress.city}<#if billingAddress.stateProvinceGeoId?has_content>, ${billingAddress.stateProvinceGeoId} </#if>
+             ${billingAddress.postalCode?if_exists}<br/>
+             ${billingAddress.countryGeoId?if_exists}
+         </td>
+       </tr>
+       <tr><td colspan="7"><hr></td></tr>
+     </#if>
      <#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content>
         <#list orderPaymentPreferences as orderPaymentPreference>
           <#assign pmBillingAddress = {}>