[OFBiz] SVN: r7233 - trunk/applications/accounting/src/org/ofbiz/accounting/payment

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-04-07 09:26:24 -0500 (Fri, 07 Apr 2006)
New Revision: 7233

Modified:
   trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
Log:
Put currency in for customer refund payments.  Changed manual transaction service to lookup default currency from general.properties instead of always using USD

Modified: trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
===================================================================
--- trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java	2006-04-07 14:25:34 UTC (rev 7232)
+++ trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java	2006-04-07 14:26:24 UTC (rev 7233)
@@ -1689,6 +1689,7 @@
                     paymentCtx.put("partyIdFrom", payFromPartyId);
                     paymentCtx.put("statusId", "PMNT_SENT");
                     paymentCtx.put("paymentPreferenceId", paymentPref.get("orderPaymentPreferenceId"));
+                    paymentCtx.put("currencyUomId", orh.getCurrency());   
                     paymentCtx.put("amount", refundResponse.get("refundAmount"));
                     paymentCtx.put("userLogin", userLogin);
                     paymentCtx.put("paymentRefNum", refundResponse.get("refundRefNum"));
@@ -2021,7 +2022,8 @@
             }
             requestContext.put("billToEmail", billToEmail);
             requestContext.put("referenceCode", referenceCode);
-            requestContext.put("currency", "USD");
+            String currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
+            requestContext.put("currency", currency);
             requestContext.put("creditAmount", context.get("amount")); // TODO fix me to work w/ other services
         } else {
             return ServiceUtil.returnError("Payment method type : " + paymentMethodTypeId + " is not yet implemented for manual transactions");