diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java index fbc7bd3..a928c96 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java @@ -320,11 +320,11 @@ public abstract class BaseXPrint { String secondLineName = PrintUtils.getInstance().processNameSpaceSecondLine(PrintUtils.getInstance().getCardHolderName(payDetail.getCardHolderName())); String firsLineName = PrintUtils.getInstance().processNameSpaceFirstLine(PrintUtils.getInstance().getCardHolderName(payDetail.getCardHolderName()), secondLineName); - print2ColumnsStringNoSpace("CARD NUM :", PrintUtils.getInstance().maskCardNumberPciDss(payDetail.getCardNo())); - print2ColumnsStringNoSpace("ENTRY MODE:", PrintUtils.getInstance().getEntryType(payDetail.getCardType())); - print2ColumnsStringNoSpace("EXP DATE :",PrintUtils.getInstance().getFormatExpDate(payDetail.getEXPDate())); - print2ColumnsStringNoSpace("CARD TYPE :", payDetail.getAccountType()); - print2ColumnsStringNoSpace("TRACE NUM :", payDetail.getVoucherNo()); + print2ColumnsStringNoSpace("CARD NUM :", PrintUtils.getInstance().maskCardNumberPciDss(payDetail.getCardNo())); + print2ColumnsStringNoSpace("ENTRY MODE :", PrintUtils.getInstance().getEntryType(payDetail.getCardType())); + print2ColumnsStringNoSpace("EXP DATE :",PrintUtils.getInstance().getFormatExpDate(payDetail.getEXPDate())); + print2ColumnsStringNoSpace("CARD TYPE :", payDetail.getAccountType()); + print2ColumnsStringNoSpace("TRACE NUM :", payDetail.getVoucherNo()); if (payDetail.getCardType() != BaseCardType.MAGNETIC.getValue()) { print2ColumnsStringNoSpace("CARD HOLDER:", firsLineName); @@ -334,10 +334,10 @@ public abstract class BaseXPrint { } if (payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_ACCEPT) || payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_APPROVED)) { - print2ColumnsStringNoSpace( "APPR CODE :" ,payDetail.getApprovalCode()); + print2ColumnsStringNoSpace( "APPR CODE :" ,payDetail.getApprovalCode()); } - print2ColumnsStringNoSpace("TRANS REF :", payDetail.getReferNo()); + print2ColumnsStringNoSpace("TRANS REF :", payDetail.getReferNo()); // if (payDetail.getCardType() != BaseCardType.MAGNETIC.getValue()) { @@ -356,33 +356,31 @@ public abstract class BaseXPrint { print2ColumnsStringNoSpace("TXN FEES", ":" + PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAdditionalAmount())); } } -// emptyLine(2); - lineBreak(); + dotBreak(); // check is pin change - if (payDetail.getTradeAnswerCode().equals("00") || payDetail.getTradeAnswerCode().equals("000")) { String currencySign = currencyCodeToText(payDetail.getCurrencyCode()); if (payDetail.getTransactionType() == TransactionType.BALANCE_INQUIRY) { printer.appendPrnStr("MMK " + PrintUtils.getInstance().getBalanceInquiryNumberFormat(payDetail.getAmount()), fontNormal, AlignEnum.LEFT,false); } else if (payDetail.getTransactionType() == TransactionType.VOID || payDetail.getTransactionType() == TransactionType.REFUND || payDetail.getTransactionType() == TransactionType.PRE_SALE_CANCEL || payDetail.getTransactionType() == TransactionType.PRE_SALE_COMPLETE_VOID) { - print2SideString("AMOUNT:" + currencySign, "- " + PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount())); + print2SideString("AMT:" + currencySign, "- " + PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount())); } else if (payDetail.getTransactionType() == TransactionType.CASH_ADVANCE) { long totalAmount = payDetail.getAmount() + payDetail.getAdditionalAmount(); - print2SideString("AMOUNT:" + currencySign, PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount)); + print2SideString("AMT:" + currencySign, PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount)); } else { - print2SideString("AMOUNT:" + currencySign, PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount())); + print2SideString("AMT:" + currencySign, PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount())); } - lineBreak(); + dotBreak(); } else { - lineBreak(); + dotBreak(); emptyLine(2); printer.appendPrnStr("TRANSACTION FAIL", fontNormal, AlignEnum.CENTER,true); printer.appendPrnStr(BaseErrorCode.getCode(payDetail.getTradeAnswerCode()), fontNormal, AlignEnum.CENTER,true); emptyLine(2); - lineBreak(); + dotBreak(); } } @@ -1123,11 +1121,9 @@ public abstract class BaseXPrint { printer.appendPrnStr("DATE :" + POSUtil.getInstance().formatDisplayDate(payDetail.getTransDate()), fontNormal, AlignEnum.LEFT, false); printer.appendPrnStr("TIME :" + payDetail.getTransTime(), fontNormal, AlignEnum.LEFT, false); if (payDetail.getTransactionType() == TransactionsType.MMQR.value && payDetail.getQrTransStatus() == 1) { -// printer.appendPrnStr("TRACE NO:" + traceNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false); -// printer.appendPrnStr("INV NO :" + invoiceNo , fontNormal, AlignEnum.LEFT,false); printer.appendPrnStr("TRACE NO :" + traceNum , fontNormal, AlignEnum.LEFT,false); } else if (!payDetail.getTransType().equals(SETTLEMENT) && !payDetail.getTransType().equals(SUMMARY) && payDetail.getTransactionType() != TransactionsType.MMQR_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value) { - printer.appendPrnStr("BTH NO :" + batchNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false); + printer.appendPrnStr("BTH NO:" + batchNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false); } else if (payDetail.getTransType().equals(SUMMARY)) { printer.appendPrnStr("HOST :" + HOST_NAME_MPU + "", fontNormal, AlignEnum.LEFT,false); } @@ -1142,19 +1138,17 @@ public abstract class BaseXPrint { } if(isSettlement) { - printer.appendPrnStr("BATCH :" + batchNum, fontNormal, AlignEnum.LEFT,false); printer.appendPrnStr("HOST :" + "KBZ Bank "+currencySign, fontNormal, AlignEnum.LEFT,false); } if(isCardTransaction) { - lineBreak(); + dotBreak(); } else { emptyLine(1); } - printer.appendPrnStr(transType.replace("_", " "),fontNormal, AlignEnum.CENTER,true); // printer.appendPrnStr("TRAN TYPE :" + transType.replace("_", " "),fontNormal, AlignEnum.LEFT,false); @@ -1188,10 +1182,6 @@ public abstract class BaseXPrint { printer.appendPrnStr("", printedTime, fontNormal, false); printer.appendPrnStr(title, fontNormal , AlignEnum.CENTER, false); -// if (payDetail.getTransactionType() == TransactionsType.MMQR.value && payDetail.getQrTransStatus() == 1) { -//// printer.appendPrnStr("TRACE NO:" + traceNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false); -// printer.appendPrnStr("INV NO :" + invoiceNo , fontNormal, AlignEnum.LEFT,false); -// } dotBreak(); } protected void printTransHeader(PayDetail payDetail, HostType hostType) { diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java index 8760afa..44c43d0 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java @@ -266,6 +266,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX { printTransDetail(payDetail); if (payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_APPROVED) || payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_ACCEPT)) { + emptyLine(2); printTransFooter(false,payDetail, isMerchantCopy); } else { String receiptFooter = SystemParamsOperation.getInstance().getReceiptFooter();