svn commit: r525182 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.properties webapp/ordermgr/WEB-INF/actions/order/orderview.bsh widget/ordermgr/OrderViewScreens.xml

[jonesde]

Author: jonesde
Date: Tue Apr  3 08:48:24 2007
New Revision: 525182

URL: http://svn.apache.org/viewvc?view=rev&rev=525182
Log:
Fixed ugly error message when orderId is invalid; also fixed funny i18n pattern and incorrect use of a FreeMarker style ?if_exists which breaks things in the screen/form/simple-method/etc flexible string expansion stuff; now the order not found message displays properly... not sure how this stuff EVER could have worked

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.properties
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh
    ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?view=diff&rev=525182&r1=525181&r2=525182
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Tue Apr  3 08:48:24 2007
@@ -273,7 +273,7 @@
 OrderNoNotes=No notes for this order
 OrderNoNotesForThisRequestItem=No Notes For This Request Item
 OrderNoOrderAdjustments=No adjustments on this order.
-OrderNoOrderFound=No Order Found
+OrderNoOrderFound=No Order Found with ID
 OrderNoOrderFoundForParty=No orders found for partyId
 OrderNoOrderItemsToDisplay=No order items to display.
 OrderNoOrderPaymentPreferences=No payment preferences associated with this order.

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh?view=diff&rev=525182&r1=525181&r2=525182
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh Tue Apr  3 08:48:24 2007
@@ -88,6 +88,9 @@
         partyId = displayParty.getString("partyId");
         context.put("displayParty", displayParty);
         context.put("partyId", partyId);
+        
+        List paymentMethodValueMaps = PaymentWorker.getPartyPaymentMethodValueMaps(delegator, displayParty.getString("partyId"), false);
+        context.put("paymentMethodValueMaps", paymentMethodValueMaps);
     }
 
     otherAdjAmount = OrderReadHelper.calcOrderAdjustments(orderHeaderAdjustments, orderSubTotal, true, false, false);
@@ -358,11 +361,6 @@
         returnableItems = returnableItemServiceMap.get("returnableItems");
     }
     context.put("returnableItems", returnableItems);
-}
-
-if (displayParty != null) {
-    List paymentMethodValueMaps = PaymentWorker.getPartyPaymentMethodValueMaps(delegator, displayParty.getString("partyId"), false);
-    context.put("paymentMethodValueMaps", paymentMethodValueMaps);
 }
 
 if (orderHeader != null) {

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?view=diff&rev=525182&r1=525181&r2=525182
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Tue Apr  3 08:48:24 2007
@@ -78,7 +78,7 @@
                 </container>
             </widgets>
             <fail-widgets>
-                <label style="head2" text="${uiLabelMap.OrderNoOrderFound} ${uiLabelMap.CommonWith} ${uiLabelMap.CommonId}: [${orderId?if_exists}]"></label>
+                <label style="head2" text="${uiLabelMap.OrderNoOrderFound}: [${orderId}]"></label>
             </fail-widgets>
         </section>
     </screen>