correcting error message for MIFOSX-1163

This commit is contained in:
Vishwas Babu A J
2014-05-04 14:27:09 +05:30
parent 5343b3c676
commit 52d140bb17
@@ -14,6 +14,7 @@ import static org.mifosplatform.portfolio.savings.DepositsApiConstants.interestF
import static org.mifosplatform.portfolio.savings.DepositsApiConstants.interestFreePeriodApplicableParamName; import static org.mifosplatform.portfolio.savings.DepositsApiConstants.interestFreePeriodApplicableParamName;
import static org.mifosplatform.portfolio.savings.DepositsApiConstants.interestFreePeriodFrequencyTypeIdParamName; import static org.mifosplatform.portfolio.savings.DepositsApiConstants.interestFreePeriodFrequencyTypeIdParamName;
import static org.mifosplatform.portfolio.savings.DepositsApiConstants.interestFreeToPeriodParamName; import static org.mifosplatform.portfolio.savings.DepositsApiConstants.interestFreeToPeriodParamName;
import static org.mifosplatform.portfolio.savings.DepositsApiConstants.linkedAccountParamName;
import static org.mifosplatform.portfolio.savings.DepositsApiConstants.maxDepositTermParamName; import static org.mifosplatform.portfolio.savings.DepositsApiConstants.maxDepositTermParamName;
import static org.mifosplatform.portfolio.savings.DepositsApiConstants.maxDepositTermTypeIdParamName; import static org.mifosplatform.portfolio.savings.DepositsApiConstants.maxDepositTermTypeIdParamName;
import static org.mifosplatform.portfolio.savings.DepositsApiConstants.minDepositTermParamName; import static org.mifosplatform.portfolio.savings.DepositsApiConstants.minDepositTermParamName;
@@ -44,7 +45,6 @@ import static org.mifosplatform.portfolio.savings.SavingsApiConstants.minRequire
import static org.mifosplatform.portfolio.savings.SavingsApiConstants.nominalAnnualInterestRateParamName; import static org.mifosplatform.portfolio.savings.SavingsApiConstants.nominalAnnualInterestRateParamName;
import static org.mifosplatform.portfolio.savings.SavingsApiConstants.productIdParamName; import static org.mifosplatform.portfolio.savings.SavingsApiConstants.productIdParamName;
import static org.mifosplatform.portfolio.savings.SavingsApiConstants.submittedOnDateParamName; import static org.mifosplatform.portfolio.savings.SavingsApiConstants.submittedOnDateParamName;
import static org.mifosplatform.portfolio.savings.DepositsApiConstants.linkedAccountParamName;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -570,13 +570,13 @@ public class DepositAccountDataValidator {
public void validatelinkedSavingsAccount(final SavingsAccount linkedSavingsAccount, final SavingsAccount savingsAccount) { public void validatelinkedSavingsAccount(final SavingsAccount linkedSavingsAccount, final SavingsAccount savingsAccount) {
final List<ApiParameterError> dataValidationErrors = new ArrayList<ApiParameterError>(); final List<ApiParameterError> dataValidationErrors = new ArrayList<ApiParameterError>();
if (linkedSavingsAccount.isNotActive()) { if (linkedSavingsAccount.isNotActive()) {
final ApiParameterError error = ApiParameterError.parameterError("validation.msg.loan.linked.savings.account.is.not.active", final ApiParameterError error = ApiParameterError.parameterError("validation.msg.deposit.linked.savings.account.is.not.active",
"Linked Savings account with id:" + linkedSavingsAccount.getId() + " is not in active state", "linkAccountId", "Linked Savings account with id:" + linkedSavingsAccount.getId() + " is not in active state", "linkAccountId",
linkedSavingsAccount.getId()); linkedSavingsAccount.getId());
dataValidationErrors.add(error); dataValidationErrors.add(error);
} else if (savingsAccount.clientId() != linkedSavingsAccount.clientId()) { } else if (savingsAccount.clientId() != linkedSavingsAccount.clientId()) {
final ApiParameterError error = ApiParameterError.parameterError( final ApiParameterError error = ApiParameterError.parameterError(
"validation.msg.loan.linked.savings.account.not.belongs.to.same.client", "Linked Savings account with id:" "validation.msg.deposit.linked.savings.account.not.belongs.to.same.client", "Linked Savings account with id:"
+ linkedSavingsAccount.getId() + " is not belongs to the same client", "linkAccountId", + linkedSavingsAccount.getId() + " is not belongs to the same client", "linkAccountId",
linkedSavingsAccount.getId()); linkedSavingsAccount.getId());
dataValidationErrors.add(error); dataValidationErrors.add(error);