Kyaw_Min_Khant/KBZ-POS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qr settlement fix

Browse Source
This commit is contained in:
moon 2026-08-31 14:51:42 +06:30
parent 597560e3bd
commit d92c18f3f7
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java
View File

@ -63,7 +63,7 @@ public class QRPayFragment extends DataBindingFragment {
features.add(new QRPayItem("Refund", R.drawable.ic_refund, true)); features.add(new QRPayItem("Refund", R.drawable.ic_refund, true));
} }
features.add(new QRPayItem("History", R.drawable.ic_history, 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<QRPayItem> features = List.of( // List<QRPayItem> features = List.of(
// new QRPayItem("Sale", R.drawable.ic_qr_pay, true), // new QRPayItem("Sale", R.drawable.ic_qr_pay, true),

8
app/src/main/java/com/utsmm/kbz/ui/settlement/SelectSettlementFragment.java
View File

@ -6,6 +6,8 @@ import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; 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.fragment.DataBindingFragment;
import com.utsmyanmar.baselib.util.DataBindingConfig; import com.utsmyanmar.baselib.util.DataBindingConfig;
import com.utsmyanmar.paylibs.utils.enums.HostType; 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.ui.core_viewmodel.SharedViewModel;
import com.utsmm.kbz.util.ecr.CoreUtils; import com.utsmm.kbz.util.ecr.CoreUtils;
import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType; 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.util.Connectivity;
import com.utsmm.kbz.config.data.model.ValidityStatus;
public class SelectSettlementFragment extends DataBindingFragment implements DataBindingFragment.BackPressCallback { public class SelectSettlementFragment extends DataBindingFragment implements DataBindingFragment.BackPressCallback {
@ -80,9 +80,7 @@ public class SelectSettlementFragment extends DataBindingFragment implements Dat
public class ClickEvent { public class ClickEvent {
public void onCardSettlement() { public void onCardSettlement() {
if (TMSUtil.getInstance().checkParams().isStatus() == ValidityStatus.FAILURE) { if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) {
showDeclineDialog(getResourceString(R.string.txt_please_download_config)+"\n"+TMSUtil.getInstance().checkParams().getMessage());
} else if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) {
showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet)); showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet));
} else{ } else{
routeId = R.id.action_selectSettlementFragment_to_settlementTransactionFragment; routeId = R.id.action_selectSettlementFragment_to_settlementTransactionFragment;

7
app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java
View File

@ -36,9 +36,7 @@ import com.utsmyanmar.paylibs.model.QRSettleData;
import com.utsmyanmar.paylibs.model.SettleData; import com.utsmyanmar.paylibs.model.SettleData;
import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel; import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel;
import com.utsmm.kbz.util.Connectivity; 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.ecr.CoreUtils;
import com.utsmm.kbz.util.tms.TMSUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -117,10 +115,7 @@ public class SettlementTransactionFragment extends DataBindingFragment implement
super.onResume(); super.onResume();
if(sharedViewModel.getTransMenu().getValue() == TransMenu.SETTLEMENT) { if(sharedViewModel.getTransMenu().getValue() == TransMenu.SETTLEMENT) {
if (TMSUtil.getInstance().checkParams().isStatus() == ValidityStatus.FAILURE) { if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) {
showDeclineDialog(getResourceString(R.string.txt_please_download_config)+"\n"+TMSUtil.getInstance().checkParams().getMessage());
return;
} else if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) {
showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet)); showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet));
return; return;
} }