svn commit: r1003909 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java

[jl...@apache.org]

Author: jleroux
Date: Sat Oct  2 22:24:11 2010
New Revision: 1003909

URL: http://svn.apache.org/viewvc?rev=1003909&view=rev
Log:
Related to OFBIZ-3969
I committed Sascha's patch in trunk at r1003836, but I finally reverted it as I'm not sure the EcommerceUiLabels will be there in all cases. And I guess if it's there, there should be a reason... I must say I did not take the time to dig it further... Also looks like Sascha's use case is specific (no English Labels) and OFBiz OOTB is not specific.

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1003909&r1=1003908&r2=1003909&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Sat Oct  2 22:24:11 2010
@@ -1968,7 +1968,7 @@ public class OrderServices {
                             return ServiceUtil.returnError((String)resp.get(ModelService.ERROR_MESSAGE));
                         }
                     }
-
+                    
                     // log an order note
                     try {
                         BigDecimal quantity = thisCancelQty.setScale(1, orderRounding);
@@ -2430,7 +2430,11 @@ public class OrderServices {
             locale = Locale.getDefault();
         }
 
-        Map bodyParameters = UtilMisc.toMap("orderId", orderId, "orderItemSeqId", orderItemSeqId, "userLogin", placingUserLogin, "locale", locale);
+        ResourceBundleMapWrapper uiLabelMap = (ResourceBundleMapWrapper) UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale);
+        uiLabelMap.addBottomResourceBundle("OrderUiLabels");
+        uiLabelMap.addBottomResourceBundle("CommonUiLabels");
+
+        Map bodyParameters = UtilMisc.toMap("orderId", orderId, "orderItemSeqId", orderItemSeqId, "userLogin", placingUserLogin, "uiLabelMap", uiLabelMap, "locale", locale);
         if (placingParty!= null) {
             bodyParameters.put("partyId", placingParty.get("partyId"));
         }
@@ -3894,7 +3898,7 @@ public class OrderServices {
         toStore.addAll(cart.makeAllOrderPaymentInfos(dispatcher));
         toStore.addAll(cart.makeAllOrderItemAttributes(orderId, ShoppingCart.FILLED_ONLY));
 
-        // get the empty order item attributes from the cart and remove them
+        // get the empty order item atrributes from the cart and remove them
         List toRemove = FastList.newInstance();
         toRemove.addAll(cart.makeAllOrderItemAttributes(orderId, ShoppingCart.EMPTY_ONLY));