From eb6e85eb99d3fdc1ee4effc567e01ba903513d5a Mon Sep 17 00:00:00 2001 From: goutham-M Date: Wed, 24 Jul 2013 17:38:40 +0530 Subject: [PATCH] calendarId will be passed only when syn repay/disbur checkbox selected --- .../CalculateLoanScheduleQueryFromApiJsonHelper.java | 2 +- .../LoanApplicationCommandFromApiJsonHelper.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/serialization/CalculateLoanScheduleQueryFromApiJsonHelper.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/serialization/CalculateLoanScheduleQueryFromApiJsonHelper.java index 04a8239af..687207ba3 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/serialization/CalculateLoanScheduleQueryFromApiJsonHelper.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/serialization/CalculateLoanScheduleQueryFromApiJsonHelper.java @@ -194,7 +194,7 @@ public final class CalculateLoanScheduleQueryFromApiJsonHelper { final String calendarIdParameterName = "calendarId"; //if disbursement is synced then must have a meeting (calendar) - if (meetingIdRequired || fromApiJsonHelper.parameterExists(syncDisbursementParameterName, element)) { + if (meetingIdRequired || fromApiJsonHelper.parameterExists(calendarIdParameterName, element)) { final Long calendarId = fromApiJsonHelper.extractLongNamed(calendarIdParameterName, element); baseDataValidator.reset().parameter(calendarIdParameterName).value(calendarId).notNull().integerGreaterThanZero(); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/serialization/LoanApplicationCommandFromApiJsonHelper.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/serialization/LoanApplicationCommandFromApiJsonHelper.java index e66cbc7ce..f826af108 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/serialization/LoanApplicationCommandFromApiJsonHelper.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/serialization/LoanApplicationCommandFromApiJsonHelper.java @@ -314,7 +314,7 @@ public final class LoanApplicationCommandFromApiJsonHelper { final String calendarIdParameterName = "calendarId"; //if disbursement is synced then must have a meeting (calendar) - if (meetingIdRequired || fromApiJsonHelper.parameterExists(syncDisbursementParameterName, element)) { + if (meetingIdRequired || fromApiJsonHelper.parameterExists(calendarIdParameterName, element)) { final Long calendarId = fromApiJsonHelper.extractLongNamed(calendarIdParameterName, element); baseDataValidator.reset().parameter(calendarIdParameterName).value(calendarId).notNull().integerGreaterThanZero(); } @@ -616,7 +616,7 @@ public final class LoanApplicationCommandFromApiJsonHelper { final String calendarIdParameterName = "calendarId"; //if disbursement is synced then must have a meeting (calendar) - if (meetingIdRequired || fromApiJsonHelper.parameterExists(syncDisbursementParameterName, element)) { + if (meetingIdRequired || fromApiJsonHelper.parameterExists(calendarIdParameterName, element)) { final Long calendarId = fromApiJsonHelper.extractLongNamed(calendarIdParameterName, element); baseDataValidator.reset().parameter(calendarIdParameterName).value(calendarId).notNull().integerGreaterThanZero(); }