svn commit: r1060599 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java

[mrisaliti]

Author: mrisaliti
Date: Tue Jan 18 22:20:48 2011
New Revision: 1060599

URL: http://svn.apache.org/viewvc?rev=1060599&view=rev
Log:
Internationalization of ServiceUtil.returnSuccess, ServiceUtil.returnFailure, ServiceUtil.returnError (OFBIZ-4091)

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1060599&r1=1060598&r2=1060599&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jan 18 22:20:48 2011
@@ -9470,6 +9470,10 @@
         <value xml:lang="en">Exception in calling SagePayPaymentAuthorisation: ${errorString}</value>
         <value xml:lang="it">Eccezione durante la chiamata a SagePayPaymentAuthorisation: ${errorString}</value>
     </property>
+    <property key="AccountingSagePayOrderPaymenPreferenceIsNull">
+        <value xml:lang="en">OrderPaymentPreference for order : ${orderId } is null: ${orderPaymentPreference}</value>
+        <value xml:lang="it">Preferenze pagamento per l'ordine : ${orderId } è nullo: ${orderPaymentPreference}</value>
+    </property>
     <property key="AccountingSagePayPaymentRefundException">
         <value xml:lang="en">Exception in calling SagePayPaymentRefund: ${errorString}</value>
         <value xml:lang="it">Eccezione durante la chiamata a SagePayPaymentRefund: ${errorString}</value>

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java?rev=1060599&r1=1060598&r2=1060599&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java Tue Jan 18 22:20:48 2011
@@ -153,11 +153,14 @@ public class SagePayPaymentServices {
         Debug.logInfo("SagePay - Entered ccAuth", module);
         Debug.logInfo("SagePay ccAuth context : " + context, module);
         Map<String, Object> response = null;
+        String orderId = (String) context.get("orderId");
         Locale locale = (Locale) context.get("locale");
         GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
+        
         if (orderPaymentPreference == null) {
             response = ServiceUtil.returnError(UtilProperties.getMessage(resource,
-                    "AccountingProblemGettingOrderPaymentPreferences", locale));
+                    "AccountingSagePayOrderPaymenPreferenceIsNull",
+                    UtilMisc.toMap("orderId", orderId, "orderPaymentPreference", orderPaymentPreference), locale));
         } else {
             response = processCardAuthorisationPayment(dctx, context);
         }