From 40fa96bb558d5d24a10bb5b3e1b704f345b71bea Mon Sep 17 00:00:00 2001
From: moon <56061215+MgKyawLay@users.noreply.github.com>
Date: Sat, 1 Aug 2026 00:58:48 +0630
Subject: [PATCH] last settlement fixed

---
 TODO.md                                                | 10 +---------
 .../kbz/ui/management/ManagementFunctionFragment.java  |  2 +-
 .../ui/settlement/SettlementTransactionFragment.java   |  3 +++
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/TODO.md b/TODO.md
index d180095..03daf2c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,7 +1,3 @@
-1. QR Host
-   When we generate QR , this transaction not successful.
-   But this transaction included as success transaction in summary report and history.
-   Please remove "CANCEL" records in summary report and history.
 
 
 2. Card Host
@@ -14,7 +10,6 @@ Preauth  - 2500
 Preauth cancel - 500
 Preauth complete - 2000
 
-
 KBZ Host USD  - 3000 (Not include in total net amount for void , preauth , preauth cancel)
 Sale  - 2000
 Void  - 1000
@@ -24,7 +19,4 @@ Preauth complete - 2000
 
 MMQR Pay - 3000 (Not include in total net amount for refund transaction and cancel transaction)
 QR pay - 4000
-Refund - 1000
-
-3. Reprint Last Settlement Report
-   Same process with settlement
\ No newline at end of file
+Refund - 1000
\ No newline at end of file
diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java
index 442a185..789f6af 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java
@@ -140,7 +140,7 @@ public class ManagementFunctionFragment extends DataBindingFragment {
 
 //            observeLastSettlement();
             sharedViewModel.setTransMenu(TransMenu.LAST_SETTLEMENT);
-            routeId = R.id.action_managementFunctionFragment_to_selectHostFragment;
+            routeId = R.id.action_managementFunctionFragment_to_settlementTransactionFragment;
             safeNavigateToRouteId();
         }
 
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 3ae6e29..58c4157 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
@@ -226,6 +226,9 @@ public class SettlementTransactionFragment extends DataBindingFragment implement
                     sharedViewModel.payDetail.setValue(payDetail);
 
 
+                } else {
+                    settlementViewModel.isNoData.setValue(true);
+                    setSettlementViewModelData(0, 0, 0, 0, 0, 0, 0, 0);
                 }
 
             } else {