detail report for card design changed as qr
This commit is contained in:
parent
b87dc2a60a
commit
7f9aa52e47
@ -759,11 +759,7 @@ public abstract class BaseXPrint {
|
|||||||
|
|
||||||
|
|
||||||
if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) {
|
if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) {
|
||||||
print2ColumnsString("CARD NAME", "CARD NUMBER");
|
// Use the same line-by-line style as QR detail report
|
||||||
print2ColumnsString("EXP DATE", "TRACE NO");
|
|
||||||
print2ColumnsString("TRANSACTION", "");
|
|
||||||
print2ColumnsString("AMOUNT", "");
|
|
||||||
print2ColumnsString("REF NUM", "");
|
|
||||||
} else if (hostType == HostType.QR) {
|
} else if (hostType == HostType.QR) {
|
||||||
// print2ColumnsString("PAYMENT NAME", "");
|
// print2ColumnsString("PAYMENT NAME", "");
|
||||||
// print2ColumnsString("DATE", "TIME");
|
// print2ColumnsString("DATE", "TIME");
|
||||||
@ -782,10 +778,21 @@ public abstract class BaseXPrint {
|
|||||||
boolean isDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable();
|
boolean isDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable();
|
||||||
|
|
||||||
if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) {
|
if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) {
|
||||||
print2ColumnsString(pay.getAccountType(), PrintUtils.getInstance().maskCardNumberPciDss(pay.getCardNo()));
|
boolean isDecimalEnabledCard = SystemParamsOperation.getInstance().getDecimalEnable();
|
||||||
print2ColumnsString("**/**", pay.getVoucherNo());
|
printString("CARD TYPE:" + pay.getAccountType());
|
||||||
print2ColumnsString(pay.getTransType().replace("_", " "), isNeedMinusSign ? "-" + PrintUtils.getInstance().getSeparatorNumberFormat(pay.getAmount(), isDecimalEnabled) : "" + PrintUtils.getInstance().getSeparatorNumberFormat(pay.getAmount(), isDecimalEnabled));
|
printString("CARD NO :" + PrintUtils.getInstance().maskCardNumberPciDss(pay.getCardNo()));
|
||||||
print2ColumnsString(pay.getReferNo(), "");
|
printString("TRACE NO :" + pay.getVoucherNo());
|
||||||
|
printString("RRN :" + pay.getReferNo());
|
||||||
|
printString("DATE :" + POSUtil.getInstance().formatDisplayDate(pay.getTransDate()) + " " + pay.getTransTime());
|
||||||
|
printString("TYPE :" + pay.getTransType().replace("_", " "));
|
||||||
|
printString("AMOUNT :" +
|
||||||
|
(isNeedMinusSign
|
||||||
|
? "-" + PrintUtils.getInstance()
|
||||||
|
.getSeparatorNumberFormat(pay.getAmount(), isDecimalEnabledCard)
|
||||||
|
: PrintUtils.getInstance()
|
||||||
|
.getSeparatorNumberFormat(pay.getAmount(), isDecimalEnabledCard))
|
||||||
|
+ " " + "MMK");
|
||||||
|
dotBreak();
|
||||||
|
|
||||||
} else if (hostType == HostType.QR) {
|
} else if (hostType == HostType.QR) {
|
||||||
|
|
||||||
@ -839,11 +846,9 @@ public abstract class BaseXPrint {
|
|||||||
|
|
||||||
if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) {
|
if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) {
|
||||||
boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable();
|
boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable();
|
||||||
print2ColumnsString("MPU", "");
|
print2ColumnsString("CARD", "");
|
||||||
print2ColumnsString("CARD TYPE", "");
|
print3ColumnsString("TYPE ", "COUNT", "AMOUNT");
|
||||||
print3ColumnsString("", "COUNT", "AMOUNT");
|
print3ColumnsString("CARD", " " + countStringFormat(lists.size()), "MMK " + PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount, isDecimalEnabled), true);
|
||||||
emptyLine(1);
|
|
||||||
print3ColumnsString("MPU", countStringFormat(lists.size()), "MMK " + PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount, isDecimalEnabled));
|
|
||||||
} else if (hostType == HostType.QR) {
|
} else if (hostType == HostType.QR) {
|
||||||
boolean isDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable();
|
boolean isDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable();
|
||||||
print2ColumnsString("PAYMENT", "");
|
print2ColumnsString("PAYMENT", "");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user