From 161d5184553208455d875088461fabf883340287 Mon Sep 17 00:00:00 2001 From: Yemdjih Kaze Nasser Date: Thu, 26 Nov 2020 07:24:25 +0100 Subject: [PATCH] FINERACT-27 - Extend holiday period to 30 days --- .../HolidayWritePlatformServiceJpaRepositoryImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java index 68ec37166..df4cb859b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java @@ -233,16 +233,16 @@ public class HolidayWritePlatformServiceJpaRepositoryImpl implements HolidayWrit } // validate repaymentsRescheduledTo date - // 1. should be within a 7 days date range. + // 1. should be within a 30 days date range. // 2. Alternative date should not be an exist holiday.//TBD // 3. Holiday should not be on an repaymentsRescheduledTo date of // another holiday.//TBD - // restricting repaymentsRescheduledTo date to be within 7 days + // restricting repaymentsRescheduledTo date to be within 30 days // range // before or after from date and to date. - if (repaymentsRescheduledTo.isBefore(fromDate.minusDays(7)) || repaymentsRescheduledTo.isAfter(toDate.plusDays(7))) { - defaultUserMessage = "Repayments Rescheduled to date must be within 7 days before or after from and to dates"; + if (repaymentsRescheduledTo.isBefore(fromDate.minusDays(30)) || repaymentsRescheduledTo.isAfter(toDate.plusDays(30))) { + defaultUserMessage = "Repayments Rescheduled to date must be within 30 days before or after from and to dates"; throw new HolidayDateException("repayments.rescheduled.to.must.be.within.range", defaultUserMessage, fromDate.toString(), toDate.toString(), repaymentsRescheduledTo.toString()); }