From ddd64fb48d2a1d39cfd7039aad4c4b72aa68a631 Mon Sep 17 00:00:00 2001
From: kizzy <waiyan@utsmyanmar.com>
Date: Tue, 31 Mar 2026 21:49:43 +0700
Subject: [PATCH] fixed for settlement

---
 .../SettlementTransactionFragment.java          |  4 +++-
 .../kbz/ui/settlement/SettlementViewModel.java  | 17 +----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

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 30e0d1f..0ad6730 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
@@ -12,6 +12,7 @@ import com.utsmm.kbz.ui.management.ManagementViewModel;
 import com.utsmm.kbz.ui.settlement.model.CurrencyBucket;
 import com.utsmm.kbz.util.CurrencySelectionHelper;
 import com.utsmm.kbz.util.EReceiptUtil;
+import com.utsmm.kbz.util.enums.TransactionStatus;
 import com.utsmyanmar.baselib.fragment.DataBindingFragment;
 import com.utsmyanmar.baselib.network.model.e_receipt.EReceiptRequest;
 import com.utsmyanmar.baselib.util.DataBindingConfig;
@@ -455,13 +456,14 @@ public class SettlementTransactionFragment extends DataBindingFragment implement
             @Override
             public void onSuccessSignOn() {
 
-                if(isUSDSettleNeeded()) {
+                if(settlementViewModel.resultString.getValue() != TransactionStatus.ON_FINAL_SUCCESS) {
                     currencySelectionHelper.applyCardCurrencyAndHost("MMK");
                     settlementViewModel.startSettlementProcess(mmkBucket,true);
                 } else {
                     navigateToNext();
                 }
 
+
             }
 
             @Override
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 0a17577..8a3f5bb 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
@@ -234,14 +234,7 @@ public class SettlementViewModel extends ViewModel {
         if(payDetails != null && payDetails.size() > 0) {
             for (PayDetail pay:payDetails) {
 
-//                if(paydetail.getTransactionType() == TransactionsType.SALE.value) {
-//                    paydetail.setIsSettle(true);
-//                    updatePayDetail(paydetail);
-//                } else {
                 deletePayDetail(pay);
-//                repository.deletePayDetail(paydetail);
-//                }
-
 
             }
         }
@@ -271,14 +264,6 @@ public class SettlementViewModel extends ViewModel {
 
     @SuppressWarnings("ConstantConditions")
     public void startSettlementProcess(CurrencyBucket currencyBucket,boolean isLast) {
-//        saleCount = sale_count.getValue();
-//        saleAmount = sale_amount.getValue();
-//        preAuthCount = pre_count.getValue();
-//        preAuthAmount = pre_amount.getValue();
-//        refundCount = refund_count.getValue();
-//        refundAmount = refund_amount.getValue();
-//        caCount = ca_count.getValue();
-//        caAmount = ca_amount.getValue();
         this.isLast = isLast;
         SystemParamsOperation.getInstance().getIncrementBatchNo();
 
@@ -356,7 +341,7 @@ public class SettlementViewModel extends ViewModel {
         updateDB();
         insertPayDetail(payDetail);
 
-        resultString.postValue(TransactionStatus.ON_SUCCESS);
+        resultString.postValue(TransactionStatus.ON_FINAL_SUCCESS);
     }
 
     private void requestOnlineProcessSettlement(CurrencyBucket currencyBucket) {