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

Merge pull request #647 from ashok-conflux/MIFOSX-740

Browse Source 
updated montly recurring charge start date to be after savings account activation date.
This commit is contained in:
Keith Woodlock
2013-10-29 05:15:25 -07:00
parent 150fb578c3 2d9ee2eadf
commit 0b5d908b2c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountCharge.java
+10 -10
View File
@@ -665,6 +665,10 @@ public class SavingsAccountCharge extends AbstractPersistable<Long> {
public void updateToNextDueDateFrom(final LocalDate startingDate) {
if (isAnnualFee() || isMonthlyFee()) {
LocalDate nextDueLocalDate = startingDate.withMonthOfYear(this.feeOnMonth);
int maxDayOfMonth = nextDueLocalDate.dayOfMonth().withMaximumValue().getDayOfMonth();
int newDayOfMonth = (this.feeOnDay.intValue() <= maxDayOfMonth) ? this.feeOnDay.intValue() : maxDayOfMonth;
nextDueLocalDate = nextDueLocalDate.withDayOfMonth(newDayOfMonth);
while (startingDate.isAfter(nextDueLocalDate)) {
if (isAnnualFee()) {
nextDueLocalDate = nextDueLocalDate.plusYears(1);
@@ -672,10 +676,7 @@ public class SavingsAccountCharge extends AbstractPersistable<Long> {
nextDueLocalDate = nextDueLocalDate.plusMonths(this.feeInterval);
}
}
//set day of month
int maxDayOfMonth = nextDueLocalDate.dayOfMonth().withMaximumValue().getDayOfMonth();
int newDayOfMonth = (this.feeOnDay.intValue() <= maxDayOfMonth) ? this.feeOnDay.intValue() : maxDayOfMonth;
nextDueLocalDate = nextDueLocalDate.withDayOfMonth(newDayOfMonth);
this.dueDate = nextDueLocalDate.toDate();
}
}
@@ -683,17 +684,16 @@ public class SavingsAccountCharge extends AbstractPersistable<Long> {
public void updateToNextDueDate() {
if(isAnnualFee() || isMonthlyFee()){
LocalDate nextDueLocalDate = new LocalDate(dueDate);
int maxDayOfMonth = nextDueLocalDate.dayOfMonth().withMaximumValue().getDayOfMonth();
int newDayOfMonth = (this.feeOnDay.intValue() < maxDayOfMonth) ? this.feeOnDay.intValue() : maxDayOfMonth;
nextDueLocalDate = nextDueLocalDate.withDayOfMonth(newDayOfMonth);
if(isAnnualFee()){
nextDueLocalDate = nextDueLocalDate.withMonthOfYear(this.feeOnMonth).plusYears(1);
}else if(isMonthlyFee()){
nextDueLocalDate = nextDueLocalDate.plusMonths(this.feeInterval);
}
//set day of month
int maxDayOfMonth = nextDueLocalDate.dayOfMonth().withMaximumValue().getDayOfMonth();
int newDayOfMonth = (this.feeOnDay.intValue() < maxDayOfMonth) ? this.feeOnDay.intValue() : maxDayOfMonth;
nextDueLocalDate = nextDueLocalDate.withDayOfMonth(newDayOfMonth);
this.dueDate = nextDueLocalDate.toDate();
}
}