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 89c7fd3..834e683 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 @@ -38,7 +38,9 @@ import com.utsmyanmar.paylibs.utils.iso_utils.TransactionType; import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType; import com.utsmyanmar.paylibs.utils.print_utils.BitmapUtils; +import java.text.SimpleDateFormat; import java.util.Comparator; +import java.util.Date; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; @@ -740,6 +742,27 @@ public abstract class BaseXPrint { printer.appendPrnStr(first + " " + second + " " + third, fontNormal, AlignEnum.LEFT,isBold); } + protected void dotBreak(){ + printer.appendPrnStr(new String(new char[29]).replace("\0", "."), fontNormal, AlignEnum.LEFT, false); + } + + protected void printTranHeader(String title){ + SimpleDateFormat date = new SimpleDateFormat("dd MMM yyyy", Locale.getDefault()); + String printedDate = date.format(new Date()); + + SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss", Locale.getDefault()); + String printedTime = time.format(new Date()); + + printer.appendPrnStr("PRINTED DATE", printedDate, fontNormal, false); + printer.appendPrnStr("", printedTime, fontNormal, false); + printer.appendPrnStr(title, fontNormal , AlignEnum.CENTER, false); + +// if (payDetail.getTransactionType() == TransactionsType.MMQR.value && payDetail.getQrTransStatus() == 1) { +//// printer.appendPrnStr("TRACE NO:" + traceNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false); +// printer.appendPrnStr("INV NO :" + invoiceNo , fontNormal, AlignEnum.LEFT,false); +// } + dotBreak(); + } protected void printTransDetailReport(List lists, HostType hostType) { 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 b0f4aa5..8760afa 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 @@ -192,8 +192,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX { printLogo(); printMerchantHeader(); printTransHeader(payDetail); -// printTransDetailSettlement(payDetail); - printTransDetailSettlement(payDetail,payDetail.getCardSettleData()); + printTransDetailSettlement(payDetail); printTransFooterSummary(); emptyLine(1); @@ -261,6 +260,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX { setHeight(0x12); printLogo(); + printMerchantHeader(); printTransHeader(payDetail); printTransDetail(payDetail); diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldConfig.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldConfig.java index 1d1d8df..f1edc7b 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldConfig.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldConfig.java @@ -108,8 +108,8 @@ public class FieldConfig { /* FLD 53 */ {2, SDK_8583_LEN_ASC, 32, SDK_8583_DATA_BCD, SDK_8583_ALIGN_L, '0'}, /* FLD 54 */ {3, SDK_8583_LEN_BCD, 40, SDK_8583_DATA_ASC, SDK_8583_ALIGN_L, ' '}, - /* FLD 55 */ {3, SDK_8583_LEN_ASC, 255, SDK_8583_DATA_BIT, SDK_8583_ALIGN_L, '0'}, -// /* FLD 55 */ {4, SDK_8583_LEN_BCD, 255, SDK_8583_DATA_BIT, SDK_8583_ALIGN_L, '0'}, +// /* FLD 55 */ {3, SDK_8583_LEN_ASC, 255, SDK_8583_DATA_BIT, SDK_8583_ALIGN_L, '0'}, + /* FLD 55 */ {4, SDK_8583_LEN_BCD, 255, SDK_8583_DATA_BIT, SDK_8583_ALIGN_L, '0'}, /* FLD 56 */ {0, SDK_8583_LEN_BCD, 12, SDK_8583_DATA_BCD, SDK_8583_ALIGN_R, '0'}, // /* FLD 57 */ {3, SDK_8583_LEN_BCD, 999, SDK_8583_DATA_ASC, SDK_8583_ALIGN_R, '0'},