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

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-04-06 16:01:40 -0500 (Thu, 06 Apr 2006)
New Revision: 7219

Modified:
   trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
Log:
Changed Gift Certificate release service to expire the related FinAccountAuth

Modified: trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
===================================================================
--- trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java	2006-04-06 19:01:22 UTC (rev 7218)
+++ trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java	2006-04-06 21:01:40 UTC (rev 7219)
@@ -453,11 +453,30 @@
     }
 
     public static Map giftCertificateRelease(DispatchContext dctx, Map context) {
+        LocalDispatcher dispatcher = dctx.getDispatcher();
         GenericValue userLogin = (GenericValue) context.get("userLogin");
+
         GenericValue paymentPref = (GenericValue) context.get("orderPaymentPreference");
-        String currency = (String) context.get("currency");
-        Double amount = (Double) context.get("releaseAmount");
-        return giftCertificateRestore(dctx, userLogin, paymentPref, amount, currency, "release");
+
+        String err = "Unable to expire financial account authorization for Gift Certificate: ";
+        try {
+            // expire the related financial authorization transaction
+            GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(paymentPref);
+            if (authTransaction == null) {
+                return ServiceUtil.returnError(err + " Could not find authorization transaction.");
+            }
+            Map input = UtilMisc.toMap("userLogin", userLogin, "finAccountAuthId", authTransaction.get("referenceNum"));
+            Map serviceResults = dispatcher.runSync("expireFinAccountAuth", input);
+
+            // if there's an error, don't release
+            if (ServiceUtil.isError(serviceResults)) {
+                return ServiceUtil.returnError(err + ServiceUtil.getErrorMessage(serviceResults));
+            }
+        } catch (GenericServiceException e) {
+            Debug.logError(e, e.getMessage(), module);
+            return ServiceUtil.returnError(err + e.getMessage());
+        }
+        return ServiceUtil.returnSuccess();
     }
 
     private static Map giftCertificateRestore(DispatchContext dctx, GenericValue userLogin, GenericValue paymentPref, Double amount, String currency, String resultPrefix) {