date time in detail report
This commit is contained in:
parent
4c77b376f0
commit
1f1eaca712
@ -248,12 +248,9 @@ public class TransactionResultFragment extends DataBindingFragment implements Da
|
|||||||
} catch (IOException | JsonSyntaxException ex) {
|
} catch (IOException | JsonSyntaxException ex) {
|
||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
LogUtil.d(TAG,getResourceString(R.string.txt_failure)+throwable.getMessage());
|
LogUtil.d(TAG,getResourceString(R.string.txt_failure)+throwable.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
throwable.printStackTrace();
|
throwable.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -667,7 +667,7 @@ public abstract class BaseXPrint {
|
|||||||
print2ColumnsString("REF NUM", "");
|
print2ColumnsString("REF NUM", "");
|
||||||
} else if (hostType == HostType.QR) {
|
} else if (hostType == HostType.QR) {
|
||||||
print2ColumnsString("PAYMENT NAME", "");
|
print2ColumnsString("PAYMENT NAME", "");
|
||||||
print2ColumnsString("EXP DATE", "");
|
print2ColumnsString("DATE", "TIME");
|
||||||
print2ColumnsString("TRANSACTION", "TRACE NO");
|
print2ColumnsString("TRANSACTION", "TRACE NO");
|
||||||
print2ColumnsString("TRXN ID", "");
|
print2ColumnsString("TRXN ID", "");
|
||||||
print2ColumnsString("AMOUNT", "");
|
print2ColumnsString("AMOUNT", "");
|
||||||
@ -694,7 +694,7 @@ public abstract class BaseXPrint {
|
|||||||
} else {
|
} else {
|
||||||
print2ColumnsString(pay.getCustomerMobile(), "");
|
print2ColumnsString(pay.getCustomerMobile(), "");
|
||||||
}
|
}
|
||||||
print2ColumnsString("**/**", "");
|
print2ColumnsString(pay.getTransDate(), pay.getTransTime());
|
||||||
print2ColumnsString(pay.getTransType().replace("_", " "), pay.getVoucherNo());
|
print2ColumnsString(pay.getTransType().replace("_", " "), pay.getVoucherNo());
|
||||||
if (pay.getTransactionType() == TransactionsType.MMQR_REFUND.value) {
|
if (pay.getTransactionType() == TransactionsType.MMQR_REFUND.value) {
|
||||||
print2ColumnsString(pay.getReferNo() + "(RRN)", "");
|
print2ColumnsString(pay.getReferNo() + "(RRN)", "");
|
||||||
@ -770,7 +770,6 @@ public abstract class BaseXPrint {
|
|||||||
|
|
||||||
private void printErrorBlock(String msg) {
|
private void printErrorBlock(String msg) {
|
||||||
|
|
||||||
|
|
||||||
lineBreak();
|
lineBreak();
|
||||||
emptyLine(3);
|
emptyLine(3);
|
||||||
|
|
||||||
@ -981,7 +980,8 @@ public abstract class BaseXPrint {
|
|||||||
printer.appendPrnStr("DATE :" + POSUtil.getInstance().formatDisplayDate(payDetail.getTransDate()), 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("TIME :" + payDetail.getTransTime(), fontNormal, AlignEnum.LEFT, false);
|
||||||
if (payDetail.getTransactionType() == TransactionsType.MMQR.value && payDetail.getQrTransStatus() == 1) {
|
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) {
|
} 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);
|
printer.appendPrnStr("BTH NO :" + batchNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false);
|
||||||
} else if (payDetail.getTransType().equals(SUMMARY)) {
|
} else if (payDetail.getTransType().equals(SUMMARY)) {
|
||||||
@ -990,7 +990,7 @@ public abstract class BaseXPrint {
|
|||||||
/* 17 Sept 2024 Yoma requested to changed slip design for QR*/
|
/* 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[]{"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);
|
// 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);
|
printer.appendPrnStr("SHORT CODE:" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false);
|
||||||
}else{
|
}else{
|
||||||
printer.appendPrnStr("MID :" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false);
|
printer.appendPrnStr("MID :" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false);
|
||||||
@ -1022,7 +1022,8 @@ public abstract class BaseXPrint {
|
|||||||
printer.appendPrnStr("DATE :" + POSUtil.getInstance().formatDisplayDate(payDetail.getTransDate()), 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("TIME :" + payDetail.getTransTime(), fontNormal, AlignEnum.LEFT, false);
|
||||||
if (payDetail.getTransactionType() == TransactionsType.MMQR.value && payDetail.getQrTransStatus() == 1) {
|
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) {
|
} 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);
|
printer.appendPrnStr("BTH NO :" + batchNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false);
|
||||||
} else if (payDetail.getTransType().equals(SUMMARY)) {
|
} else if (payDetail.getTransType().equals(SUMMARY)) {
|
||||||
|
|||||||
@ -233,7 +233,6 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
|
|||||||
printMerchantHeader();
|
printMerchantHeader();
|
||||||
printTransHeader(payDetail, hostType);
|
printTransHeader(payDetail, hostType);
|
||||||
printTransDetailReport(lists,hostType);
|
printTransDetailReport(lists,hostType);
|
||||||
|
|
||||||
// emptyLine(1);
|
// emptyLine(1);
|
||||||
startPrintNex();
|
startPrintNex();
|
||||||
} catch (RemoteException e) {
|
} catch (RemoteException e) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user