midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hg merge e579d7ef4fa5

This commit is contained in:
Carlos Ruiz 2012-12-12 08:11:54 -05:00
parent 4d83adf841 3607328a7b
commit 4e6bf45259
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
org.adempiere.base/src/org/compiere/model/MPayment.java
View File

@ -512,7 +512,7 @@ public final class MPayment extends X_C_Payment
// setErrorMessage(Msg.getMsg(getCtx(), msg)); // setErrorMessage(Msg.getMsg(getCtx(), msg));
// } else { // } else {
// Process if validation succeeds // Process if validation succeeds
approved = pp.processCC (); approved = pp.processCC();
if (approved) if (approved)
setErrorMessage(null); setErrorMessage(null);
@ -534,6 +534,9 @@ public final class MPayment extends X_C_Payment
if (approved) if (approved)
{ {
setCreditCardNumber(PaymentUtil.encrpytCreditCard(getCreditCardNumber()));
setCreditCardVV(PaymentUtil.encrpytCvv(getCreditCardVV()));
setDateTrx(new Timestamp(System.currentTimeMillis())); setDateTrx(new Timestamp(System.currentTimeMillis()));
setDateAcct(new Timestamp(System.currentTimeMillis())); setDateAcct(new Timestamp(System.currentTimeMillis()));
setProcessed(true); // prevent editing of payment details once approved setProcessed(true); // prevent editing of payment details once approved
@ -731,6 +734,23 @@ public final class MPayment extends X_C_Payment
} }
} }
if (isProcessed())
{
if (getCreditCardNumber() != null)
{
String encrpytedCCNo = PaymentUtil.encrpytCreditCard(getCreditCardNumber());
if (!encrpytedCCNo.equals(getCreditCardNumber()))
setCreditCardNumber(encrpytedCCNo);
}
if (getCreditCardVV() != null)
{
String encrpytedCvv = PaymentUtil.encrpytCvv(getCreditCardVV());
if (!encrpytedCvv.equals(getCreditCardVV()))
setCreditCardVV(encrpytedCvv);
}
}
return true; return true;
} // beforeSave } // beforeSave
@ -2852,13 +2872,6 @@ public final class MPayment extends X_C_Payment
} }
} }
// clear out the cc data when a Void happens since at that point we won't need the card information any longer
if (getTenderType().equals(TENDERTYPE_CreditCard))
{
setCreditCardNumber(PaymentUtil.encrpytCreditCard(getCreditCardNumber()));
setCreditCardVV(PaymentUtil.encrpytCvv(getCreditCardVV()));
}
if (getC_Invoice_ID() != 0) if (getC_Invoice_ID() != 0)
{ {
MInvoice inv = new MInvoice(getCtx(), getC_Invoice_ID(), get_TrxName()); MInvoice inv = new MInvoice(getCtx(), getC_Invoice_ID(), get_TrxName());

16
org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java
View File

@ -75,7 +75,12 @@ public class MPaymentTransaction extends X_C_PaymentTransaction implements Proce
protected boolean beforeSave(boolean newRecord) protected boolean beforeSave(boolean newRecord)
{ {
if (getCreditCardVV() != null) if (getCreditCardVV() != null)
setCreditCardVV(PaymentUtil.encrpytCvv(getCreditCardVV())); {
String encrpytedCvv = PaymentUtil.encrpytCvv(getCreditCardVV());
if (!encrpytedCvv.equals(getCreditCardVV()))
setCreditCardVV(encrpytedCvv);
}
return true; return true;
} }
@ -226,7 +231,9 @@ public class MPaymentTransaction extends X_C_PaymentTransaction implements Proce
// setErrorMessage(Msg.getMsg(getCtx(), msg)); // setErrorMessage(Msg.getMsg(getCtx(), msg));
// } else { // } else {
// Process if validation succeeds // Process if validation succeeds
approved = pp.processCC (); approved = pp.processCC();
setCreditCardNumber(PaymentUtil.encrpytCreditCard(getCreditCardNumber()));
setCreditCardVV(PaymentUtil.encrpytCvv(getCreditCardVV()));
setIsApproved(approved); setIsApproved(approved);
if(getTrxType().equals(TRXTYPE_Void) || getTrxType().equals(TRXTYPE_CreditPayment)) if(getTrxType().equals(TRXTYPE_Void) || getTrxType().equals(TRXTYPE_CreditPayment))
@ -319,8 +326,6 @@ public class MPaymentTransaction extends X_C_PaymentTransaction implements Proce
m_mPaymentTransaction.setIsDelayedCapture(false); m_mPaymentTransaction.setIsDelayedCapture(false);
boolean ok = m_mPaymentTransaction.processOnline(get_TrxName()); boolean ok = m_mPaymentTransaction.processOnline(get_TrxName());
m_mPaymentTransaction.setRef_PaymentTransaction_ID(getC_PaymentTransaction_ID()); m_mPaymentTransaction.setRef_PaymentTransaction_ID(getC_PaymentTransaction_ID());
// m_mPaymentTransaction.setCreditCardNumber(PaymentUtil.encrpytCreditCard(getCreditCardNumber()));
// m_mPaymentTransaction.setCreditCardVV(PaymentUtil.encrpytCvv(getCreditCardVV()));
m_mPaymentTransaction.saveEx(); m_mPaymentTransaction.saveEx();
if (trx != null) if (trx != null)
@ -334,9 +339,6 @@ public class MPaymentTransaction extends X_C_PaymentTransaction implements Proce
setIsVoided(true); setIsVoided(true);
setR_VoidMsg(m_mPaymentTransaction.getR_VoidMsg()); setR_VoidMsg(m_mPaymentTransaction.getR_VoidMsg());
setRef_PaymentTransaction_ID(m_mPaymentTransaction.getC_PaymentTransaction_ID()); setRef_PaymentTransaction_ID(m_mPaymentTransaction.getC_PaymentTransaction_ID());
// setCreditCardNumber(PaymentUtil.encrpytCreditCard(getCreditCardNumber()));
// setCreditCardVV(PaymentUtil.encrpytCvv(getCreditCardVV()));
} }
else else
setErrorMessage(m_mPaymentTransaction.getErrorMessage()); setErrorMessage(m_mPaymentTransaction.getErrorMessage());