Merge pull request #1316 from sachinkulkarni12/MIFOSX-1839
MIFOSX-1839:fix for show payment details
This commit is contained in:
+7
@@ -129,6 +129,7 @@ public class SavingsAccountTransactionDataValidator {
|
|||||||
|
|
||||||
private void validatePaymentTypeDetails(final DataValidatorBuilder baseDataValidator, JsonElement element) {
|
private void validatePaymentTypeDetails(final DataValidatorBuilder baseDataValidator, JsonElement element) {
|
||||||
// Validate all string payment detail fields for max length
|
// Validate all string payment detail fields for max length
|
||||||
|
boolean checkPaymentTypeDetails = false;
|
||||||
final Integer paymentTypeId = this.fromApiJsonHelper.extractIntegerWithLocaleNamed(paymentTypeIdParamName, element);
|
final Integer paymentTypeId = this.fromApiJsonHelper.extractIntegerWithLocaleNamed(paymentTypeIdParamName, element);
|
||||||
baseDataValidator.reset().parameter(paymentTypeIdParamName).value(paymentTypeId).ignoreIfNull().integerGreaterThanZero();
|
baseDataValidator.reset().parameter(paymentTypeIdParamName).value(paymentTypeId).ignoreIfNull().integerGreaterThanZero();
|
||||||
final Set<String> paymentDetailParameters = new HashSet<>(Arrays.asList(transactionAccountNumberParamName, checkNumberParamName,
|
final Set<String> paymentDetailParameters = new HashSet<>(Arrays.asList(transactionAccountNumberParamName, checkNumberParamName,
|
||||||
@@ -137,6 +138,12 @@ public class SavingsAccountTransactionDataValidator {
|
|||||||
final String paymentDetailParameterValue = this.fromApiJsonHelper.extractStringNamed(paymentDetailParameterName, element);
|
final String paymentDetailParameterValue = this.fromApiJsonHelper.extractStringNamed(paymentDetailParameterName, element);
|
||||||
baseDataValidator.reset().parameter(paymentDetailParameterName).value(paymentDetailParameterValue).ignoreIfNull()
|
baseDataValidator.reset().parameter(paymentDetailParameterName).value(paymentDetailParameterValue).ignoreIfNull()
|
||||||
.notExceedingLengthOf(50);
|
.notExceedingLengthOf(50);
|
||||||
|
if(paymentDetailParameterValue != null && !paymentDetailParameterValue.equals("")){
|
||||||
|
checkPaymentTypeDetails = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(checkPaymentTypeDetails){
|
||||||
|
baseDataValidator.reset().parameter(paymentTypeIdParamName).value(paymentTypeId).notBlank().integerGreaterThanZero();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user