diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/SavingProductData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/SavingProductData.java index 8c1e27a1d..efd3c8bc1 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/SavingProductData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/SavingProductData.java @@ -2,6 +2,8 @@ package org.mifosng.platform.api.data; import java.io.Serializable; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; import org.joda.time.DateTime; @@ -18,6 +20,8 @@ public class SavingProductData implements Serializable { private DateTime createdOn; private DateTime lastModifedOn; + private List currencyOptions = new ArrayList(); + public SavingProductData(){ // } @@ -96,7 +100,12 @@ public class SavingProductData implements Serializable { public void setDigitsAfterDecimal(Integer digitsAfterDecimal) { this.digitsAfterDecimal = digitsAfterDecimal; } - - - + + public List getCurrencyOptions() { + return currencyOptions; + } + + public void setCurrencyOptions(List currencyOptions) { + this.currencyOptions = currencyOptions; + } } diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductReadPlatformServiceImpl.java index 7f2f4ef6f..c3f68579a 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductReadPlatformServiceImpl.java @@ -4,8 +4,10 @@ import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; +import java.util.List; import org.joda.time.DateTime; +import org.mifosng.platform.api.data.CurrencyData; import org.mifosng.platform.api.data.SavingProductData; import org.mifosng.platform.api.data.SavingProductLookup; import org.mifosng.platform.currency.service.CurrencyReadPlatformService; @@ -68,6 +70,8 @@ public class SavingProductReadPlatformServiceImpl implements + " where sp.id = ?"; SavingProductData productData = this.jdbcTemplate.queryForObject(sql, savingProductMapper, new Object[] { savingProductId }); + + populateProductDataWithDropdownOptions(productData); return productData; } catch (EmptyResultDataAccessException e) { @@ -80,6 +84,8 @@ public class SavingProductReadPlatformServiceImpl implements SavingProductData productData=new SavingProductData(); + populateProductDataWithDropdownOptions(productData); + return productData; } @@ -136,5 +142,10 @@ public class SavingProductReadPlatformServiceImpl implements } } + private void populateProductDataWithDropdownOptions(final SavingProductData productData) { + + List currencyOptions = currencyReadPlatformService.retrieveAllowedCurrencies(); + productData.setCurrencyOptions(currencyOptions); + } } diff --git a/mifosng-provider/src/test/resources/META-INF/context.xml b/mifosng-provider/src/test/resources/META-INF/context.xml index d9556190e..7c0a42100 100644 --- a/mifosng-provider/src/test/resources/META-INF/context.xml +++ b/mifosng-provider/src/test/resources/META-INF/context.xml @@ -5,7 +5,7 @@ driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://localhost:3306/mifosplatform-tenants" username="root" - password="mysql" + password="mifos" validationQuery="select 1" maxActive="10" maxIdle="4"