From 7c266677e7676b7b065829ec32a99fa96b2be5c0 Mon Sep 17 00:00:00 2001
From: MooN <56061215+MgKyawLay@users.noreply.github.com>
Date: Sun, 16 Nov 2025 22:34:22 +0630
Subject: [PATCH] merge fix

---
 app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java  | 2 +-
 .../java/com/utsmm/kbz/ui/qr_pay/QRRefundDetailFragment.java  | 4 ++--
 .../java/com/utsmm/kbz/ui/qr_pay/QRRefundProcessFragment.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java
index 9ee8141..c11ffb7 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java
@@ -135,7 +135,7 @@ public class QRPayFragment extends DataBindingFragment {
     }
 
     private void onClickRefund(){
-        sharedViewModel.setTransactionsType(TransactionsType.MMQR_REFUND);
+//        sharedViewModel.setTransactionsType(TransactionsType.MMQR_REFUND);
         routeId = R.id.action_qrFragment_to_qr_refund_list;
 //        routeId = R.id.action_qrFragment_to_inputPasswordFragment;
         safeNavigateToRouteId();
diff --git a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundDetailFragment.java b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundDetailFragment.java
index 3dbd4c6..c724054 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundDetailFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundDetailFragment.java
@@ -209,12 +209,12 @@ public class QRRefundDetailFragment extends DataBindingFragment {
 
                 QRRefund qrRefund = new QRRefund(referenceNo, refundAmountStr, originalAmountStr, refundReason);
 
-                kPayViewModel.setQrRefund(qrRefund);
+//                kPayViewModel.setQrRefund(qrRefund);
 
             } else {
                 QRRefund qrRefund = new QRRefund(referenceNo, "0", etOriginalAmount.getText().toString().trim(), refundReason);
 
-                kPayViewModel.setQrRefund(qrRefund);
+//                kPayViewModel.setQrRefund(qrRefund);
             }
 
             kPayViewModel.setPayDetail(payDetail);
diff --git a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundProcessFragment.java b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundProcessFragment.java
index f2e680e..97fc368 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundProcessFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundProcessFragment.java
@@ -88,7 +88,7 @@ public class QRRefundProcessFragment extends DataBindingFragment {
 
     private void initData() {
         payDetail = kPayViewModel.getPayDetail();
-        qrRefund = kPayViewModel.getQrRefund();
+//        qrRefund = kPayViewModel.getQrRefund();
     }
 
     private void processKPayRefund(String referenceNo, String refundAmount, String originalAmount, String reason) {