Merge branch 'FINERACT-37' into develop
Project: http://git-wip-us.apache.org/repos/asf/fineract/repo Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/c3a602ce Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/c3a602ce Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/c3a602ce Branch: refs/heads/develop Commit: c3a602ced8057bc02cee43dab041f25b8f293c59 Parents: 0373ce4 b9017e2 Author: Nazeer Hussain Shaik <[email protected]> Authored: Thu Jul 20 18:50:02 2017 +0530 Committer: Nazeer Hussain Shaik <[email protected]> Committed: Thu Jul 20 18:50:02 2017 +0530 ---------------------------------------------------------------------- .../holiday/api/HolidayApiConstants.java | 1 + .../holiday/api/HolidaysApiResource.java | 9 + .../organisation/holiday/data/HolidayData.java | 4 +- .../holiday/data/HolidayDataValidator.java | 22 ++- .../organisation/holiday/domain/Holiday.java | 36 +++- .../holiday/domain/RescheduleType.java | 64 +++++++ .../holiday/service/HolidayEnumerations.java | 26 +++ .../service/HolidayReadPlatformService.java | 4 + .../service/HolidayReadPlatformServiceImpl.java | 16 +- .../holiday/service/HolidayUtil.java | 17 ++ ...ayWritePlatformServiceJpaRepositoryImpl.java | 68 ++++--- .../data/AdjustedDateDetailsDTO.java | 76 ++++++++ .../domain/RepaymentRescheduleType.java | 7 +- .../workingdays/service/WorkingDaysUtil.java | 12 ++ .../calendar/service/CalendarUtils.java | 108 +++++++++++ .../domain/AbstractLoanScheduleGenerator.java | 55 ++---- .../domain/DefaultScheduledDateGenerator.java | 179 ++++++++++++------- .../domain/LoanApplicationTerms.java | 6 +- .../domain/ScheduledDateGenerator.java | 9 +- ...oanReschedulePreviewPlatformServiceImpl.java | 4 +- ...scheduleRequestWritePlatformServiceImpl.java | 4 +- ...anWritePlatformServiceJpaRepositoryImpl.java | 2 +- .../core_db/V331__holiday_schema_changes.sql | 23 +++ 23 files changed, 594 insertions(+), 158 deletions(-) ----------------------------------------------------------------------
