@@ -29572,7 +29588,15 @@ GET https://DomainName/api/v1/interestratecharts/{chartId}/chartslabs
"displaySymbol": "$",
"nameCode": "currency.USD",
"displayLabel": "US Dollar ($)"
- }
+ },
+ "incentives":[{
+ "id":1,
+ "entityType":{"id":2,"code":"InterestIncentiveEntityType.customer","value":"Customer"},
+ "attributeName":{"id":2,"code":"InterestIncentiveAttributeName.gender","value":"Gender"}, "conditionType":{"id":2,"code":"incentiveConditionType.equal","value":"equal"},
+ "attributeValue":"11","attributeValueDesc":"FEMALE",
+ "incentiveType":{"id":3,"code":"InterestIncentiveType.incentive","value":"Incentive"},
+ "amount":-1.000000
+ }]
}
]
@@ -29612,7 +29636,15 @@ GET https://DomainName/api/v1/interestratecharts/{chartId}/chartslabs/{slabId}
"displaySymbol": "$",
"nameCode": "currency.USD",
"displayLabel": "US Dollar ($)"
- }
+ },
+ "incentives":[{
+ "id":1,
+ "entityType":{"id":2,"code":"InterestIncentiveEntityType.customer","value":"Customer"},
+ "attributeName":{"id":2,"code":"InterestIncentiveAttributeName.gender","value":"Gender"}, "conditionType":{"id":2,"code":"incentiveConditionType.equal","value":"equal"},
+ "attributeValue":"11","attributeValueDesc":"FEMALE",
+ "incentiveType":{"id":3,"code":"InterestIncentiveType.incentive","value":"Incentive"},
+ "amount":-1.000000
+ }]
}
diff --git a/mifosng-db/migrations/core_db/V175__added_incentive_interest_rates.sql b/mifosng-db/migrations/core_db/V175__added_incentive_interest_rates.sql
new file mode 100755
index 000000000..c785d1a1d
--- /dev/null
+++ b/mifosng-db/migrations/core_db/V175__added_incentive_interest_rates.sql
@@ -0,0 +1,49 @@
+ALTER TABLE `m_client`
+ ADD COLUMN `client_type_cv_id` INT(11) NULL DEFAULT NULL AFTER `default_savings_account`,
+ ADD COLUMN `client_classification_cv_id` INT(11) NULL DEFAULT NULL AFTER `client_type_cv_id`,
+ ADD CONSTRAINT `FK_m_client_type_m_code_value` FOREIGN KEY (`client_type_cv_id`) REFERENCES `m_code_value` (`id`),
+ ADD CONSTRAINT `FK_m_client_classification_m_code_value` FOREIGN KEY (`client_classification_cv_id`) REFERENCES `m_code_value` (`id`),
+ ADD CONSTRAINT `FK1_m_client_gender_m_code_value` FOREIGN KEY (`gender_cv_id`) REFERENCES `m_code_value` (`id`);
+
+INSERT INTO `m_code` (`code_name`, `is_system_defined`) VALUES ('ClientType', 1);
+INSERT INTO `m_code` (`code_name`, `is_system_defined`) VALUES ('ClientClassification', 1);
+
+
+CREATE TABLE `m_interest_incentives` (
+ `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+ `interest_rate_slab_id` BIGINT(20) NOT NULL,
+ `entiry_type` SMALLINT(2) NOT NULL,
+ `attribute_name` SMALLINT(2) NOT NULL,
+ `condition_type` SMALLINT(2) NOT NULL,
+ `attribute_value` VARCHAR(50) NOT NULL,
+ `incentive_type` SMALLINT(2) NOT NULL,
+ `amount` DECIMAL(19,6) NOT NULL,
+ PRIMARY KEY (`id`),
+ INDEX `FK_m_interest_incentives_m_interest_rate_slab` (`interest_rate_slab_id`),
+ CONSTRAINT `FK_m_interest_incentives_m_interest_rate_slab` FOREIGN KEY (`interest_rate_slab_id`) REFERENCES `m_interest_rate_slab` (`id`)
+);
+
+
+CREATE TABLE `m_savings_interest_incentives` (
+ `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+ `deposit_account_interest_rate_slab_id` BIGINT(20) NOT NULL,
+ `entiry_type` SMALLINT(2) NOT NULL,
+ `attribute_name` SMALLINT(2) NOT NULL,
+ `condition_type` SMALLINT(2) NOT NULL,
+ `attribute_value` VARCHAR(50) NOT NULL,
+ `incentive_type` SMALLINT(2) NOT NULL,
+ `amount` DECIMAL(19,6) NOT NULL,
+ PRIMARY KEY (`id`),
+ INDEX `FK_m_savings_interest_incentives_m_savings_interest_rate_slab` (`deposit_account_interest_rate_slab_id`),
+ CONSTRAINT `FK_m_savings_interest_incentives_m_savings_interest_rate_slab` FOREIGN KEY (`deposit_account_interest_rate_slab_id`) REFERENCES `m_savings_account_interest_rate_slab` (`id`)
+);
+
+ALTER TABLE `m_interest_rate_slab`
+ DROP COLUMN `interest_rate_for_female`,
+ DROP COLUMN `interest_rate_for_children`,
+ DROP COLUMN `interest_rate_for_senior_citizen`;
+
+ALTER TABLE `m_savings_account_interest_rate_slab`
+ DROP COLUMN `interest_rate_for_female`,
+ DROP COLUMN `interest_rate_for_children`,
+ DROP COLUMN `interest_rate_for_senior_citizen`;
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/JsonCommand.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/JsonCommand.java
index 53cec0aa6..56801d5e4 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/JsonCommand.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/JsonCommand.java
@@ -338,6 +338,15 @@ public final class JsonCommand {
return isChanged;
}
+ public boolean isChangeInBigDecimalParameterNamed(final String parameterName, final BigDecimal existingValue, final Locale locale) {
+ boolean isChanged = false;
+ if (parameterExists(parameterName)) {
+ final BigDecimal workingValue = bigDecimalValueOfParameterNamed(parameterName, locale);
+ isChanged = differenceExists(existingValue, workingValue);
+ }
+ return isChanged;
+ }
+
public boolean isChangeInBigDecimalParameterNamedWithNullCheck(final String parameterName, final BigDecimal existingValue) {
boolean isChanged = false;
if (parameterExists(parameterName)) {
@@ -371,6 +380,10 @@ public final class JsonCommand {
return this.fromApiJsonHelper.extractBigDecimalWithLocaleNamed(parameterName, this.parsedCommand);
}
+ public BigDecimal bigDecimalValueOfParameterNamed(final String parameterName, final Locale locale) {
+ return this.fromApiJsonHelper.extractBigDecimalNamed(parameterName, this.parsedCommand, locale);
+ }
+
public BigDecimal bigDecimalValueOfParameterNamedDefaultToNullIfZero(final String parameterName) {
return defaultToNullIfZero(bigDecimalValueOfParameterNamed(parameterName));
}
@@ -393,6 +406,15 @@ public final class JsonCommand {
return isChanged;
}
+ public boolean isChangeInIntegerParameterNamed(final String parameterName, final Integer existingValue, final Locale locale) {
+ boolean isChanged = false;
+ if (parameterExists(parameterName)) {
+ final Integer workingValue = integerValueOfParameterNamed(parameterName, locale);
+ isChanged = differenceExists(existingValue, workingValue);
+ }
+ return isChanged;
+ }
+
public boolean isChangeInIntegerParameterNamedWithNullCheck(final String parameterName, final Integer existingValue) {
boolean isChanged = false;
if (parameterExists(parameterName)) {
@@ -410,6 +432,10 @@ public final class JsonCommand {
return this.fromApiJsonHelper.extractIntegerWithLocaleNamed(parameterName, this.parsedCommand);
}
+ public Integer integerValueOfParameterNamed(final String parameterName, final Locale locale) {
+ return this.fromApiJsonHelper.extractIntegerNamed(parameterName, this.parsedCommand, locale);
+ }
+
public Integer integerValueOfParameterNamedDefaultToNullIfZero(final String parameterName) {
return defaultToNullIfZero(integerValueOfParameterNamed(parameterName));
}
@@ -493,5 +519,5 @@ public final class JsonCommand {
public void checkForUnsupportedParameters(final Type typeOfMap, final String json, final Set