From c7ac1e90bf867b709087156b3b9792787bc49323 Mon Sep 17 00:00:00 2001
From: kizzy <waiyan@utsmyanmar.com>
Date: Fri, 7 Nov 2025 14:04:59 +0700
Subject: [PATCH] fixed second generated QR

---
 app/src/main/java/com/utsmm/kbz/MainFragment.java          | 3 ---
 app/src/main/java/com/utsmm/kbz/ui/kpay/KPayViewModel.java | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/utsmm/kbz/MainFragment.java b/app/src/main/java/com/utsmm/kbz/MainFragment.java
index 6a0d1a8..795be0a 100644
--- a/app/src/main/java/com/utsmm/kbz/MainFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/MainFragment.java
@@ -180,7 +180,6 @@ public class MainFragment extends DataBindingFragment {
             tmsProcessViewModel.setIsCalled(true);
             routeId = R.id.action_nav_main_to_TMSProcessFragment;
             safeNavigateToRouteId();
-//            delayFunctionCall(this::getLastTrans);
 
         }
     }
@@ -194,7 +193,6 @@ public class MainFragment extends DataBindingFragment {
     @Override
     public void onPause() {
         super.onPause();
-//        SecondaryDisplay.getInstance().destroy();
     }
 
     @Override
@@ -751,7 +749,6 @@ public class MainFragment extends DataBindingFragment {
                 return;
             }
 
-//            LogUtil.d(TAG,"Size Delete Trans : "+lists.size());
             for (PayDetail pay:lists) {
                 /*
                  *  To Hold One day transaction!
diff --git a/app/src/main/java/com/utsmm/kbz/ui/kpay/KPayViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/kpay/KPayViewModel.java
index bdc7695..4d715b0 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/kpay/KPayViewModel.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/kpay/KPayViewModel.java
@@ -63,7 +63,7 @@ public class KPayViewModel extends ViewModel {
     private final SecureRandom secureRandom = new SecureRandom();
 
 
-    private final String merchOrderId = "NEX"+SystemParamsOperation.getInstance().getCurrentSerialNum()+generateRandomTwoChars();
+
 
 
     private String generateRandomTwoChars() {
@@ -188,7 +188,7 @@ public class KPayViewModel extends ViewModel {
     }
 
     public KPayQRRequest.QrRequest createQR(String amount, String time,String mid) {
-
+        String merchOrderId = "NEX"+SystemParamsOperation.getInstance().getCurrentSerialNum()+generateRandomTwoChars();
         String serialNum = TerminalUtil.getInstance().getSerialNo();
         String nonceStr = generateNonceStr(); // Generate random nonce_str