Kyaw_Min_Khant/KBZ-POS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manual settlement completed

Browse Source
This commit is contained in:
moon 2026-07-09 17:08:09 +06:30
parent aad5652988
commit 8c85699c5f
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
View File

@ -237,23 +237,23 @@ public abstract class BaseXPrint {
protected void printTransDetailSettlement(PayDetail payDetail, List<CardSettleData> cardSettleDataList) { protected void printTransDetailSettlement(PayDetail payDetail, List<CardSettleData> cardSettleDataList) {
boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable(); boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable();
lineBreak(); dotBreak();
print2SideStringMargin("CARD TYPE ", "CARD NUMBER"); print2SideStringMargin("CARD TYPE ", "CARD NUMBER");
print2SideStringMargin("EXP DATE ", "INVOICE NUM"); print2SideStringMargin("EXP DATE ", "INVOICE NUM");
print2SideStringMargin("TRANSACTION ", "AMOUNT"); print2SideStringMargin("TRANSACTION ", "AMOUNT");
print2SideStringMargin("APPR CODE ", "DATE/TIME"); print2SideStringMargin("APPR CODE ", "DATE/TIME");
lineBreak(); dotBreak();
for (CardSettleData cardSettleData : cardSettleDataList) { for (CardSettleData cardSettleData : cardSettleDataList) {
print2SideStringMargin(cardSettleData.getCardType(), PrintUtils.getInstance().maskCardNumberPciDss(cardSettleData.getCardNum())); print2SideStringMargin(cardSettleData.getCardType(), PrintUtils.getInstance().maskCardNumberPciDss(cardSettleData.getCardNum()));
print2SideStringMargin("INV NO", cardSettleData.getInvoiceNum()); print2SideStringMargin("**/**", cardSettleData.getInvoiceNum());
String cardCurrency = currencyCodeToText(cardSettleData.getCurrencyCode()); String cardCurrency = currencyCodeToText(cardSettleData.getCurrencyCode());
print2SideStringMargin(cardSettleData.getTransType(), cardCurrency + " " + PrintUtils.getInstance().getSeparatorNumberFormat(cardSettleData.getAmount(), isDecimalEnabled)); print2SideStringMargin(cardSettleData.getTransType(), cardCurrency + " " + PrintUtils.getInstance().getSeparatorNumberFormat(cardSettleData.getAmount(), isDecimalEnabled));
print2SideStringMargin(cardSettleData.getApprovalCode(), cardSettleData.getTransDate() + " " + cardSettleData.getTransTime()); print2SideStringMargin(cardSettleData.getApprovalCode(), cardSettleData.getTransDate() + " " + cardSettleData.getTransTime());
emptyLine(1); emptyLine(1);
} }
lineBreak(); dotBreak();
SettleData settleData = payDetail.getSettleDataObj(); SettleData settleData = payDetail.getSettleDataObj();
long totalAmount = settleData.getSaleAmount() + settleData.getPreAuthCompAmount() + settleData.getCashAdvanceAmount() long totalAmount = settleData.getSaleAmount() + settleData.getPreAuthCompAmount() + settleData.getCashAdvanceAmount()
- settleData.getVoidSaleAmount() - settleData.getRefundAmount(); - settleData.getVoidSaleAmount() - settleData.getRefundAmount();
@ -267,10 +267,8 @@ public abstract class BaseXPrint {
print3ColumnsString("CASH ADV ", countStringFormat(settleData.getCashAdvanceCount()), PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getCashAdvanceAmount(), isDecimalEnabled)); print3ColumnsString("CASH ADV ", countStringFormat(settleData.getCashAdvanceCount()), PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getCashAdvanceAmount(), isDecimalEnabled));
print3ColumnsString("REFUND ", countStringFormat(settleData.getRefundCount()), "- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getRefundAmount(), isDecimalEnabled)); print3ColumnsString("REFUND ", countStringFormat(settleData.getRefundCount()), "- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getRefundAmount(), isDecimalEnabled));
dotBreak(); dotBreak();
print3ColumnsString("TOTAL ", "", PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount, isDecimalEnabled)); print2ColumnsString("TOTAL", PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount, isDecimalEnabled));
emptyLine(2); emptyLine(1);
} }
protected void printMMQRReport(List<QRSettleData> qrList) { protected void printMMQRReport(List<QRSettleData> qrList) {
@ -280,9 +278,9 @@ public abstract class BaseXPrint {
long refundTotal = 0; long refundTotal = 0;
emptyLine(1); emptyLine(1);
dashBreak();
printString("MMQR REPORT", true); printer.appendPrnStr("MMQR REPORT",fontLarge, AlignEnum.CENTER, true);
dashBreak(); dotBreak();
for (QRSettleData data : qrList) { for (QRSettleData data : qrList) {
if (data.getTransactionType() == TransactionsType.MMQR_REFUND.value) { if (data.getTransactionType() == TransactionsType.MMQR_REFUND.value) {
@ -303,12 +301,15 @@ public abstract class BaseXPrint {
long grandTotal = saleTotal - refundTotal; long grandTotal = saleTotal - refundTotal;
dashBreak(); dotBreak();
printer.appendPrnStr("Refund Total:MMK", "- " + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal) + " ", fontNormal, false); // printer.appendPrnStr("Refund Total:MMK", "- " + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal) + " ", fontNormal, false);
dashBreak(); print2ColumnsString("Refund Total:MMK", "-" + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal));
printer.appendPrnStr("Sale Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(saleTotal) + " ", fontNormal, false); dotBreak();
dashBreak(); // printer.appendPrnStr("Sale Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(saleTotal) + " ", fontNormal, false);
printer.appendPrnStr("Grand Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(grandTotal) + " ", fontNormal, false); print2ColumnsString("SALE TOTAL :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(saleTotal));
dotBreak();
// printer.appendPrnStr("Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(grandTotal) + " ", fontNormal, false);
print2ColumnsString("TOTAL : MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(grandTotal));
dashBreakEnding(); dashBreakEnding();
emptyLine(1); emptyLine(1);
} }
@ -418,7 +419,7 @@ public abstract class BaseXPrint {
protected void printTransFooterForSettlement() { protected void printTransFooterForSettlement() {
String receiptFooter = SystemParamsOperation.getInstance().getReceiptFooter(); String receiptFooter = SystemParamsOperation.getInstance().getReceiptFooter();
String finalVersion = SystemParamsOperation.getInstance().getFinalVersion(); String finalVersion = SystemParamsOperation.getInstance().getFinalVersion();
printer.appendPrnStr("***** SETTLEMENT CONFIRM *****", fontNormal, AlignEnum.CENTER, false); printer.appendPrnStr("**** SETTLEMENT CONFIRMED ****", fontNormal, AlignEnum.CENTER, false);
printer.appendPrnStr(receiptFooter, fontNormal, AlignEnum.CENTER, false); printer.appendPrnStr(receiptFooter, fontNormal, AlignEnum.CENTER, false);
} }