svn commit: r1139693 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml src/org/ofbiz/accounting/payment/PaymentMethodServices.java

[doogie-3]

Author: doogie
Date: Sun Jun 26 02:50:03 2011
New Revision: 1139693

URL: http://svn.apache.org/viewvc?rev=1139693&view=rev
Log:
FIX: Stop printing out the credit card number to the log file.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1139693&r1=1139692&r2=1139693&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sun Jun 26 02:50:03 2011
@@ -3016,8 +3016,9 @@
         <value xml:lang="zh_TW">沒有建立信用卡。信用卡沒通過檢核, 認證失敗。</value>
     </property>
     <property key="AccountingCreditCardNumberInvalid">
+        <!-- FIXME: other languages(en is correct) -->
         <value xml:lang="de">${cardNumber} ist keine ${cardType}-Kreditkartennummer.</value>
-        <value xml:lang="en">${cardNumber} is not a valid ${cardType} credit card number. (It appears to be a ${validCardType}) credit card number)</value>
+        <value xml:lang="en">That is not a valid ${cardType} credit card number. (It appears to be a ${validCardType}) credit card number)</value>
         <value xml:lang="it">La carta di credito numero ${cardNumber} non è una ${cardType}. (Sembra che sia una ${validCardType})</value>
         <value xml:lang="pt">${cardNumber} não é válido ${cardType} número de cartão de crédito. (Parece ser um ${validCardType}) o número do cartão de crédito)</value>
     </property>

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=1139693&r1=1139692&r2=1139693&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Sun Jun 26 02:50:03 2011
@@ -151,8 +151,7 @@ public class PaymentMethodServices {
         if (!UtilValidate.isCardMatch((String) context.get("cardType"), (String) context.get("cardNumber"))) {
             messages.add(
                 UtilProperties.getMessage(resource, "AccountingCreditCardNumberInvalid",
-                    UtilMisc.toMap("cardNumber", (String) context.get("cardNumber"),
-                                   "cardType", (String) context.get("cardType"),
+                    UtilMisc.toMap("cardType", (String) context.get("cardType"),
                                    "validCardType", UtilValidate.getCardType((String) context.get("cardNumber"))), locale));
         }
 
@@ -301,14 +300,12 @@ public class PaymentMethodServices {
         if (updatedCardNumber.startsWith("*")) {
             // get the masked card number from the db
             String origCardNumber = creditCard.getString("cardNumber");
-            Debug.log("CCInfo: " + creditCard.toString(), module);
             String origMaskedNumber = "";
             int cardLength = origCardNumber.length() - 4;
             for (int i = 0; i < cardLength; i++) {
                 origMaskedNumber = origMaskedNumber + "*";
             }
             origMaskedNumber = origMaskedNumber + origCardNumber.substring(cardLength);
-            Debug.log(origMaskedNumber);
 
             // compare the two masked numbers
             if (updatedCardNumber.equals(origMaskedNumber)) {
@@ -320,8 +317,7 @@ public class PaymentMethodServices {
         if (!UtilValidate.isCardMatch((String) context.get("cardType"), (String) context.get("cardNumber"))) {
             messages.add(
                 UtilProperties.getMessage(resource, "AccountingCreditCardNumberInvalid",
-                    UtilMisc.toMap("cardNumber", (String) context.get("cardNumber"),
-                                   "cardType", (String) context.get("cardType"),
+                    UtilMisc.toMap("cardType", (String) context.get("cardType"),
                                    "validCardType", UtilValidate.getCardType((String) context.get("cardNumber"))), locale));
         }
 
@@ -590,7 +586,6 @@ public class PaymentMethodServices {
         if (cardNumber.startsWith("*")) {
             // get the masked card number from the db
             String origCardNumber = giftCard.getString("cardNumber");
-            //Debug.log(origCardNumber);
             String origMaskedNumber = "";
             int cardLength = origCardNumber.length() - 4;
             if (cardLength > 0) {