diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/ProcessingCardFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/ProcessingCardFragment.java index 414b05a..6cab178 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/ProcessingCardFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/ProcessingCardFragment.java @@ -170,36 +170,6 @@ 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 @@ -259,32 +229,6 @@ 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()) { @@ -313,34 +257,6 @@ 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 {