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

FINERACT-311 - Issue With 'Payment Due On Non Working Days

Browse Source
This commit is contained in:
Nazeer Hussain Shaik
2017-02-07 15:09:49 +05:30
parent b6f4230777
commit c6da909d61
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/WorkingDaysData.java
+10 -5
View File
@@ -24,18 +24,14 @@ import java.util.Collection;
public class WorkingDaysData { public class WorkingDaysData {
@SuppressWarnings("unused")
private final Long id; private final Long id;
@SuppressWarnings("unused")
private final String recurrence; private final String recurrence;
@SuppressWarnings("unused")
private final EnumOptionData repaymentRescheduleType; private final EnumOptionData repaymentRescheduleType;
@SuppressWarnings("unused")
private final Boolean extendTermForDailyRepayments; private final Boolean extendTermForDailyRepayments;
@SuppressWarnings("unused")
private final Boolean extendTermForRepaymentsOnHolidays; private final Boolean extendTermForRepaymentsOnHolidays;
// template date // template date
@@ -60,4 +56,13 @@ public class WorkingDaysData {
this.extendTermForDailyRepayments = extendTermForDailyRepayments; this.extendTermForDailyRepayments = extendTermForDailyRepayments;
this.extendTermForRepaymentsOnHolidays = extendTermForRepaymentsOnHolidays; this.extendTermForRepaymentsOnHolidays = extendTermForRepaymentsOnHolidays;
} }
public WorkingDaysData(WorkingDaysData data, Collection<EnumOptionData> repaymentRescheduleOptions) {
this.id = data.id;
this.recurrence = data.recurrence;
this.repaymentRescheduleType = data.repaymentRescheduleType;
this.repaymentRescheduleOptions = repaymentRescheduleOptions;
this.extendTermForDailyRepayments = data.extendTermForDailyRepayments;
this.extendTermForRepaymentsOnHolidays = data.extendTermForRepaymentsOnHolidays;
}
} }
fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java
+13 -6
View File
@@ -79,10 +79,13 @@ public class WorkingDaysReadPlatformServiceImpl implements WorkingDaysReadPlatfo
@Override @Override
public WorkingDaysData retrieve() { public WorkingDaysData retrieve() {
//Check whether template is enabled or not?
try { try {
final WorkingDaysMapper rm = new WorkingDaysMapper(); final WorkingDaysMapper rm = new WorkingDaysMapper();
final String sql = " select " + rm.schema(); final String sql = " select " + rm.schema();
return this.jdbcTemplate.queryForObject(sql, rm, new Object[] {}); WorkingDaysData data = this.jdbcTemplate.queryForObject(sql, rm, new Object[] {});
Collection<EnumOptionData> repaymentRescheduleOptions = repaymentRescheduleTypeOptions() ;
return new WorkingDaysData(data, repaymentRescheduleOptions) ;
} catch (final EmptyResultDataAccessException e) { } catch (final EmptyResultDataAccessException e) {
throw new WorkingDaysNotFoundException(); throw new WorkingDaysNotFoundException();
} }
@@ -90,11 +93,15 @@ public class WorkingDaysReadPlatformServiceImpl implements WorkingDaysReadPlatfo
@Override @Override
public WorkingDaysData repaymentRescheduleType() { public WorkingDaysData repaymentRescheduleType() {
Collection<EnumOptionData> repaymentRescheduleOptions = Arrays.asList( Collection<EnumOptionData> repaymentRescheduleOptions = repaymentRescheduleTypeOptions();
WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.SAME_DAY),
WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_NEXT_WORKING_DAY),
WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_NEXT_REPAYMENT_MEETING_DAY),
WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_PREVIOUS_WORKING_DAY));
return new WorkingDaysData(null, null, null, repaymentRescheduleOptions, null, null); return new WorkingDaysData(null, null, null, repaymentRescheduleOptions, null, null);
} }
private Collection<EnumOptionData> repaymentRescheduleTypeOptions() {
return Arrays.asList(
WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.SAME_DAY),
WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_NEXT_WORKING_DAY),
WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_NEXT_REPAYMENT_MEETING_DAY),
WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_PREVIOUS_WORKING_DAY));
}
} }