From 31705e6a9ffbcb5605fbb0dbd7e98c1743651843 Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Mon, 25 May 2026 14:20:39 +0630 Subject: [PATCH] Merge branch 'production_2.2' into test --- .../main/java/com/utsmm/kbz/MainActivity.java | 6 +- .../ui/settlement/SettlementViewModel.java | 4 ++ .../layout/fragment_capture_card_screen.xml | 1 + .../res/layout/fragment_view_batch_screen.xml | 57 +++++++++++++++++++ app/src/main/res/values/strings.xml | 1 + .../paylibs/print/printx/BaseXPrint.java | 30 ++++++---- .../paylibs/print/printx/PrintXImpl.java | 3 +- .../core_utils/SystemParamsSettings.java | 6 +- 8 files changed, 92 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/utsmm/kbz/MainActivity.java b/app/src/main/java/com/utsmm/kbz/MainActivity.java index ea2f59d..e4535b9 100644 --- a/app/src/main/java/com/utsmm/kbz/MainActivity.java +++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java @@ -160,8 +160,10 @@ public class MainActivity extends AppCompatActivity implements } private void initKey(){ - SystemParamsOperation.getInstance().setTmsAddress("https://api-tms.kbzbank.com/sirius"); - SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms.kbzbank.com/receipt"); +// SystemParamsOperation.getInstance().setTmsAddress("https://api-tms.kbzbank.com/sirius"); +// SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms.kbzbank.com/receipt"); + SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius"); + SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt"); PinPad pinPad = MyApplication.getInstance().deviceEngine.getPinPad(); byte[] encryptedPIK = SystemParamsOperation.getInstance().getPIK(); diff --git a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java index 951443f..8a3afbb 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java @@ -77,6 +77,10 @@ public class SettlementViewModel extends ViewModel { public SingleLiveEvent sale_count = new SingleLiveEvent<>(); public SingleLiveEvent sale_amount = new SingleLiveEvent<>(); public SingleLiveEvent sale_breakdown = new SingleLiveEvent<>(); + + public SingleLiveEvent void_count = new SingleLiveEvent<>(); + public SingleLiveEvent void_amount = new SingleLiveEvent<>(); + public SingleLiveEvent void_breakdown = new SingleLiveEvent<>(); public SingleLiveEvent pre_count = new SingleLiveEvent<>(); public SingleLiveEvent pre_amount = new SingleLiveEvent<>(); diff --git a/app/src/main/res/layout/fragment_capture_card_screen.xml b/app/src/main/res/layout/fragment_capture_card_screen.xml index 3445f63..6b25b95 100644 --- a/app/src/main/res/layout/fragment_capture_card_screen.xml +++ b/app/src/main/res/layout/fragment_capture_card_screen.xml @@ -144,6 +144,7 @@ + + + + + + + + + + + + + + + Count Totals Sale + Void Sale Completion Refund Amount 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 e3e43f4..cfa4828 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 @@ -290,9 +290,9 @@ public abstract class BaseXPrint { } private void printSettlementCurrencySection(String currencyLabel, CurrencySettlementSummary summary) { - if (!summary.hasAnyValue()) { - return; - } +// if (!summary.hasAnyValue()) { +// return; +// } boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable(); int totalCount = summary.saleCount + summary.preAuthCompCount + summary.refundCount + summary.cashAdvanceCount; @@ -390,6 +390,13 @@ public abstract class BaseXPrint { } + protected void printTransFooterForSettlement() { + String receiptFooter = SystemParamsOperation.getInstance().getReceiptFooter(); + String finalVersion = SystemParamsOperation.getInstance().getFinalVersion(); + printer.appendPrnStr("***** SETTLEMENT CONFIRM *****", fontNormal, AlignEnum.CENTER,false); + printer.appendPrnStr(receiptFooter, fontNormal, AlignEnum.CENTER,false); + } + protected void printTransDetail(PayDetail payDetail) { @@ -1600,10 +1607,10 @@ public abstract class BaseXPrint { }else{ if(isSettlement && isDuelCurrency){ - printer.appendPrnStr("MID :" + safe(SystemParamsOperation.getInstance().getMerchantId()), fontNormal, AlignEnum.LEFT, false); - printer.appendPrnStr("TID :" + safe(SystemParamsOperation.getInstance().getTerminalId()), fontNormal, AlignEnum.LEFT, false); - printer.appendPrnStr("MID :" + safe(SystemParamsOperation.getInstance().getThirdHostMerchantId()), fontNormal, AlignEnum.LEFT, false); - printer.appendPrnStr("TID :" + safe(SystemParamsOperation.getInstance().getThirdHostTerminalId()), fontNormal, AlignEnum.LEFT, false); + printer.appendPrnStr("MID :" + SystemParamsOperation.getInstance().getMerchantId(), fontNormal, AlignEnum.LEFT, false); + printer.appendPrnStr("TID :" + SystemParamsOperation.getInstance().getTerminalId(), fontNormal, AlignEnum.LEFT, false); + printer.appendPrnStr("MID :" + SystemParamsOperation.getInstance().getThirdHostMerchantId(), fontNormal, AlignEnum.LEFT, false); + printer.appendPrnStr("TID :" + SystemParamsOperation.getInstance().getThirdHostTerminalId(), fontNormal, AlignEnum.LEFT, false); }else{ printer.appendPrnStr("MID :" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false); printer.appendPrnStr("TID :" + payDetail.getTerminalNo(), fontNormal, AlignEnum.LEFT,false); @@ -1739,16 +1746,17 @@ public abstract class BaseXPrint { // ---------- PRIMARY HOST ---------- printer.appendPrnStr("PRIMARY HOST", fontNormal, AlignEnum.LEFT, true); - printer.appendPrnStr("Name : " + safe(sp.getHostName()), fontNormal, AlignEnum.LEFT, false); - printer.appendPrnStr("TID : " + safe(sp.getTerminalId()), fontNormal, AlignEnum.LEFT, false); - printer.appendPrnStr("MID : " + safe(sp.getMerchantId()), fontNormal, AlignEnum.LEFT, false); + printer.appendPrnStr("Name : " + sp.getHostName(), fontNormal, AlignEnum.LEFT, false); + printer.appendPrnStr("TID : " + sp.getTerminalId(), fontNormal, AlignEnum.LEFT, false); + printer.appendPrnStr("MID : " + sp.getMerchantId(), fontNormal, AlignEnum.LEFT, false); String[] ipPort = splitIpAndPort(sp.getIpAddress()); printer.appendPrnStr("Primary IP : " + ipPort[0], fontNormal, AlignEnum.LEFT, false); printer.appendPrnStr("Primary Port : " + ipPort[1], fontNormal, AlignEnum.LEFT, false); String[] secIpPort = splitIpAndPort(sp.getSecIpAddress()); printer.appendPrnStr("Secondary IP : " + secIpPort[0], fontNormal, AlignEnum.LEFT, false); printer.appendPrnStr("Secondary Port: " + secIpPort[1], fontNormal, AlignEnum.LEFT, false); - printer.appendPrnStr("Currency : " + normalizeHostCurrency(sp.getCurrencyType() == null ? "" : sp.getCurrencyType().toString()), fontNormal, AlignEnum.LEFT, false); + sp.getCurrencyType(); + printer.appendPrnStr(sp.getCurrencyType().toString(), fontNormal, AlignEnum.LEFT, false); dotBreak(); // ---------- SECONDARY HOST (optional) ---------- if (!TextUtils.isEmpty(sp.getSecHostName())) { 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 4acbb91..3f0a970 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 @@ -193,7 +193,8 @@ public class PrintXImpl extends BaseXPrint implements PrintX { printMerchantHeader(); printTransHeader(payDetail); printTransDetailSettlement(payDetail); - printTransFooterSummary(); +// printTransFooterSummary(); + printTransFooterForSettlement(); emptyLine(1); startPrintNex(); diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java index c845781..59c75d8 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java @@ -40,8 +40,10 @@ public class SystemParamsSettings implements Serializable { private boolean checkExpSwitch = false; - private String tmsAddress = "https://api-tms.kbzbank.com/sirius"; - private String ereceiptAddress = "https://api-tms.kbzbank.com/receipt"; +// private String tmsAddress = "https://api-tms.kbzbank.com/sirius"; +// private String ereceiptAddress = "https://api-tms.kbzbank.com/receipt"; + private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; + private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; private String binValues = ""; private String restrictedBinValues = "";