svn commit: r672130 - /ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java

Author: jleroux
Date: Fri Jun 27 00:22:35 2008
New Revision: 672130

URL: http://svn.apache.org/viewvc?rev=672130&view=rev
Log:
A patch from Chris Lombardi "POS: CVV2 code is not always deleted from the DB" (https://issues.apache.org/jira/browse/OFBIZ-1716) - OFBIZ-1716

Modified:
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=672130&r1=672129&r2=672130&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Fri Jun 27 00:22:35 2008
@@ -1770,16 +1770,16 @@
             // set the status of the OrderPaymentPreference
             if (context != null && authResult.booleanValue()) {
                 orderPaymentPreference.set("statusId", "PAYMENT_AUTHORIZED");
-                orderPaymentPreference.set("securityCode", null);
-                orderPaymentPreference.set("track2", null);                
             } else if (context != null && !authResult.booleanValue()) {
                 orderPaymentPreference.set("statusId", "PAYMENT_DECLINED");
             } else {
                 orderPaymentPreference.set("statusId", "PAYMENT_ERROR");
-                orderPaymentPreference.set("securityCode", null);
-                orderPaymentPreference.set("track2", null);                
             }
             
+            // remove sensitive credit card data regardless of outcome
+            orderPaymentPreference.set("securityCode", null);
+            orderPaymentPreference.set("track2", null);    
+                
             boolean needsNsfRetry = needsNsfRetry(orderPaymentPreference, context, delegator);
             if (needsNsfRetry) {
                 orderPaymentPreference.set("needsNsfRetry", "Y");