diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputPasswordFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputPasswordFragment.java
index 75ca1dc..256da0a 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputPasswordFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputPasswordFragment.java
@@ -184,7 +184,7 @@ public class InputPasswordFragment extends DataBindingFragment implements DataBi
break;
case SETTLEMENT:
inputPasswordViewModel.passwordType.setValue(InputPasswordType.SETTLEMENT);
- routeId = R.id.action_inputPasswordFragment_to_selectSettlementFragment;
+ routeId = R.id.action_inputPasswordFragment_to_settlementTransactionFragment;
break;
case SETTING:
inputPasswordViewModel.passwordType.setValue(InputPasswordType.SETTING);
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 04e82bd..79989ad 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
@@ -35,7 +35,10 @@ import com.utsmm.kbz.config.Constants;
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;
@@ -113,6 +116,16 @@ public class SettlementTransactionFragment extends DataBindingFragment implement
public void onResume() {
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())) {
+ showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet));
+ return;
+ }
+ }
+
boolean printerDisabled = !SystemParamsOperation.getInstance().getPrinterEnabled();
sharedViewModel.printerDisabled.setValue(printerDisabled);
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index b6297cb..27b82ad 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -373,6 +373,12 @@
app:popUpToInclusive="true"
android:id="@+id/action_inputPasswordFragment_to_selectSettlementFragment"
app:destination="@id/selectSettlementFragment" />
+
+ app:destination="@id/settlementTransactionFragment" />