From 532506608f8c4bb2e6bbb502d4a3b1b3c7515b0b Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Tue, 1 Sep 2015 06:11:12 +0530 Subject: [PATCH] bug fixes for client charges --- .../FinancialActivityAccountDataValidator.java | 16 +++++++++------- .../client/domain/ClientTransaction.java | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/financialactivityaccount/serialization/FinancialActivityAccountDataValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/financialactivityaccount/serialization/FinancialActivityAccountDataValidator.java index 08e4e0782..eda71e32d 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/financialactivityaccount/serialization/FinancialActivityAccountDataValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/financialactivityaccount/serialization/FinancialActivityAccountDataValidator.java @@ -52,9 +52,10 @@ public final class FinancialActivityAccountDataValidator { final JsonElement element = this.fromApiJsonHelper.parse(json); final Integer financialActivityId = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(paramNameForFinancialActivity, element); - baseDataValidator.reset().parameter(paramNameForFinancialActivity).value(financialActivityId).notNull() - .isOneOfTheseValues(FINANCIAL_ACTIVITY.ASSET_TRANSFER.getValue(), FINANCIAL_ACTIVITY.LIABILITY_TRANSFER.getValue(), - FINANCIAL_ACTIVITY.CASH_AT_MAINVAULT.getValue(), FINANCIAL_ACTIVITY.CASH_AT_TELLER.getValue(),FINANCIAL_ACTIVITY.OPENING_BALANCES_TRANSFER_CONTRA.getValue()); + baseDataValidator.reset().parameter(paramNameForFinancialActivity).value(financialActivityId).notNull().isOneOfTheseValues( + FINANCIAL_ACTIVITY.ASSET_TRANSFER.getValue(), FINANCIAL_ACTIVITY.LIABILITY_TRANSFER.getValue(), + FINANCIAL_ACTIVITY.CASH_AT_MAINVAULT.getValue(), FINANCIAL_ACTIVITY.CASH_AT_TELLER.getValue(), + FINANCIAL_ACTIVITY.OPENING_BALANCES_TRANSFER_CONTRA.getValue(), FINANCIAL_ACTIVITY.ASSET_FUND_SOURCE.getValue()); final Long glAccountId = this.fromApiJsonHelper.extractLongNamed(paramNameForGLAccount, element); baseDataValidator.reset().parameter(paramNameForGLAccount).value(glAccountId).notNull().integerGreaterThanZero(); @@ -76,10 +77,11 @@ public final class FinancialActivityAccountDataValidator { final JsonElement element = this.fromApiJsonHelper.parse(json); if (this.fromApiJsonHelper.parameterExists(paramNameForFinancialActivity, element)) { - final Integer financialActivityId = this.fromApiJsonHelper - .extractIntegerSansLocaleNamed(paramNameForFinancialActivity, element); - baseDataValidator.reset().parameter(paramNameForFinancialActivity).value(financialActivityId).ignoreIfNull() - .isOneOfTheseValues(FINANCIAL_ACTIVITY.ASSET_TRANSFER.getValue(), FINANCIAL_ACTIVITY.LIABILITY_TRANSFER.getValue(),FINANCIAL_ACTIVITY.OPENING_BALANCES_TRANSFER_CONTRA.getValue()); + final Integer financialActivityId = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(paramNameForFinancialActivity, + element); + baseDataValidator.reset().parameter(paramNameForFinancialActivity).value(financialActivityId).ignoreIfNull().isOneOfTheseValues( + FINANCIAL_ACTIVITY.ASSET_TRANSFER.getValue(), FINANCIAL_ACTIVITY.LIABILITY_TRANSFER.getValue(), + FINANCIAL_ACTIVITY.OPENING_BALANCES_TRANSFER_CONTRA.getValue(), FINANCIAL_ACTIVITY.ASSET_FUND_SOURCE.getValue()); } if (this.fromApiJsonHelper.parameterExists(paramNameForGLAccount, element)) { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/ClientTransaction.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/ClientTransaction.java index 88c9f9d08..198f5dd36 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/ClientTransaction.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/ClientTransaction.java @@ -143,6 +143,7 @@ public class ClientTransaction extends AbstractPersistable { Boolean accountingEnabledForAtleastOneCharge = false; thisTransactionData.put("id", getId()); + thisTransactionData.put("clientId", getClientId()); thisTransactionData.put("officeId", this.office.getId()); thisTransactionData.put("type", transactionType); thisTransactionData.put("reversed", Boolean.valueOf(this.reversed));