CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

updating annual fee amount in savings product(exception) fixed

Browse Source
This commit is contained in:
goutham-M
2013-05-31 15:56:29 +01:00
committed by Keith Woodlock
parent b373458f57
commit 7478e17f3c
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/JsonCommand.java
+5 -1
View File
@@ -199,7 +199,11 @@ public final class JsonCommand {
boolean differenceExists = false; boolean differenceExists = false;
if (baseValue != null) { if (baseValue != null) {
differenceExists = baseValue.compareTo(workingCopyValue) != 0; if(workingCopyValue != null) {
differenceExists = baseValue.compareTo(workingCopyValue) != 0;
}else {
differenceExists = true;
}
} else { } else {
differenceExists = workingCopyValue != null; differenceExists = workingCopyValue != null;
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsProduct.java
+2 -2
View File
@@ -353,7 +353,7 @@ public class SavingsProduct extends AbstractPersistable<Long> {
if (command.isChangeInIntegerParameterNamed(annualFeeOnMonthDayParamName, this.annualFeeOnDay)) { if (command.isChangeInIntegerParameterNamed(annualFeeOnMonthDayParamName, this.annualFeeOnDay)) {
final MonthDay monthDay = command.extractMonthDayNamed(annualFeeOnMonthDayParamName); final MonthDay monthDay = command.extractMonthDayNamed(annualFeeOnMonthDayParamName);
final String actualValueEntered = command.stringValueOfParameterNamed(annualFeeOnMonthDayParamName); final String actualValueEntered = command.stringValueOfParameterNamed(annualFeeOnMonthDayParamName);
final Integer newValue = monthDay.getDayOfMonth(); final Integer newValue = monthDay != null? monthDay.getDayOfMonth(): null;
actualChanges.put(annualFeeOnMonthDayParamName, actualValueEntered); actualChanges.put(annualFeeOnMonthDayParamName, actualValueEntered);
actualChanges.put(localeParamName, localeAsInput); actualChanges.put(localeParamName, localeAsInput);
this.annualFeeOnDay = newValue; this.annualFeeOnDay = newValue;
@@ -362,7 +362,7 @@ public class SavingsProduct extends AbstractPersistable<Long> {
if (command.isChangeInIntegerParameterNamed(annualFeeOnMonthDayParamName, this.annualFeeOnMonth)) { if (command.isChangeInIntegerParameterNamed(annualFeeOnMonthDayParamName, this.annualFeeOnMonth)) {
final MonthDay monthDay = command.extractMonthDayNamed(annualFeeOnMonthDayParamName); final MonthDay monthDay = command.extractMonthDayNamed(annualFeeOnMonthDayParamName);
final String actualValueEntered = command.stringValueOfParameterNamed(annualFeeOnMonthDayParamName); final String actualValueEntered = command.stringValueOfParameterNamed(annualFeeOnMonthDayParamName);
final Integer newValue = monthDay.getMonthOfYear(); final Integer newValue = monthDay != null? monthDay.getMonthOfYear(): null;
actualChanges.put(annualFeeOnMonthDayParamName, actualValueEntered); actualChanges.put(annualFeeOnMonthDayParamName, actualValueEntered);
actualChanges.put(localeParamName, localeAsInput); actualChanges.put(localeParamName, localeAsInput);
this.annualFeeOnMonth = newValue; this.annualFeeOnMonth = newValue;