diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java index dbe9c314750..94c9d8e13f4 100755 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java @@ -25,8 +25,7 @@ public enum ConditionType { INVALID(0, "ConditionType.invalid"), // LESSTHAN(1, "ConditionType.lessthan"), // EQUAL(2, "ConditionType.equal"), // - // TODO: fix typo "GREATERTHAN" - GRETERTHAN(3, "ConditionType.greterthan"), // + GREATERTHAN(3, "ConditionType.greaterthan"), // NOT_EQUAL(4, "ConditionType.notequal");// private final Integer value; @@ -43,7 +42,7 @@ public static ConditionType fromInt(final Integer v) { case 2: return EQUAL; case 3: - return GRETERTHAN; + return GREATERTHAN; case 4: return NOT_EQUAL; default: diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/common/service/CommonEnumerations.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/common/service/CommonEnumerations.java index ba27aece22d..1d14a9092df 100644 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/common/service/CommonEnumerations.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/common/service/CommonEnumerations.java @@ -94,9 +94,9 @@ public static EnumOptionData conditionType(final ConditionType type, final Strin optionData = new EnumOptionData(ConditionType.NOT_EQUAL.getValue().longValue(), codePrefix + ConditionType.NOT_EQUAL.getCode(), "notEqual"); break; - case GRETERTHAN: - optionData = new EnumOptionData(ConditionType.GRETERTHAN.getValue().longValue(), - codePrefix + ConditionType.GRETERTHAN.getCode(), "greterthan"); + case GREATERTHAN: + optionData = new EnumOptionData(ConditionType.GREATERTHAN.getValue().longValue(), + codePrefix + ConditionType.GREATERTHAN.getCode(), "greaterthan"); break; case LESSTHAN: optionData = new EnumOptionData(ConditionType.LESSTHAN.getValue().longValue(), diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/DropdownReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/DropdownReadPlatformServiceImpl.java index 57646ca98be..5049a3bd134 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/DropdownReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/DropdownReadPlatformServiceImpl.java @@ -45,7 +45,7 @@ public List retrievePeriodFrequencyTypeOptions() { @Override public List retrieveConditionTypeOptions() { return Arrays.asList(conditionType(ConditionType.EQUAL, "condition"), conditionType(ConditionType.NOT_EQUAL, "condition"), - conditionType(ConditionType.GRETERTHAN, "condition"), conditionType(ConditionType.LESSTHAN, "condition")); + conditionType(ConditionType.GREATERTHAN, "condition"), conditionType(ConditionType.LESSTHAN, "condition")); } @Override diff --git a/fineract-savings/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/AttributeIncentiveCalculation.java b/fineract-savings/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/AttributeIncentiveCalculation.java index 4738b58491e..bb7094a744c 100755 --- a/fineract-savings/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/AttributeIncentiveCalculation.java +++ b/fineract-savings/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/AttributeIncentiveCalculation.java @@ -38,7 +38,7 @@ public boolean applyIncentive(ConditionType conditionType, Long attributeValue, case NOT_EQUAL: applyIncentive = compareVal != 0; break; - case GRETERTHAN: + case GREATERTHAN: applyIncentive = compareVal > 0; break; default: