From 35973963e67970e371e925b1103faa3b7c391170 Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Thu, 25 Jun 2026 15:15:58 +0630 Subject: [PATCH] settlement fixed --- app/src/main/java/com/utsmm/kbz/MainViewModel.java | 6 +++--- .../kbz/ui/settlement/SettlementTransactionFragment.java | 2 +- .../com/utsmm/kbz/ui/settlement/SettlementViewModel.java | 4 ++-- .../java/com/utsmyanmar/baselib/db/dao/PayDetailDao.java | 5 +++-- .../main/java/com/utsmyanmar/baselib/repo/Repository.java | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/utsmm/kbz/MainViewModel.java b/app/src/main/java/com/utsmm/kbz/MainViewModel.java index bb6d11d..1f62b6f 100644 --- a/app/src/main/java/com/utsmm/kbz/MainViewModel.java +++ b/app/src/main/java/com/utsmm/kbz/MainViewModel.java @@ -128,8 +128,8 @@ public class MainViewModel extends ViewModel { - public LiveData> getDeleteTrans(String batchNo) { - return repository.getDeleteTrans(batchNo); + public LiveData> getDeleteTrans() { + return repository.getDeleteTrans(); } private LiveData> getPreAuthTrans() { @@ -171,7 +171,7 @@ public class MainViewModel extends ViewModel { settlementPOS.postValue(payDetails); } }); - getDeleteTrans(SystemParamsOperation.getInstance().getCurrentBatchNum()).observeForever(new Observer>() { + getDeleteTrans().observeForever(new Observer>() { @Override public void onChanged(List payDetails) { deleteTrans.postValue(payDetails); diff --git a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java index f064fa5..e79844b 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java @@ -278,7 +278,7 @@ public class SettlementTransactionFragment extends DataBindingFragment implement } }); - settlementViewModel.getDeleteTrans(SystemParamsOperation.getInstance().getCurrentBatchNum()).observe(getViewLifecycleOwner(), new Observer>() { + settlementViewModel.getDeleteTrans().observe(getViewLifecycleOwner(), new Observer>() { @Override public void onChanged(List payDetails) { settlementViewModel.deleteTrans.clear(); diff --git a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java index 3ca5918..79592a5 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java @@ -159,8 +159,8 @@ public class SettlementViewModel extends ViewModel { return repository.getSettlementPOS(); } - public LiveData> getDeleteTrans(String batchNo) { - return repository.getDeleteTrans(batchNo); + public LiveData> getDeleteTrans() { + return repository.getDeleteTrans(); } public LiveData> getAdditionalSettlementPOS() { 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 b97c196..ed0b93f 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 @@ -78,10 +78,11 @@ public interface PayDetailDao { LiveData> getSettlementPOSClearBatch(); // 6 = PRE AUTH CANCEL, 7= PRE_AUTH_COMPLETE , 5 = PRE AUTH + // Note: type 20 (MMQR) and type 34 (MMQR_REFUND) are intentionally excluded — QR records are managed separately by QR settlement only // @Query(("SELECT * FROM paydetail WHERE transactionType = 1 AND isCanceled = 1 OR transactionType = 2 AND isCanceled = 0 OR transactionType = 18 AND isCanceled = 0 AND batchNo IN(:batchNo)")) // @Query(("SELECT * FROM paydetail WHERE transactionType = 1 AND isCanceled = 1 OR transactionType = 5 AND isCanceled = 1 OR transactionType = 7 AND isCanceled = 1 OR transactionType = 8 OR transactionType = 6 OR transactionType = 10 OR transactionType = 2 AND isCanceled = 0 OR transactionType = 18 AND isCanceled = 0 OR transactionType = 20 AND isCanceled = 0 OR transactionType = 34 AND isCanceled = 1 AND batchNo IN(:batchNo)")) - @Query(("SELECT * FROM paydetail WHERE transactionType = 1 AND isCanceled = 1 OR transactionType = 5 AND isCanceled = 1 OR transactionType = 7 AND isCanceled = 1 OR transactionType = 8 OR transactionType = 6 OR transactionType = 10 OR transactionType = 2 AND isCanceled = 0 OR transactionType = 18 AND isCanceled = 0 OR transactionType = 34 AND isCanceled = 1 AND batchNo IN(:batchNo)")) - LiveData> getDeleteTrans(String batchNo); + @Query(("SELECT * FROM paydetail WHERE transactionType = 1 AND isCanceled = 1 OR transactionType = 5 AND isCanceled = 1 OR transactionType = 7 AND isCanceled = 1 OR transactionType = 8 OR transactionType = 6 OR transactionType = 10 OR transactionType = 2 AND isCanceled = 0 OR transactionType = 18 AND isCanceled = 0")) + LiveData> getDeleteTrans(); @Query("SELECT * FROM paydetail WHERE transactionType = 5 AND isCanceled = 0") LiveData> getPreAuthTrans(); 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 613d569..045f421 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java @@ -307,8 +307,8 @@ public class Repository { return payDetailDao.getSettlementPOSClearBatch(); } - public LiveData> getDeleteTrans(String batchNo) { - return payDetailDao.getDeleteTrans(batchNo); + public LiveData> getDeleteTrans() { + return payDetailDao.getDeleteTrans(); } public LiveData> getPreAuthTrans() {