svn commit: r894032 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml src/org/ofbiz/order/order/OrderReturnServices.java

[mrisaliti]

Author: mrisaliti
Date: Sat Dec 26 22:53:47 2009
New Revision: 894032

URL: http://svn.apache.org/viewvc?rev=894032&view=rev
Log:
I18n of an error/success messages of return services

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=894032&r1=894031&r2=894032&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sat Dec 26 22:53:47 
2009
@@ -2442,6 +2442,18 @@
         <value xml:lang="zh">创建退货</value>
         <value xml:lang="zh_CN">新建退货</value>
     </property>
+    <property key="OrderCreateReturnAdjustment">
+        <value xml:lang="en">Create ReturnAdjustment with Id:${seqId} 
successfully.</value>
+        <value xml:lang="it">Creato aggiustamento reso:${seqId} con 
successo.</value>
+    </property>
+    <property key="OrderCreateReturnAdjustmentNotFoundOrderAdjustment">
+        <value xml:lang="en">orderAdjustment ${orderAdjustmentId} not 
found</value>
+        <value xml:lang="it">Aggiustamento ordine ${orderAdjustmentId} non 
trovato</value>
+    </property>
+    <property key="OrderCreateReturnAdjustmentFailed">
+        <value xml:lang="en">Failed to store returnAdjustment</value>
+        <value xml:lang="it">Fallito la creazione degli aggiustamenti 
reso</value>
+    </property>
     <property key="OrderCreateReturnShipment">
         <value xml:lang="de">Retoure Versand erstellen</value>
         <value xml:lang="en">Create return shipment</value>
@@ -9782,6 +9794,10 @@
         <value xml:lang="zh">更新明细</value>
         <value xml:lang="zh_CN">更新项目</value>
     </property>
+    <property key="OrderUpdateReturnAdjustment">
+        <value xml:lang="en">Update ReturnAdjustment with 
Id:${returnAdjustmentId} to amount ${amount} successfully.</value>
+        <value xml:lang="it">Aggiornato aggiustamento 
reso:${returnAdjustmentId} per l'importo ${amount} con successo.</value>
+    </property>
     <property key="OrderUseDefault">
         <value xml:lang="cs">Upozornění pro uživatele: jiný způsob 
zaslání není možný</value>
         <value xml:lang="de">Voreinstellung: Keine andere Versandmethode 
verfügbar</value>

Modified: 
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=894032&r1=894031&r2=894032&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
 (original)
+++ 
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
 Sat Dec 26 22:53:47 2009
@@ -2349,13 +2349,14 @@
         return ServiceUtil.returnSuccess();
     }
 
-    public static Map createReturnAdjustment(DispatchContext dctx, Map 
context) {
+    public static Map<String, Object> createReturnAdjustment(DispatchContext 
dctx, Map<String, Object> context) {
         Delegator delegator = dctx.getDelegator();
         String orderAdjustmentId = (String) context.get("orderAdjustmentId");
         String returnAdjustmentTypeId = (String) 
context.get("returnAdjustmentTypeId");
         String returnId = (String) context.get("returnId");
         String returnItemSeqId = (String) context.get("returnItemSeqId");
         String description = (String) context.get("description");
+        Locale locale = (Locale) context.get("locale");
 
         GenericValue returnItemTypeMap = null;
         GenericValue orderAdjustment = null;
@@ -2419,7 +2420,7 @@
                 Debug.logInfo("returnPrice:" + 
returnItem.getBigDecimal("returnPrice") + ",returnQuantity:" + 
returnItem.getBigDecimal("returnQuantity") + ",sourcePercentage:" + 
orderAdjustment.getBigDecimal("sourcePercentage"), module);
                 if (orderAdjustment == null) {
                     Debug.logError("orderAdjustment [" + orderAdjustmentId + 
"] not found", module);
-                    return ServiceUtil.returnError("orderAdjustment [" + 
orderAdjustmentId + "] not found");
+                    return 
ServiceUtil.returnError(UtilProperties.getMessage(resource, 
"OrderCreateReturnAdjustmentNotFoundOrderAdjustment", 
UtilMisc.toMap("orderAdjustmentId", orderAdjustmentId), locale));
                 }
                 BigDecimal returnTotal = 
returnItem.getBigDecimal("returnPrice").multiply(returnItem.getBigDecimal("returnQuantity"));
                 BigDecimal orderTotal = 
orderItem.getBigDecimal("quantity").multiply(orderItem.getBigDecimal("unitPrice"));
@@ -2447,18 +2448,18 @@
             newReturnAdjustment.set("returnItemSeqId", 
UtilValidate.isEmpty(returnItemSeqId) ? "_NA_" : returnItemSeqId);
 
             delegator.create(newReturnAdjustment);
-            Map result = ServiceUtil.returnSuccess("Create ReturnAdjustment 
with Id:" + seqId + " successfully.");
+            Map<String, Object> result = 
ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, 
"OrderCreateReturnAdjustment", UtilMisc.toMap("seqId", seqId), locale));
             result.put("returnAdjustmentId", seqId);
             return result;
         } catch (GenericEntityException e) {
             Debug.logError(e, "Failed to store returnAdjustment", module);
-            return ServiceUtil.returnError("Failed to store returnAdjustment");
+            return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
"OrderCreateReturnAdjustmentFailed", locale));
         }
     }
 
-    public static Map updateReturnAdjustment(DispatchContext dctx, Map 
context) {
+    public static Map<String, Object> updateReturnAdjustment(DispatchContext 
dctx, Map<String, Object> context) {
         Delegator delegator = dctx.getDelegator();
-
+        Locale locale = (Locale) context.get("locale");
         GenericValue returnItem = null;
         GenericValue returnAdjustment = null;
         String returnAdjustmentTypeId = null;
@@ -2489,20 +2490,20 @@
                 amount = (BigDecimal) context.get("amount");
             }
 
-            Map result = null;
+            Map<String, Object> result = null;
             if (UtilValidate.isNotEmpty(amount)) {
                 returnAdjustment.setNonPKFields(context);
                 returnAdjustment.set("amount", amount);
                 delegator.store(returnAdjustment);
                 Debug.logInfo("Update ReturnAdjustment with Id:" + 
context.get("returnAdjustmentId") + " to amount " + amount +" successfully.", 
module);
-                result = ServiceUtil.returnSuccess("Update ReturnAdjustment 
with Id:" + context.get("returnAdjustmentId") + " to amount " + amount +" 
successfully.");
+                result = 
ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, 
"OrderUpdateReturnAdjustment", UtilMisc.toMap("returnAdjustmentId", 
context.get("returnAdjustmentId"), "amount", amount), locale));
             } else {
                 result = ServiceUtil.returnSuccess();
             }
             return result;
         } catch (GenericEntityException e) {
             Debug.logError(e, "Failed to store returnAdjustment", module);
-            return ServiceUtil.returnError("Failed to store returnAdjustment");
+            return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
"OrderCreateReturnAdjustmentFailed", locale));
         }
     }