From 7f9aa52e4732d43cbf9aa0a3a268af88898aca64 Mon Sep 17 00:00:00 2001
From: MooN <56061215+MgKyawLay@users.noreply.github.com>
Date: Mon, 9 Feb 2026 22:29:37 +0630
Subject: [PATCH] detail report for card design changed as qr

---
 .../paylibs/print/printx/BaseXPrint.java      | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

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 d0a4af9..93d56f0 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
@@ -759,11 +759,7 @@ public abstract class BaseXPrint {
 
 
         if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) {
-            print2ColumnsString("CARD NAME", "CARD NUMBER");
-            print2ColumnsString("EXP DATE", "TRACE NO");
-            print2ColumnsString("TRANSACTION", "");
-            print2ColumnsString("AMOUNT", "");
-            print2ColumnsString("REF NUM", "");
+            // Use the same line-by-line style as QR detail report
         } else if (hostType == HostType.QR) {
 //            print2ColumnsString("PAYMENT NAME", "");
 //            print2ColumnsString("DATE", "TIME");
@@ -782,10 +778,21 @@ public abstract class BaseXPrint {
             boolean isDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable();
 
             if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) {
-                print2ColumnsString(pay.getAccountType(), PrintUtils.getInstance().maskCardNumberPciDss(pay.getCardNo()));
-                print2ColumnsString("**/**", pay.getVoucherNo());
-                print2ColumnsString(pay.getTransType().replace("_", " "), isNeedMinusSign ? "-" + PrintUtils.getInstance().getSeparatorNumberFormat(pay.getAmount(), isDecimalEnabled) : "" + PrintUtils.getInstance().getSeparatorNumberFormat(pay.getAmount(), isDecimalEnabled));
-                print2ColumnsString(pay.getReferNo(), "");
+                boolean isDecimalEnabledCard = SystemParamsOperation.getInstance().getDecimalEnable();
+                printString("CARD TYPE:" + pay.getAccountType());
+                printString("CARD NO  :" + PrintUtils.getInstance().maskCardNumberPciDss(pay.getCardNo()));
+                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) {
 
@@ -839,11 +846,9 @@ public abstract class BaseXPrint {
 
         if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) {
             boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable();
-            print2ColumnsString("MPU", "");
-            print2ColumnsString("CARD TYPE", "");
-            print3ColumnsString("", "COUNT", "AMOUNT");
-            emptyLine(1);
-            print3ColumnsString("MPU", countStringFormat(lists.size()), "MMK " + PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount, isDecimalEnabled));
+            print2ColumnsString("CARD", "");
+            print3ColumnsString("TYPE  ", "COUNT", "AMOUNT");
+            print3ColumnsString("CARD", "  " + countStringFormat(lists.size()), "MMK " + PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount, isDecimalEnabled), true);
         } else if (hostType == HostType.QR) {
             boolean isDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable();
             print2ColumnsString("PAYMENT", "");