|
@ -21,7 +21,6 @@ import com.gmeremit.online.gmeremittance_native.recipientV3.utils.EditTextConfig |
|
|
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.BranchList; |
|
|
import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.payoutmode.BranchList; |
|
|
import com.gmeremit.online.gmeremittance_native.utils.Utils; |
|
|
import com.gmeremit.online.gmeremittance_native.utils.Utils; |
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
|
import java.util.HashMap; |
|
|
import java.util.HashMap; |
|
|
import java.util.Iterator; |
|
|
import java.util.Iterator; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
@ -448,8 +447,11 @@ public class RecipientDetailValidatorV3 { |
|
|
view.updateValueToWidgetBankName(selectedBank.toString()); |
|
|
view.updateValueToWidgetBankName(selectedBank.toString()); |
|
|
view.setErrorOnWidgetBank(null); |
|
|
view.setErrorOnWidgetBank(null); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//After successfull update of selected bank, determine weather it has corresponding dependency or not. |
|
|
//After successfull update of selected bank, determine weather it has corresponding dependency or not. |
|
|
// If dependency are there, override thee validation rule and manage the data |
|
|
// If dependency are there, override thee validation rule and manage the data |
|
|
|
|
|
|
|
|
|
|
|
//For Branch |
|
|
ValidationRuleModel branchValidationRule = validationRuleModelMap.get(FIELD_BRANCH_NAME); |
|
|
ValidationRuleModel branchValidationRule = validationRuleModelMap.get(FIELD_BRANCH_NAME); |
|
|
if (branchValidationRule != null && branchValidationRule.isFieldRequired() && "True".equalsIgnoreCase(selectedBank.getBranchRequired())) { |
|
|
if (branchValidationRule != null && branchValidationRule.isFieldRequired() && "True".equalsIgnoreCase(selectedBank.getBranchRequired())) { |
|
|
view.updateValueToWidgetBranchName(null); |
|
|
view.updateValueToWidgetBranchName(null); |
|
@ -464,6 +466,28 @@ public class RecipientDetailValidatorV3 { |
|
|
branchValidationRule.updateValidity(true); |
|
|
branchValidationRule.updateValidity(true); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//TODO Test necessary |
|
|
|
|
|
//For Account |
|
|
|
|
|
ValidationRuleModel accountValidationRule = validationRuleModelMap.get(FIELD_ACCOUNT_NO); |
|
|
|
|
|
if (accountValidationRule != null) { |
|
|
|
|
|
if ("True".equalsIgnoreCase(selectedBank.getIsAccountRequired())) { |
|
|
|
|
|
view.updateValidationRuleToWidgetAccountNo(true, |
|
|
|
|
|
EditTextConfigurationFactory.getKeyboardTypeFromKeyword(accountValidationRule.getKeyboardType(), accountValidationRule.isLocalKeyboardAllowed(), |
|
|
|
|
|
accountValidationRule.getMaxFieldLengthInt())); |
|
|
|
|
|
updateAccountNo(recipientInfo.getAgent().getAccountNo()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
//We conclude that branch is not a required field |
|
|
|
|
|
//Account number is removed from model just before sending to server using @clearAccountIfNotRequired() |
|
|
|
|
|
accountValidationRule.updateValidity(false); |
|
|
|
|
|
view.updateValidationRuleToWidgetAccountNo(false, |
|
|
|
|
|
EditTextConfigurationFactory.getKeyboardTypeFromKeyword(accountValidationRule.getKeyboardType(), accountValidationRule.isLocalKeyboardAllowed(), |
|
|
|
|
|
accountValidationRule.getMaxFieldLengthInt())); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
validateAll(); |
|
|
validateAll(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -566,6 +590,19 @@ public class RecipientDetailValidatorV3 { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void clearAccountIfNotRequired() { |
|
|
|
|
|
|
|
|
|
|
|
AgentV3Model agentV3Model = recipientInfo.getAgent(); |
|
|
|
|
|
if (agentV3Model != null) { |
|
|
|
|
|
PaymentBankModel paymentBankModel = availableDynamicValidationModel.getBankFromId(agentV3Model.getId()); |
|
|
|
|
|
|
|
|
|
|
|
if (paymentBankModel != null && !"True".equalsIgnoreCase(paymentBankModel.getIsAccountRequired())) { |
|
|
|
|
|
agentV3Model.setAccountNo(null); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
public boolean requiresAccountValidation() { |
|
|
public boolean requiresAccountValidation() { |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1110,8 +1147,7 @@ public class RecipientDetailValidatorV3 { |
|
|
//Don't clear the data, just show error message and disable update button for the moment |
|
|
//Don't clear the data, just show error message and disable update button for the moment |
|
|
public void updateBankValidationWhenPartnerHasChanged() { |
|
|
public void updateBankValidationWhenPartnerHasChanged() { |
|
|
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_BANK_NAME); |
|
|
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_BANK_NAME); |
|
|
if(validationRuleModel!=null) |
|
|
|
|
|
{ |
|
|
|
|
|
|
|
|
if (validationRuleModel != null) { |
|
|
view.setErrorOnWidgetBank("Please select a different bank"); |
|
|
view.setErrorOnWidgetBank("Please select a different bank"); |
|
|
view.setSubmitButtonEnabled(false); |
|
|
view.setSubmitButtonEnabled(false); |
|
|
} |
|
|
} |
|
|