From 6bcb4b9151310b95d030024f6dad6e62101b39fe Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Mon, 26 Nov 2012 19:29:32 +0800 Subject: [PATCH] =?UTF-8?q?Ticket=20#1001392:=20Implement=20Single=20?= =?UTF-8?q?=E2=80=98online=20trx=20history=20table=E2=80=99=20instead=20of?= =?UTF-8?q?=20individual=20tables=20-=20fix=20the=20incorrect=20text=20mes?= =?UTF-8?q?sage=20of=20online=20trx=20history=20when=20it=20is=20a=20void?= =?UTF-8?q?=20or=20credit=20(payment)=20transaction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/org/compiere/model/MPayment.java | 13 +++++++++---- .../src/org/compiere/model/MPaymentTransaction.java | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java index 2dc600fbcb..053eb8455a 100644 --- a/org.adempiere.base/src/org/compiere/model/MPayment.java +++ b/org.adempiere.base/src/org/compiere/model/MPayment.java @@ -557,10 +557,15 @@ public final class MPayment extends X_C_Payment StringBuffer msg = new StringBuffer(); if (approved) { - 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"); + if(getTrxType().equals(TRXTYPE_Void) || getTrxType().equals(TRXTYPE_CreditPayment)) + msg.append(getR_VoidMsg() + "\n"); + else + { + 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 msg.append("ERROR: " + getErrorMessage() + "\n"); diff --git a/org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java b/org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java index cca70602a6..c5e751faa1 100644 --- a/org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java +++ b/org.adempiere.base/src/org/compiere/model/MPaymentTransaction.java @@ -274,10 +274,15 @@ public class MPaymentTransaction extends X_C_PaymentTransaction implements Proce StringBuffer msg = new StringBuffer(); if (approved) { - 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"); + if(getTrxType().equals(TRXTYPE_Void) || getTrxType().equals(TRXTYPE_CreditPayment)) + msg.append(getR_VoidMsg() + "\n"); + else + { + 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 msg.append("ERROR: " + getErrorMessage() + "\n");