Kyaw_Min_Khant/KBZ-POS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logic change for invoice number not to increace

Browse Source
This commit is contained in:
moon 2026-06-18 14:42:09 +06:30
parent 0289013a58
commit 1e29fd9fab
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/EmvTransactionProcessViewModel.java
View File

@ -287,7 +287,11 @@ public class EmvTransactionProcessViewModel extends EmvBaseViewModel implements
/*Jun 15 2022*/ /*Jun 15 2022*/
PayDetail payDetailRes = tradeData.getPayDetail(); PayDetail payDetailRes = tradeData.getPayDetail();
if (transType.getValue() == TransactionsType.VOID) {
payDetailRes.setInvoiceNo(mPayDetail.getInvoiceNo());
} else {
payDetailRes.setInvoiceNo(SystemParamsOperation.getInstance().getIncrementInvoiceNum()); payDetailRes.setInvoiceNo(SystemParamsOperation.getInstance().getIncrementInvoiceNum());
}
LogUtil.d(TAG,"Transaction Operation Success: "+payDetailRes.getTradeAnswerCode()); LogUtil.d(TAG,"Transaction Operation Success: "+payDetailRes.getTradeAnswerCode());
LogUtil.d(TAG,"Transaction Type: "+payDetailRes.getTransactionType()); LogUtil.d(TAG,"Transaction Type: "+payDetailRes.getTransactionType());
@ -388,13 +392,16 @@ public class EmvTransactionProcessViewModel extends EmvBaseViewModel implements
@Override @Override
public void startDemoProcess() { public void startDemoProcess() {
if (transType.getValue() != TransactionsType.VOID) {
SystemParamsOperation.getInstance().getIncrementInvoiceNum(); SystemParamsOperation.getInstance().getIncrementInvoiceNum();
}
PayDetail payDetailRes; PayDetail payDetailRes;
if (transType.getValue() == TransactionsType.VOID) { if (transType.getValue() == TransactionsType.VOID) {
payDetailRes = DemoUtil.getInstance().builtDemoVoid(mPayDetail); payDetailRes = DemoUtil.getInstance().builtDemoVoid(mPayDetail);
payDetailRes.setInvoiceNo(mPayDetail.getInvoiceNo());
processVoidDB(payDetailRes); processVoidDB(payDetailRes);
} else if (transType.getValue() == TransactionsType.REFUND) { } else if (transType.getValue() == TransactionsType.REFUND) {

7
app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/TransProcessViewModel.java
View File

@ -139,7 +139,11 @@ public class TransProcessViewModel extends ViewModel implements ProcessingTransa
LogUtil.d(TAG,"Transaction Operation Success: "+payDetailRes.getTradeAnswerCode()); LogUtil.d(TAG,"Transaction Operation Success: "+payDetailRes.getTradeAnswerCode());
if (TextUtils.equals(payDetailRes.getTradeAnswerCode(),RC_APPROVED_V1) || TextUtils.equals(payDetailRes.getTradeAnswerCode(),RC_APPROVED_V2)) { if (TextUtils.equals(payDetailRes.getTradeAnswerCode(),RC_APPROVED_V1) || TextUtils.equals(payDetailRes.getTradeAnswerCode(),RC_APPROVED_V2)) {
if (transType.getValue() == TransactionsType.VOID) {
payDetailRes.setInvoiceNo(payDetail.getInvoiceNo());
} else {
payDetailRes.setInvoiceNo(SystemParamsOperation.getInstance().getIncrementInvoiceNum()); payDetailRes.setInvoiceNo(SystemParamsOperation.getInstance().getIncrementInvoiceNum());
}
LogUtil.d(TAG,"MPU Transaction type :"+transType.getValue()); LogUtil.d(TAG,"MPU Transaction type :"+transType.getValue());
@ -229,13 +233,16 @@ public class TransProcessViewModel extends ViewModel implements ProcessingTransa
@Override @Override
public void startDemoProcess() { public void startDemoProcess() {
if (transType.getValue() != TransactionsType.VOID) {
SystemParamsOperation.getInstance().getIncrementInvoiceNum(); SystemParamsOperation.getInstance().getIncrementInvoiceNum();
}
PayDetail payDetailRes; PayDetail payDetailRes;
if (transType.getValue() == TransactionsType.VOID) { if (transType.getValue() == TransactionsType.VOID) {
payDetailRes = DemoUtil.getInstance().builtDemoVoid(payDetail); payDetailRes = DemoUtil.getInstance().builtDemoVoid(payDetail);
payDetailRes.setInvoiceNo(payDetail.getInvoiceNo());
processVoidDB(payDetailRes); processVoidDB(payDetailRes);
} else if (transType.getValue() == TransactionsType.REFUND) { } else if (transType.getValue() == TransactionsType.REFUND) {

10
paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
View File

@ -405,7 +405,7 @@ public abstract class BaseXPrint {
print2ColumnsStringNoSpace("ENTRY MODE :", PrintUtils.getInstance().getEntryType(payDetail.getCardType())); print2ColumnsStringNoSpace("ENTRY MODE :", PrintUtils.getInstance().getEntryType(payDetail.getCardType()));
print2ColumnsStringNoSpace("EXP DATE :", PrintUtils.getInstance().getFormatExpDate(payDetail.getEXPDate())); print2ColumnsStringNoSpace("EXP DATE :", PrintUtils.getInstance().getFormatExpDate(payDetail.getEXPDate()));
print2ColumnsStringNoSpace("CARD TYPE :", payDetail.getAccountType()); print2ColumnsStringNoSpace("CARD TYPE :", payDetail.getAccountType());
print2ColumnsStringNoSpace("TRACE NUM :", payDetail.getInvoiceNo()); print2ColumnsStringNoSpace("TRACE NUM :", payDetail.getVoucherNo());
if (payDetail.getCardType() != BaseCardType.MAGNETIC.getValue()) { if (payDetail.getCardType() != BaseCardType.MAGNETIC.getValue()) {
print2ColumnsStringNoSpace("CARD HOLDER:", firsLineName); print2ColumnsStringNoSpace("CARD HOLDER:", firsLineName);
@ -527,7 +527,7 @@ public abstract class BaseXPrint {
printer.appendPrnStr("BTH NO:" + batchNum, fontNormal, AlignEnum.LEFT, false); printer.appendPrnStr("BTH NO:" + batchNum, fontNormal, AlignEnum.LEFT, false);
} else { } else {
// printer.printColumnsString(new String[]{"BATCH NO :" + batchNum, "INV NO: " + invoiceNo}, new int[]{2, 2}, new int[]{0, 2}, null); // printer.printColumnsString(new String[]{"BATCH NO :" + batchNum, "INV NO: " + invoiceNo}, new int[]{2, 2}, new int[]{0, 2}, null);
printer.appendPrnStr("BTH NO:" + batchNum + " INV NO:" + traceNo, fontNormal, AlignEnum.LEFT, false); printer.appendPrnStr("BTH NO:" + batchNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT, false);
} }
// printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false); // printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false);
@ -576,7 +576,7 @@ public abstract class BaseXPrint {
print2ColumnsStringNoSpace("ENTRY MODE:", PrintUtils.getInstance().getEntryType(payDetail.getCardType())); print2ColumnsStringNoSpace("ENTRY MODE:", PrintUtils.getInstance().getEntryType(payDetail.getCardType()));
print2ColumnsStringNoSpace("EXP DATE :", PrintUtils.getInstance().getFormatExpDate(payDetail.getEXPDate())); print2ColumnsStringNoSpace("EXP DATE :", PrintUtils.getInstance().getFormatExpDate(payDetail.getEXPDate()));
print2ColumnsStringNoSpace("CARD TYPE :", payDetail.getAccountType()); print2ColumnsStringNoSpace("CARD TYPE :", payDetail.getAccountType());
print2ColumnsStringNoSpace("TRACE NUM :", payDetail.getInvoiceNo()); print2ColumnsStringNoSpace("TRACE NUM :", payDetail.getVoucherNo());
if (payDetail.getCardType() != BaseCardType.MAGNETIC.getValue()) { if (payDetail.getCardType() != BaseCardType.MAGNETIC.getValue()) {
print2ColumnsStringNoSpace("CARD HOLDER:", firsLineName); print2ColumnsStringNoSpace("CARD HOLDER:", firsLineName);
@ -1213,7 +1213,7 @@ public abstract class BaseXPrint {
: pay.getCustomerMobile())); : pay.getCustomerMobile()));
printString("DATE :" + POSUtil.getInstance().formatDisplayDate(pay.getTransDate())); printString("DATE :" + POSUtil.getInstance().formatDisplayDate(pay.getTransDate()));
printString(" " + pay.getTransTime()); printString(" " + pay.getTransTime());
printString("INV NO :" + pay.getVoucherNo()); printString("INV NO :" + pay.getInvoiceNo());
if (pay.getTransactionType() == TransactionsType.MMQR_REFUND.value) { if (pay.getTransactionType() == TransactionsType.MMQR_REFUND.value) {
printString("RRN :" + pay.getReferNo()); printString("RRN :" + pay.getReferNo());
@ -1590,7 +1590,7 @@ public abstract class BaseXPrint {
if (payDetail.getTransactionType() == TransactionsType.MMQR.value && payDetail.getQrTransStatus() == 1) { if (payDetail.getTransactionType() == TransactionsType.MMQR.value && payDetail.getQrTransStatus() == 1) {
printer.appendPrnStr("TRACE NO :" + traceNum, fontNormal, AlignEnum.LEFT, false); printer.appendPrnStr("TRACE NO :" + traceNum, 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:" + traceNum, 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)) {
printer.appendPrnStr("HOST :" + HOST_NAME_MPU + "", fontNormal, AlignEnum.LEFT, false); printer.appendPrnStr("HOST :" + HOST_NAME_MPU + "", fontNormal, AlignEnum.LEFT, false);
} }