From afd3d925e14a0396b766fce7f92b1b45c0b29939 Mon Sep 17 00:00:00 2001
From: moon <56061215+MgKyawLay@users.noreply.github.com>
Date: Sun, 21 Jun 2026 21:20:00 +0630
Subject: [PATCH] void by invoice
---
.idea/deploymentTargetSelector.xml | 33 +++++++++++++++++++
.../kbz/ui/core_ui/InputTraceNoFragment.java | 14 +++++---
.../utsmm/kbz/ui/sale_void/VoidViewModel.java | 4 +++
.../baselib/db/dao/PayDetailDao.java | 3 ++
.../utsmyanmar/baselib/repo/Repository.java | 3 ++
5 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 67995af..1af3b86 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -13,6 +13,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java
index 763065d..00b9056 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java
@@ -116,7 +116,14 @@ public class InputTraceNoFragment extends DataBindingFragment {
clearInputView();
- setToolBarTitleWithBackIcon(getResourceString(R.string.title_trace_number));
+ TransactionsType currentTransType = sharedViewModel.transactionsType.getValue();
+ if (currentTransType == TransactionsType.VOID
+ || currentTransType == TransactionsType.TIP_ADJUSTMENT
+ || currentTransType == TransactionsType.PRE_AUTH_COMPLETE_VOID) {
+ setToolBarTitleWithBackIcon(getResourceString(R.string.title_invoice_number));
+ } else {
+ setToolBarTitleWithBackIcon(getResourceString(R.string.title_trace_number));
+ }
if (sharedViewModel.isEcr.getValue() != null) {
if (sharedViewModel.isEcr.getValue()) {
@@ -151,10 +158,9 @@ public class InputTraceNoFragment extends DataBindingFragment {
configTime = "23:00";
}
- LogUtil.d(TAG,"Input trace :"+traceNo);
+ LogUtil.d(TAG,"Input invoice :"+traceNo);
-// voidViewModel.getGenericVoidTransactions(transType,POSUtil.getInstance().formatTrace(traceNo),isEmv).observe(getViewLifecycleOwner(), new Observer() {
- voidViewModel.getVoidTrans(transType,POSUtil.getInstance().formatTrace(traceNo)).observe(getViewLifecycleOwner(), new Observer() {
+ voidViewModel.getVoidTransByInvoice(transType, POSUtil.getInstance().formatTrace(traceNo)).observe(getViewLifecycleOwner(), new Observer() {
@Override
public void onChanged(PayDetail payDetail) {
diff --git a/app/src/main/java/com/utsmm/kbz/ui/sale_void/VoidViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/sale_void/VoidViewModel.java
index 19eeddb..fe2d2ed 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/sale_void/VoidViewModel.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/sale_void/VoidViewModel.java
@@ -39,6 +39,10 @@ public class VoidViewModel extends ViewModel {
return repository.getVoidTransaction(transType,voucherNo);
}
+ public LiveData getVoidTransByInvoice(int transType, String invoiceNo) {
+ return repository.getVoidTransactionByInvoice(transType, invoiceNo);
+ }
+
public void observeVoidTrans(int transType) {
getVoidTransactions(transType).observeForever(new Observer>() {
diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/db/dao/PayDetailDao.java b/baselib/src/main/java/com/utsmyanmar/baselib/db/dao/PayDetailDao.java
index 20bd2f1..baac73f 100644
--- a/baselib/src/main/java/com/utsmyanmar/baselib/db/dao/PayDetailDao.java
+++ b/baselib/src/main/java/com/utsmyanmar/baselib/db/dao/PayDetailDao.java
@@ -120,6 +120,9 @@ public interface PayDetailDao {
@Query("SELECT * FROM paydetail WHERE isSettle = 0 AND transactionType IN(:transType) AND voucherNo IN(:voucherNo)")
LiveData getVoidTrans(int transType,String voucherNo);
+ @Query("SELECT * FROM paydetail WHERE isSettle = 0 AND transactionType IN(:transType) AND invoiceNo IN(:invoiceNo)")
+ LiveData getVoidTransByInvoice(int transType, String invoiceNo);
+
// 5 = PRE_SALE
@Query("SELECT * FROM paydetail WHERE isCanceled = 0 AND transactionType = 5 AND voucherNo IN(:voucherNo) AND accountType != 'MPU'")
diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java b/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java
index b715bd3..85ac014 100644
--- a/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java
+++ b/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java
@@ -185,7 +185,10 @@ public class Repository {
public LiveData getVoidTransaction(int transType,String voucherNo) {
return payDetailDao.getVoidTrans(transType,voucherNo);
+ }
+ public LiveData getVoidTransactionByInvoice(int transType, String invoiceNo) {
+ return payDetailDao.getVoidTransByInvoice(transType, invoiceNo);
}