From 522af3578c85696dc6b69dc71d344ccb215b30b2 Mon Sep 17 00:00:00 2001
From: MooN <56061215+MgKyawLay@users.noreply.github.com>
Date: Mon, 9 Feb 2026 22:41:57 +0630
Subject: [PATCH] Update BaseXPrint.java

---
 .../paylibs/print/printx/BaseXPrint.java      | 75 ++++++++++++-------
 1 file changed, 50 insertions(+), 25 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 93d56f0..40f49b0 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
@@ -559,6 +559,7 @@ public abstract class BaseXPrint {
         String MMK = "MMK";
         SettleData settleData = payDetail.getSettleDataObj();
         boolean isQrDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable();
+        boolean isWallet = "WALLET".equalsIgnoreCase(payDetail.getAccountType());
 
         int totalCount = settleData.getSaleCount() + settleData.getWavePayCount() + settleData.getVoidSaleCount() + settleData.getCashAdvanceCount() + settleData.getRefundCount() + settleData.getPreAuthCompCount() + settleData.getPreAuthCompVoidCount() + settleData.getWaveRefundCount();
         long totalAmount = (settleData.getCashAdvanceAmount() + settleData.getSaleAmount() + settleData.getWavePayAmount() + settleData.getPreAuthCompAmount()) - (settleData.getVoidSaleAmount() + settleData.getRefundAmount() + settleData.getPreAuthCompVoidAmount() + settleData.getWaveRefundAmount());
@@ -583,32 +584,56 @@ public abstract class BaseXPrint {
 
         printer.appendPrnStr("(COUNT)TRANS", "AMOUNT(MMK)", fontNormal, false);
 
-        if (settleData.getSaleCount() > 0)
-            printColumnString("SALES", settleData.getSaleCount(), settleData.getSaleAmount(), false);
-//                printer.appendPrnStr("SALES                      "+ countStringFormat(settleData.getSaleCount())+MMK+" "+ PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getSaleAmount()), fontNormal, AlignEnum.LEFT,false);
-        if (settleData.getVoidSaleCount() > 0)
-            printColumnString("VOID SALES", settleData.getVoidSaleCount(), settleData.getVoidSaleAmount(), true);
-        if (settleData.getCashAdvanceCount() > 0)
-            printColumnString("CASH OUT", settleData.getCashAdvanceCount(), settleData.getCashAdvanceAmount(), false);
-        if (settleData.getPreAuthCount() > 0)
-            printColumnString("PRE AUTH", settleData.getPreAuthCount(), settleData.getPreAuthAmount(), false);
-        if (settleData.getPreAuthVoidCount() > 0)
-            printColumnString("VOID PREAUTH", settleData.getPreAuthVoidCount(), settleData.getPreAuthVoidAmount(), true);
-        if (settleData.getRefundCount() > 0)
-            printColumnString("REFUND", settleData.getRefundCount(), settleData.getRefundAmount(), true);
-        if (settleData.getPreAuthCompCount() > 0)
-            printColumnString("PREAUTH COMP", settleData.getPreAuthCompCount(), settleData.getPreAuthCompAmount(), false);
-        if (settleData.getPreAuthCompVoidCount() > 0)
-            printColumnString("VOID PREAUTH COMPLETE", settleData.getPreAuthCompVoidCount(), settleData.getPreAuthCompVoidAmount(), true);
-        if (settleData.getWavePayCount() >= 0){
-//            printColumnString("QR PAY", settleData.getWavePayCount(), settleData.getWavePayAmount(), false);
-//            printer.appendPrnStr( "QR PAY  " + countStringFormat(settleData.getWavePayCount()) + " " + "MMK" ,  PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getWavePayAmount(), isQrDecimalEnabled) , fontNormal, false);
-            printer.appendPrnStr( "(" + settleData.getWavePayCount() + ")" + "QR PAY" ,  PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getWavePayAmount(), isQrDecimalEnabled) , fontNormal, false);
+        if (!isWallet) {
+            boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable();
+            if (settleData.getSaleCount() > 0) {
+                printer.appendPrnStr("(" + settleData.getSaleCount() + ")" + "SALES",
+                        PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getSaleAmount(), isDecimalEnabled),
+                        fontNormal, false);
+            }
+            if (settleData.getVoidSaleCount() > 0) {
+                printer.appendPrnStr("(" + settleData.getVoidSaleCount() + ")" + "VOID SALES",
+                        "- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getVoidSaleAmount(), isDecimalEnabled),
+                        fontNormal, false);
+            }
+            if (settleData.getCashAdvanceCount() > 0) {
+                printer.appendPrnStr("(" + settleData.getCashAdvanceCount() + ")" + "CASH OUT",
+                        PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getCashAdvanceAmount(), isDecimalEnabled),
+                        fontNormal, false);
+            }
+            if (settleData.getPreAuthCount() > 0) {
+                printer.appendPrnStr("(" + settleData.getPreAuthCount() + ")" + "PRE AUTH",
+                        PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getPreAuthAmount(), isDecimalEnabled),
+                        fontNormal, false);
+            }
+            if (settleData.getPreAuthVoidCount() > 0) {
+                printer.appendPrnStr("(" + settleData.getPreAuthVoidCount() + ")" + "VOID PREAUTH",
+                        "- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getPreAuthVoidAmount(), isDecimalEnabled),
+                        fontNormal, false);
+            }
+            if (settleData.getRefundCount() > 0) {
+                printer.appendPrnStr("(" + settleData.getRefundCount() + ")" + "REFUND",
+                        "- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getRefundAmount(), isDecimalEnabled),
+                        fontNormal, false);
+            }
+            if (settleData.getPreAuthCompCount() > 0) {
+                printer.appendPrnStr("(" + settleData.getPreAuthCompCount() + ")" + "PREAUTH COMP",
+                        PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getPreAuthCompAmount(), isDecimalEnabled),
+                        fontNormal, false);
+            }
+            if (settleData.getPreAuthCompVoidCount() > 0) {
+                printer.appendPrnStr("(" + settleData.getPreAuthCompVoidCount() + ")" + "VOID PREAUTH COMPLETE",
+                        "- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getPreAuthCompVoidAmount(), isDecimalEnabled),
+                        fontNormal, false);
+            }
         }
-        if (settleData.getWaveRefundCount() >= 0) {
-//            printColumnString("QR REFUND", settleData.getWaveRefundCount(), settleData.getWaveRefundAmount(), true);
-//            printer.appendPrnStr( "QR REFUND  " + countStringFormat(settleData.getWaveRefundCount()) + " " + "MMK" ,  PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getWaveRefundAmount(), isQrDecimalEnabled) , fontNormal, false);
-            printer.appendPrnStr( "(" + settleData.getWaveRefundCount() + ")" + "QR REFUND", "- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getWaveRefundAmount(), isQrDecimalEnabled) , fontNormal, false);
+        if (isWallet) {
+            if (settleData.getWavePayCount() > 0){
+                printer.appendPrnStr( "(" + settleData.getWavePayCount() + ")" + "QR PAY" ,  PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getWavePayAmount(), isQrDecimalEnabled) , fontNormal, false);
+            }
+            if (settleData.getWaveRefundCount() > 0) {
+                printer.appendPrnStr( "(" + settleData.getWaveRefundCount() + ")" + "QR REFUND", "- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getWaveRefundAmount(), isQrDecimalEnabled) , fontNormal, false);
+            }
         }
 //        dashBreak();
         dotBreak();