diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/LoanProductConstants.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/LoanProductConstants.java index 3111fc9f2..2452bc8b5 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/LoanProductConstants.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/LoanProductConstants.java @@ -47,5 +47,6 @@ public interface LoanProductConstants { public static final String minNumberOfRepayments = "minNumberOfRepayments"; public static final String maxNumberOfRepayments = "maxNumberOfRepayments"; - public static final String VALUE_CONDITION_TYPE_ERROR = "condition.type.must.end.with.greterthan"; + public static final String VALUE_CONDITION_END_WITH_ERROR = "condition.type.must.end.with.greterthan"; + public static final String VALUE_CONDITION_START_WITH_ERROR = "condition.type.must.start.with.equal"; } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java index cc6e4bd86..b0bb1c0bc 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java @@ -1008,6 +1008,7 @@ public final class LoanProductDataValidator { if (lastConditionType.equals(LoanProductValueConditionType.EQUAL) && conditionType.equals(LoanProductValueConditionType.GRETERTHAN)) { if(lastCycleNumber == 0){ + baseDataValidator.reset().parameter(cycleNumbersParamName).failWithCode(LoanProductConstants.VALUE_CONDITION_START_WITH_ERROR); lastCycleNumber = 1; } baseDataValidator.reset().parameter(cycleNumbersParamName).value(cycleNumber).notNull() @@ -1028,7 +1029,7 @@ public final class LoanProductDataValidator { i++; } while (i < variationArray.size()); if(!lastConditionType.equals(LoanProductValueConditionType.GRETERTHAN)){ - baseDataValidator.reset().parameter(cycleNumbersParamName).failWithCode(LoanProductConstants.VALUE_CONDITION_TYPE_ERROR); + baseDataValidator.reset().parameter(cycleNumbersParamName).failWithCode(LoanProductConstants.VALUE_CONDITION_END_WITH_ERROR); } }