From d92c18f3f75af49cb3de69441747e3b0739ca421 Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Mon, 31 Aug 2026 14:51:42 +0630 Subject: [PATCH] qr settlement fix --- .../java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java | 2 +- .../kbz/ui/settlement/SelectSettlementFragment.java | 10 ++++------ .../ui/settlement/SettlementTransactionFragment.java | 7 +------ 3 files changed, 6 insertions(+), 13 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 4d8b27f..1962a26 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 @@ -63,7 +63,7 @@ public class QRPayFragment extends DataBindingFragment { features.add(new QRPayItem("Refund", R.drawable.ic_refund, true)); } features.add(new QRPayItem("History", R.drawable.ic_history, true)); - features.add(new QRPayItem("Mock QR", R.drawable.ic_qr_pay, true)); +// features.add(new QRPayItem("Mock QR", R.drawable.ic_qr_pay, true)); // List features = List.of( // new QRPayItem("Sale", R.drawable.ic_qr_pay, true), diff --git a/app/src/main/java/com/utsmm/kbz/ui/settlement/SelectSettlementFragment.java b/app/src/main/java/com/utsmm/kbz/ui/settlement/SelectSettlementFragment.java index c1178a8..1cbe449 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settlement/SelectSettlementFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settlement/SelectSettlementFragment.java @@ -6,6 +6,8 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.utsmm.kbz.config.data.model.ValidityStatus; +import com.utsmm.kbz.util.tms.TMSUtil; import com.utsmyanmar.baselib.fragment.DataBindingFragment; import com.utsmyanmar.baselib.util.DataBindingConfig; import com.utsmyanmar.paylibs.utils.enums.HostType; @@ -16,9 +18,7 @@ import com.utsmm.kbz.config.Constants; import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel; import com.utsmm.kbz.util.ecr.CoreUtils; import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType; -import com.utsmm.kbz.util.tms.TMSUtil; import com.utsmm.kbz.util.Connectivity; -import com.utsmm.kbz.config.data.model.ValidityStatus; public class SelectSettlementFragment extends DataBindingFragment implements DataBindingFragment.BackPressCallback { @@ -80,9 +80,7 @@ public class SelectSettlementFragment extends DataBindingFragment implements Dat public class ClickEvent { public void onCardSettlement() { - if (TMSUtil.getInstance().checkParams().isStatus() == ValidityStatus.FAILURE) { - showDeclineDialog(getResourceString(R.string.txt_please_download_config)+"\n"+TMSUtil.getInstance().checkParams().getMessage()); - } else if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) { + if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) { showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet)); } else{ routeId = R.id.action_selectSettlementFragment_to_settlementTransactionFragment; @@ -110,4 +108,4 @@ public class SelectSettlementFragment extends DataBindingFragment implements Dat popBackStack(); } } -} \ No newline at end of file +} 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 fb21302..63263ee 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 @@ -36,9 +36,7 @@ import com.utsmyanmar.paylibs.model.QRSettleData; import com.utsmyanmar.paylibs.model.SettleData; import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel; import com.utsmm.kbz.util.Connectivity; -import com.utsmm.kbz.config.data.model.ValidityStatus; import com.utsmm.kbz.util.ecr.CoreUtils; -import com.utsmm.kbz.util.tms.TMSUtil; import java.util.ArrayList; import java.util.List; @@ -117,10 +115,7 @@ public class SettlementTransactionFragment extends DataBindingFragment implement super.onResume(); if(sharedViewModel.getTransMenu().getValue() == TransMenu.SETTLEMENT) { - if (TMSUtil.getInstance().checkParams().isStatus() == ValidityStatus.FAILURE) { - showDeclineDialog(getResourceString(R.string.txt_please_download_config)+"\n"+TMSUtil.getInstance().checkParams().getMessage()); - return; - } else if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) { + if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) { showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet)); return; }