removed previous manual disable logics
This commit is contained in:
parent
e2f6b53fd2
commit
99adb4ffe3
@ -170,36 +170,6 @@ public class ProcessingCardFragment extends DataBindingFragment {
|
|||||||
transProcessViewModel.setTradeData(tradeData);
|
transProcessViewModel.setTradeData(tradeData);
|
||||||
pinPadViewModel.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);
|
sharedViewModel.setCardDataExist(true);
|
||||||
|
|
||||||
if(sharedViewModel.getTransMenu().getValue() != TransMenu.PRE_AUTH_FULL_VOID
|
if(sharedViewModel.getTransMenu().getValue() != TransMenu.PRE_AUTH_FULL_VOID
|
||||||
@ -259,32 +229,6 @@ public class ProcessingCardFragment extends DataBindingFragment {
|
|||||||
transProcessViewModel.setTradeData(tradeData);
|
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);
|
sharedViewModel.setCardDataExist(true);
|
||||||
|
|
||||||
if(sharedViewModel.getTransMenu().getValue() != TransMenu.PRE_AUTH_FULL_VOID && sharedViewModel.getAmountExist().getValue() != null && !sharedViewModel.getAmountExist().getValue()) {
|
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();
|
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;
|
routeId = R.id.action_processingCardFragment_to_emvTransactionFragment;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user