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

updating withdraw fee in saving product(exception) fixed

Browse Source
This commit is contained in:
goutham-M
2013-05-31 19:32:30 +05:30
parent 8ef012826c
commit bc41c58947
2 changed files with 11 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
+10 -2
View File
@@ -179,7 +179,11 @@ public final class JsonCommand {
boolean differenceExists = false; boolean differenceExists = false;
if (baseValue != null) { if (baseValue != null) {
differenceExists = !baseValue.equals(workingCopyValue); if(workingCopyValue != null) {
differenceExists = !baseValue.equals(workingCopyValue);
} else {
differenceExists = true;
}
} else { } else {
differenceExists = workingCopyValue != null; differenceExists = workingCopyValue != null;
} }
@@ -191,7 +195,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
+1 -1
View File
@@ -340,7 +340,7 @@ public class SavingsProduct extends AbstractPersistable<Long> {
if (command.isChangeInIntegerParameterNamed(withdrawalFeeTypeParamName, this.withdrawalFeeType)) { if (command.isChangeInIntegerParameterNamed(withdrawalFeeTypeParamName, this.withdrawalFeeType)) {
final Integer newValue = command.integerValueOfParameterNamed(withdrawalFeeTypeParamName); final Integer newValue = command.integerValueOfParameterNamed(withdrawalFeeTypeParamName);
actualChanges.put(withdrawalFeeTypeParamName, newValue); actualChanges.put(withdrawalFeeTypeParamName, newValue);
this.withdrawalFeeType = SavingsWithdrawalFeesType.fromInt(newValue).getValue(); this.withdrawalFeeType = newValue != null? SavingsWithdrawalFeesType.fromInt(newValue).getValue(): newValue;
} }
if (command.isChangeInBigDecimalParameterNamed(annualFeeAmountParamName, this.annualFeeAmount)) { if (command.isChangeInBigDecimalParameterNamed(annualFeeAmountParamName, this.annualFeeAmount)) {