diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 2c60674..67995af 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -13,17 +13,6 @@ - - \ No newline at end of file diff --git a/app/src/main/java/com/utsmm/kbz/MainActivity.java b/app/src/main/java/com/utsmm/kbz/MainActivity.java index 1ee0326..5a0d356 100644 --- a/app/src/main/java/com/utsmm/kbz/MainActivity.java +++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java @@ -1,5 +1,6 @@ package com.utsmm.kbz; +import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; @@ -157,10 +158,10 @@ public class MainActivity extends AppCompatActivity implements } private void initKey(){ - SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius"); -// SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com"); - SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt"); -// SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com"); +// SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius"); + SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com"); +// SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt"); + SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com"); PinPad pinPad = MyApplication.getInstance().deviceEngine.getPinPad(); byte[] encryptedPIK = SystemParamsOperation.getInstance().getPIK(); diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java b/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java index c8732f3..6eecfb1 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java @@ -287,8 +287,8 @@ public class NetworkModule { tmsAddress = getTMSUrlFromNative(); } -// String baseUrl = tmsAddress.trim() + "/api/v1/"; //for on prim - String baseUrl = tmsAddress.trim() + "/"; //for uat and prod + String baseUrl = tmsAddress.trim() + "/api/v1/"; //for on prim +// String baseUrl = tmsAddress.trim() + "/"; //for uat and prod final Gson gson = new GsonBuilder().create(); 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 1790700..fbc7bd3 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 @@ -42,6 +42,7 @@ import com.utsmyanmar.paylibs.utils.print_utils.BitmapUtils; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.Comparator; import java.util.Date; import java.util.LinkedHashMap; @@ -432,32 +433,28 @@ public abstract class BaseXPrint { // printer.appendPrnStr("DATE :" + payDetail.getTransDate() + " TIME: " + payDetail.getTransTime(), fontNormal, AlignEnum.LEFT,false); - printer.appendPrnStr("DATE :" + POSUtil.getInstance().formatDisplayDate(payDetail.getTransDate()), fontNormal, AlignEnum.LEFT, false); - printer.appendPrnStr("TIME :" + payDetail.getTransTime(), fontNormal, AlignEnum.LEFT, false); + printer.appendPrnStr("DATE :" + POSUtil.getInstance().formatDisplayDate(payDetail.getTransDate()), fontNormal, AlignEnum.LEFT, false); + printer.appendPrnStr("TIME :" + payDetail.getTransTime(), fontNormal, AlignEnum.LEFT, false); if (Objects.equals(payDetail.getAccountType(), CardScheme.MPU_CTLS.name)) { hostName = HOST_NAME_MPU; } else { hostName = HOST_NAME_VM; } - printer.appendPrnStr("HOST:" + hostName, fontNormal, AlignEnum.LEFT,false); - printer.appendPrnStr("TID :" + payDetail.getTerminalNo(), fontNormal, AlignEnum.LEFT,false); - printer.appendPrnStr("MID :" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false); + printer.appendPrnStr("HOST :" + hostName, fontNormal, AlignEnum.LEFT,false); + printer.appendPrnStr("TID :" + payDetail.getTerminalNo(), fontNormal, AlignEnum.LEFT,false); + printer.appendPrnStr("MID :" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false); if (payDetail.getTransType().equals("SUMMARY_REPORT")) { - printer.appendPrnStr("BATCH NO :" + batchNum, fontNormal, AlignEnum.LEFT,false); + printer.appendPrnStr("BTH NO:" + batchNum, fontNormal, AlignEnum.LEFT,false); } else { // printer.printColumnsString(new String[]{"BATCH NO :" + batchNum, "INV NO: " + invoiceNo}, new int[]{2, 2}, new int[]{0, 2}, null); - printer.appendPrnStr("BATCH NO :" + batchNum + " TRACE NO:" + traceNo, fontNormal, AlignEnum.LEFT,false); + printer.appendPrnStr("BTH NO:" + batchNum + " TRACE NO:" + traceNo, fontNormal, AlignEnum.LEFT,false); } printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false); printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false); - - printer.appendPrnStr(transType.replace("_", " "), fontNormal, AlignEnum.CENTER,true); - - printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false); printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false); @@ -1007,6 +1004,32 @@ public abstract class BaseXPrint { } + public static List wrapAddressText(String text, int maxLen) { + List lines = new ArrayList<>(); + String[] words = text.split("\\s+"); + + StringBuilder currentLine = new StringBuilder(); + + for (String word : words) { + // +1 for space (if line is not empty) + if (currentLine.length() + word.length() + 1 <= maxLen) { + if (currentLine.length() > 0) { + currentLine.append(" "); + } + currentLine.append(word); + } else { + lines.add(currentLine.toString()); + currentLine = new StringBuilder(word); + } + } + + if (currentLine.length() > 0) { + lines.add(currentLine.toString()); + } + + return lines; + } + protected void printMerchantHeader() { String receiptHeader = ""; String merchantName = ""; @@ -1016,41 +1039,27 @@ public abstract class BaseXPrint { String merchantPhoneNo = ""; String terminalName = ""; - merchantName = SystemParamsOperation.getInstance().getMerchantName(); receiptHeader = SystemParamsOperation.getInstance().getReceiptHeader(); merchantAddress = SystemParamsOperation.getInstance().getMerchantAddress(); - merchantAddress2 = SystemParamsOperation.getInstance().getMerchantAddress2(); - merchantAddress3 = SystemParamsOperation.getInstance().getMerchantAddress3(); - merchantPhoneNo = SystemParamsOperation.getInstance().getMerchantPhoneNo(); terminalName = SystemParamsOperation.getInstance().getTerminalName(); + List result = wrapAddressText(merchantAddress, 29); + if (receiptHeader == null || TextUtils.equals(receiptHeader, "") || receiptHeader.trim().isEmpty()) { receiptHeader = merchantName; } if (TextUtils.equals(merchantAddress, "") || merchantAddress == null) { merchantAddress = ""; } - if (TextUtils.equals(merchantAddress2, "") || merchantAddress2 == null) { - merchantAddress2 = ""; - } - if (TextUtils.equals(merchantAddress3, "") || merchantAddress3 == null) { - merchantAddress3 = ""; - } -// if (TextUtils.equals(merchantPhoneNo, "") || merchantPhoneNo == null) { -// merchantPhoneNo = "MERCHANT PHONENO"; -// } if(TextUtils.equals(terminalName, "") || terminalName == null){ terminalName = ""; } -// emptyLine(1); -// printer.appendPrnStr(receiptHeader, fontNormal, AlignEnum.CENTER,false); printer.appendPrnStr(terminalName, fontNormal, AlignEnum.CENTER, true); - printer.appendPrnStr(merchantAddress, fontNormal, AlignEnum.CENTER,false); - printer.appendPrnStr(merchantAddress2, fontNormal, AlignEnum.CENTER,false); - printer.appendPrnStr(merchantAddress3, fontNormal, AlignEnum.CENTER,false); -// printer.appendPrnStr(merchantPhoneNo, fontNormal, AlignEnum.CENTER,false); -// emptyLine(1); + for (String line : result) { + printer.appendPrnStr(line, fontNormal, AlignEnum.CENTER, false); + } + dotBreak(); } 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 6a4f038..c9dd4c1 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 @@ -42,10 +42,10 @@ public class SystemParamsSettings implements Serializable { // private String tmsAddress = "https://tms.smile-mm.com"; // private String tmsAddress = "http://128.199.170.203"; -// private String tmsAddress = "https://sirius-nest.utsmyanmar.com"; - private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; //for uat -// private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com"; //for on prime - private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; //for uat + private String tmsAddress = "https://sirius-nest.utsmyanmar.com"; +// private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; //for uat + private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com"; //for on prime +// private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; //for uat private String binValues = "";