From 1db93456699567409e9dbe584593fd1fe5dfbaca Mon Sep 17 00:00:00 2001 From: sachinkulkarni12 Date: Mon, 23 Mar 2015 15:47:50 +0530 Subject: [PATCH] MIFOSX-1839:fix for show payment details --- .../data/SavingsAccountTransactionDataValidator.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/SavingsAccountTransactionDataValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/SavingsAccountTransactionDataValidator.java index 2ac0fdfaf..aed9c2e28 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/SavingsAccountTransactionDataValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/SavingsAccountTransactionDataValidator.java @@ -129,6 +129,7 @@ public class SavingsAccountTransactionDataValidator { private void validatePaymentTypeDetails(final DataValidatorBuilder baseDataValidator, JsonElement element) { // Validate all string payment detail fields for max length + boolean checkPaymentTypeDetails = false; final Integer paymentTypeId = this.fromApiJsonHelper.extractIntegerWithLocaleNamed(paymentTypeIdParamName, element); baseDataValidator.reset().parameter(paymentTypeIdParamName).value(paymentTypeId).ignoreIfNull().integerGreaterThanZero(); final Set paymentDetailParameters = new HashSet<>(Arrays.asList(transactionAccountNumberParamName, checkNumberParamName, @@ -137,6 +138,12 @@ public class SavingsAccountTransactionDataValidator { final String paymentDetailParameterValue = this.fromApiJsonHelper.extractStringNamed(paymentDetailParameterName, element); baseDataValidator.reset().parameter(paymentDetailParameterName).value(paymentDetailParameterValue).ignoreIfNull() .notExceedingLengthOf(50); + if(paymentDetailParameterValue != null && !paymentDetailParameterValue.equals("")){ + checkPaymentTypeDetails = true; + } + } + if(checkPaymentTypeDetails){ + baseDataValidator.reset().parameter(paymentTypeIdParamName).value(paymentTypeId).notBlank().integerGreaterThanZero(); } }