svn commit: r448742 - in /incubator/ofbiz/trunk/applications/order: config/OrderUiLabels.properties webapp/ordermgr/order/orderheader.ftl

[sichen]

Author: sichen
Date: Thu Sep 21 16:45:08 2006
New Revision: 448742

URL: http://svn.apache.org/viewvc?view=rev&rev=448742
Log:
show a No payment preferences for order for orders with no payment information

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

Modified: incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?view=diff&rev=448742&r1=448741&r2=448742
==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties Thu Sep 21 16:45:08 2006
@@ -162,6 +162,7 @@
 OrderNoOrderFound = No Order Found
 OrderNoOrderFoundForParty=No orders found for partyId
 OrderNoOrderItemsToDisplay = No order items to display.
+OrderNoOrderPaymentPreferences = No preferences associated with this order.
 OrderNoPurchasePaymentMethod=No Purchase Payment Method Information Found.
 OrderNoPurchaseProduct=No Purchased Product Information Found.
 OrderNoPurchaseSpecified=No Purchase Order was specified

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl?view=diff&rev=448742&r1=448741&r2=448742
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl Thu Sep 21 16:45:08 2006
@@ -253,13 +253,13 @@
       <#-- end of order terms box -->
 
       <#-- payment box -->
-      <#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content>
-        <div class="screenlet">
-            <div class="screenlet-header">
-                <div class="boxhead">&nbsp;${uiLabelMap.AccountingPaymentInformation}</div>
-            </div>
-            <div class="screenlet-body">
-                <table width="100%" border="0" cellpadding="1" cellspacing="0">
+      <div class="screenlet">
+          <div class="screenlet-header">
+              <div class="boxhead">&nbsp;${uiLabelMap.AccountingPaymentInformation}</div>
+          </div>
+          <div class="screenlet-body">
+          <#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content>
+             <table width="100%" border="0" cellpadding="1" cellspacing="0">
                 <#list orderPaymentPreferences as orderPaymentPreference>
                   <#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem")>
                   <#if outputted?default("false") == "true">
@@ -518,9 +518,11 @@
                   </tr>
                 </#if>
                 </table>
-            </div>
-        </div>
-      </#if>
+           <#else>
+             <div class="tabletext">${uiLabelMap.OrderNoOrderPaymentPreferences}</div>
+           </#if>
+         </div>
+      </div>
       <#-- end of payment box -->
     </td>
     <td width="1">&nbsp;&nbsp;</td>