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

Ticket #1001392: Implement Single ‘online trx history table’ instead of individual tables - fix the incorrect text message of online trx history when it is a void or credit (payment) transaction

This commit is contained in:
Elaine Tan 2012-11-26 19:29:32 +08:00
parent a7b786a446
commit 6bcb4b9151
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -557,10 +557,15 @@ public final class MPayment extends X_C_Payment
StringBuffer msg = new StringBuffer(); StringBuffer msg = new StringBuffer();
if (approved) if (approved)
{ {
msg.append("Result: " + getR_Result() + "\n"); if(getTrxType().equals(TRXTYPE_Void) || getTrxType().equals(TRXTYPE_CreditPayment))
msg.append("Response Message: " + getR_RespMsg() + "\n"); msg.append(getR_VoidMsg() + "\n");
msg.append("Reference: " + getR_PnRef() + "\n"); else
msg.append("Authorization Code: " + getR_AuthCode() + "\n"); {
msg.append("Result: " + getR_Result() + "\n");
msg.append("Response Message: " + getR_RespMsg() + "\n");
msg.append("Reference: " + getR_PnRef() + "\n");
msg.append("Authorization Code: " + getR_AuthCode() + "\n");
}
} }
else else
msg.append("ERROR: " + getErrorMessage() + "\n"); msg.append("ERROR: " + getErrorMessage() + "\n");

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

@ -274,10 +274,15 @@ public class MPaymentTransaction extends X_C_PaymentTransaction implements Proce
StringBuffer msg = new StringBuffer(); StringBuffer msg = new StringBuffer();
if (approved) if (approved)
{ {
msg.append("Result: " + getR_Result() + "\n"); if(getTrxType().equals(TRXTYPE_Void) || getTrxType().equals(TRXTYPE_CreditPayment))
msg.append("Response Message: " + getR_RespMsg() + "\n"); msg.append(getR_VoidMsg() + "\n");
msg.append("Reference: " + getR_PnRef() + "\n"); else
msg.append("Authorization Code: " + getR_AuthCode() + "\n"); {
msg.append("Result: " + getR_Result() + "\n");
msg.append("Response Message: " + getR_RespMsg() + "\n");
msg.append("Reference: " + getR_PnRef() + "\n");
msg.append("Authorization Code: " + getR_AuthCode() + "\n");
}
} }
else else
msg.append("ERROR: " + getErrorMessage() + "\n"); msg.append("ERROR: " + getErrorMessage() + "\n");