added time zone 'Z' handling to ease UI usage
diff --git a/component-test/src/main/java/io/mifos/deposit/TestProductInstance.java b/component-test/src/main/java/io/mifos/deposit/TestProductInstance.java
index 6018d94..d3442ec 100644
--- a/component-test/src/main/java/io/mifos/deposit/TestProductInstance.java
+++ b/component-test/src/main/java/io/mifos/deposit/TestProductInstance.java
@@ -103,7 +103,7 @@
super.eventRecorder.wait(EventConstants.POST_PRODUCT_DEFINITION, productDefinition.getIdentifier());
final ProductInstance productInstance = Fixture.productInstance(productDefinition.getIdentifier());
- final String openedOn = "2013-05-08Z";
+ final String openedOn = "2013-05-08";
productInstance.setOpenedOn(openedOn);
super.depositAccountManager.create(productInstance);
diff --git a/service/src/main/java/io/mifos/deposit/service/internal/mapper/ProductInstanceMapper.java b/service/src/main/java/io/mifos/deposit/service/internal/mapper/ProductInstanceMapper.java
index a841833..4073783 100644
--- a/service/src/main/java/io/mifos/deposit/service/internal/mapper/ProductInstanceMapper.java
+++ b/service/src/main/java/io/mifos/deposit/service/internal/mapper/ProductInstanceMapper.java
@@ -51,7 +51,13 @@
}
if (productInstance.getOpenedOn() != null) {
- productInstanceEntity.setOpenedOn(DateConverter.dateFromIsoString(productInstance.getOpenedOn()));
+ final String editedOpenedDate;
+ if (!productInstance.getOpenedOn().endsWith("Z")) {
+ editedOpenedDate = productInstance.getOpenedOn() + "Z";
+ } else {
+ editedOpenedDate = productInstance.getOpenedOn();
+ }
+ productInstanceEntity.setOpenedOn(DateConverter.dateFromIsoString(editedOpenedDate));
}
if (productInstance.getLastTransactionDate() != null) {
@@ -79,7 +85,8 @@
}
if (productInstanceEntity.getOpenedOn() != null) {
- productInstance.setOpenedOn(DateConverter.toIsoString(productInstanceEntity.getOpenedOn()));
+ final String editedOpenedDate = DateConverter.toIsoString(productInstanceEntity.getOpenedOn()).substring(0, 10);
+ productInstance.setOpenedOn(editedOpenedDate);
}
if (productInstanceEntity.getLastTransactionDate() != null) {
