Merge branch 'merge_latest_SIT' of https://hub.utsmyanmar.com/Kyaw_Min_Khant/KBZ-POS into merge_latest_SIT

app/src/main/java/com/utsmm/kbz/ui/core_ui/TransactionResultFragment.java

@@ -248,12 +248,9 @@ public class TransactionResultFragment extends DataBindingFragment implements Da
                     } catch (IOException | JsonSyntaxException ex) {
                         ex.printStackTrace();
                     }
-
                 } else {
-
                     LogUtil.d(TAG,getResourceString(R.string.txt_failure)+throwable.getMessage());
                 }
-
                 throwable.printStackTrace();
             }
 

paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java

@@ -668,7 +668,7 @@ public abstract class BaseXPrint {
             print2ColumnsString("REF NUM", "");
         } else if (hostType == HostType.QR) {
             print2ColumnsString("PAYMENT NAME", "");
-            print2ColumnsString("EXP DATE", "");
+            print2ColumnsString("DATE", "TIME");
             print2ColumnsString("TRANSACTION", "TRACE NO");
             print2ColumnsString("TRXN ID", "");
             print2ColumnsString("AMOUNT", "");
@@ -695,7 +695,7 @@ public abstract class BaseXPrint {
                 } else {
                     print2ColumnsString(pay.getCustomerMobile(), "");
                 }
-                print2ColumnsString("**/**", "");
+                print2ColumnsString(pay.getTransDate(), pay.getTransTime());
                 print2ColumnsString(pay.getTransType().replace("_", " "), pay.getVoucherNo());
                 if (pay.getTransactionType() == TransactionsType.MMQR_REFUND.value) {
                     print2ColumnsString(pay.getReferNo() + "(RRN)", "");
@@ -767,7 +767,7 @@ public abstract class BaseXPrint {
         dashBreak();
         print2ColumnsString("Refund Total:MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal));
         dashBreak();
-        print2ColumnsString("Sale Total:MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount));
+        print2ColumnsString("Sale Total  :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount));
         dashBreakEnding();
         emptyLine(2);
 
@@ -776,7 +776,6 @@ public abstract class BaseXPrint {
 
     private void printErrorBlock(String msg) {
 
-
         lineBreak();
         emptyLine(3);
 
@@ -987,7 +986,8 @@ public abstract class BaseXPrint {
         printer.appendPrnStr("DATE      :" + POSUtil.getInstance().formatDisplayDate(payDetail.getTransDate()), fontNormal, AlignEnum.LEFT, false);
         printer.appendPrnStr("TIME      :" + payDetail.getTransTime(), fontNormal, AlignEnum.LEFT, false);
         if (payDetail.getTransactionType() == TransactionsType.MMQR.value && payDetail.getQrTransStatus() == 1) {
-            printer.appendPrnStr("TRACE NO:" + traceNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false);
+//            printer.appendPrnStr("TRACE NO:" + traceNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false);
+            printer.appendPrnStr("INV NO    :" + invoiceNo , fontNormal, AlignEnum.LEFT,false);
         } else if (!payDetail.getTransType().equals(SETTLEMENT) && !payDetail.getTransType().equals(SUMMARY) && payDetail.getTransactionType() != TransactionsType.MMQR_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value) {
             printer.appendPrnStr("BTH NO  :" + batchNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false);
         } else if (payDetail.getTransType().equals(SUMMARY)) {
@@ -996,7 +996,7 @@ public abstract class BaseXPrint {
         /* 17 Sept 2024 Yoma requested to changed slip design for QR*/
 //            printer.printColumnsString(new String[]{"MID    :" + payDetail.getMerchantNo(), ""}, new int[]{3, 1}, new int[]{0, 2}, innerResultCallback);
 //            printer.printColumnsString(new String[]{"TID    :" + payDetail.getTerminalNo(), ""}, new int[]{3, 1}, new int[]{0, 2}, innerResultCallback);
-        if (payDetail.getTransactionType() == TransactionsType.MMQR.value){
+        if (payDetail.getTransactionType() == TransactionsType.MMQR.value || payDetail.getTransactionType() == TransactionsType.MMQR_REFUND.value){
             printer.appendPrnStr("SHORT CODE:" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false);
         }else{
             printer.appendPrnStr("MID     :" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false);
@@ -1028,7 +1028,8 @@ public abstract class BaseXPrint {
         printer.appendPrnStr("DATE      :" + POSUtil.getInstance().formatDisplayDate(payDetail.getTransDate()), fontNormal, AlignEnum.LEFT, false);
         printer.appendPrnStr("TIME      :" + payDetail.getTransTime(), fontNormal, AlignEnum.LEFT, false);
         if (payDetail.getTransactionType() == TransactionsType.MMQR.value && payDetail.getQrTransStatus() == 1) {
-            printer.appendPrnStr("TRACE NO:" + traceNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false);
+//            printer.appendPrnStr("TRACE NO:" + traceNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false);
+            printer.appendPrnStr("INV NO    :" + invoiceNo , fontNormal, AlignEnum.LEFT,false);
         } else if (!payDetail.getTransType().equals(SETTLEMENT) && !payDetail.getTransType().equals(SUMMARY) && payDetail.getTransactionType() != TransactionsType.MMQR_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value) {
             printer.appendPrnStr("BTH NO  :" + batchNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false);
         } else if (payDetail.getTransType().equals(SUMMARY)) {

paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java

@@ -234,7 +234,6 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
             printMerchantHeader();
             printTransHeader(payDetail, hostType);
             printTransDetailReport(lists,hostType);
-
 //            emptyLine(1);
             startPrintNex();
         } catch (RemoteException e) {