.gitignore

@@ -21,5 +21,3 @@ local.properties
 /.idea
 /app/prod/release
 nexdlkey-lib/build/
-/nexsdk-lib
-/nexsdk-lib

app/src/main/java/com/utsmm/kbz/ui/core_ui/CardWaitingFragment.java

@@ -129,49 +129,12 @@ public class CardWaitingFragment extends DataBindingFragment implements DataBind
         }
     }
 
-    private void updateManualEntryVisibility() {
-        TransactionsType type = sharedViewModel.transactionsType.getValue();
-        boolean manualEntryStatus = SystemParamsOperation.getInstance().getManualEntryStatus();
-        boolean preAuthManualEntryStatus = SystemParamsOperation.getInstance().getPreAuthManualEnabled();
-        boolean preAuthCompManualEntryStatus = SystemParamsOperation.getInstance().getPreAuthCompleteManualEnabled();
-        boolean preAuthCancelManualEntryStatus = SystemParamsOperation.getInstance().getPreAuthVoidManualEnabled();
-        boolean show;
-        if (type == null) {
-            show = manualEntryStatus;
-        } else {
-            switch (type) {
-                case SALE:
-                case CASH_OUT:
-                case CASH_DEPOSIT:
-                case REFUND:
-                case VOID:
-                    show = manualEntryStatus;
-                    break;
-                case PRE_AUTH_SALE:
-                    show = preAuthManualEntryStatus;
-                    break;
-                case PRE_AUTH_VOID:
-                    show = preAuthCancelManualEntryStatus;
-                    break;
-                case PRE_AUTH_COMPLETE:
-                    show = preAuthCompManualEntryStatus;
-                    break;
-                default:
-                    show = false;
-                    break;
-            }
-        }
-        sharedViewModel.setManualEntryStatus(show);
-    }
-
     @Override
     public void onResume() {
         super.onResume();
 
         resetUI();
 
-        updateManualEntryVisibility();
-
         setToolBarTitleWithBackIcon(getResourceString(R.string.txt_title_card_capture));
 
         delayFunctionCall(()-> {

app/src/main/java/com/utsmm/kbz/ui/core_ui/ProcessingCardFragment.java

@@ -170,6 +170,36 @@ public class ProcessingCardFragment extends DataBindingFragment {
                 transProcessViewModel.setTradeData(tradeData);
                 pinPadViewModel.setTradeData(tradeData);
 
+                if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_VOID && SystemParamsOperation.getInstance().getPreAuthVoidManualEnabled() ) {
+
+                    sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
+                    routeId = R.id.action_processingCardFragment_to_errorFragment;
+                    safeNavigateToRouteId();
+                    return;
+
+                }
+                if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_SALE && SystemParamsOperation.getInstance().getPreAuthManualEnabled()) {
+
+                    sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
+                    routeId = R.id.action_processingCardFragment_to_errorFragment;
+                    safeNavigateToRouteId();
+                    return;
+
+                }
+                if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_COMPLETE && SystemParamsOperation.getInstance().getPreAuthCompleteManualEnabled()) {
+
+                    sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
+                    routeId = R.id.action_processingCardFragment_to_errorFragment;
+                    safeNavigateToRouteId();
+                    return;
+
+                }
+//                else if(sharedViewModel.transactionsType.getValue() == TransactionsType.REFUND) {
+//                    sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_card_not_supported));
+//                    routeId = R.id.action_processingCardFragment_to_errorFragment;
+//
+//                }
+
                 sharedViewModel.setCardDataExist(true);
 
                 if(sharedViewModel.getTransMenu().getValue() != TransMenu.PRE_AUTH_FULL_VOID
@@ -229,6 +259,32 @@ public class ProcessingCardFragment extends DataBindingFragment {
                     transProcessViewModel.setTradeData(tradeData);
                 }
 
+                if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_VOID && SystemParamsOperation.getInstance().getPreAuthVoidManualEnabled() ) {
+
+                    sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
+                    routeId = R.id.action_processingCardFragment_to_errorFragment;
+
+                }
+                if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_SALE && SystemParamsOperation.getInstance().getPreAuthManualEnabled()) {
+
+                    sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
+                    routeId = R.id.action_processingCardFragment_to_errorFragment;
+
+
+                }
+                if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_COMPLETE && SystemParamsOperation.getInstance().getPreAuthCompleteManualEnabled()) {
+
+                    sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
+                    routeId = R.id.action_processingCardFragment_to_errorFragment;
+
+
+                }
+
+
+//                else if(sharedViewModel.transactionsType.getValue() == TransactionsType.REFUND) {
+//                    routeId = R.id.action_processingCardFragment_to_errorFragment;
+//                }
+
                 sharedViewModel.setCardDataExist(true);
 
                 if(sharedViewModel.getTransMenu().getValue() != TransMenu.PRE_AUTH_FULL_VOID && sharedViewModel.getAmountExist().getValue() != null && !sharedViewModel.getAmountExist().getValue()) {
@@ -257,6 +313,34 @@ public class ProcessingCardFragment extends DataBindingFragment {
 
             prepareEmvTransaction();
 
+            if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_VOID && SystemParamsOperation.getInstance().getPreAuthVoidManualEnabled() ) {
+
+                sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
+                routeId = R.id.action_processingCardFragment_to_errorFragment;
+                safeNavigateToRouteId();
+                return;
+
+            }
+            if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_SALE && SystemParamsOperation.getInstance().getPreAuthManualEnabled()) {
+
+                sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
+                routeId = R.id.action_processingCardFragment_to_errorFragment;
+                safeNavigateToRouteId();
+                return;
+
+
+            }
+            if(sharedViewModel.getTransactionsType().getValue() == TransactionsType.PRE_AUTH_COMPLETE && SystemParamsOperation.getInstance().getPreAuthCompleteManualEnabled()) {
+
+                sharedViewModel.set_errorFragmentMsg(getResourceString(R.string.txt_alert_pre_auth_cancel));
+                routeId = R.id.action_processingCardFragment_to_errorFragment;
+                safeNavigateToRouteId();
+                return;
+
+
+            }
+
+
             routeId = R.id.action_processingCardFragment_to_emvTransactionFragment;
 
         } else {

app/src/main/res/layout/fragment_capture_card_screen.xml

@@ -290,7 +290,6 @@
         <!-- Manual Entry minimalist outlined button -->
         <androidx.cardview.widget.CardView
             android:id="@+id/manualEntryCard"
-            android:visibility="@{(sharedVM.ManualEntryStatus ?? false) ? View.VISIBLE : View.GONE}"
             android:layout_width="0dp"
             android:layout_height="44dp"
             android:layout_marginStart="32dp"