shopizer-developers
Details
sm-shop/SALESMANAGER.h2.db 0(+0 -0)
diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index c8df29d..12ecc5b 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ
sm-shop/SALESMANAGER.lock.db 4(+2 -2)
diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
index 7be8eb2..b778a5b 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
#FileLock
-#Tue Jan 17 10:34:27 EST 2017
-id=159ad10a2dfc5f5cf28bc04767b604ab34bc5be70da
+#Mon Jan 23 09:54:31 EST 2017
+id=159cbd238c7267fbdac586b94cdc401f368a176c14c
method=file
diff --git a/sm-shop/src/main/webapp/pages/admin/orders/order.jsp b/sm-shop/src/main/webapp/pages/admin/orders/order.jsp
index e5213d3..f012791 100644
--- a/sm-shop/src/main/webapp/pages/admin/orders/order.jsp
+++ b/sm-shop/src/main/webapp/pages/admin/orders/order.jsp
@@ -584,7 +584,17 @@ function captureOrder(orderId){
<c:set var="total" value="${orderProduct.oneTimeCharge * orderProduct.productQuantity }" />
<tr>
- <td colspan="2"> <c:out value="${orderProduct.productName}" /> - <a href="<c:url value="/admin/products/viewEditProduct.html?sku=${orderProduct.sku}"/>"><c:out value="${orderProduct.sku}" /></a></td>
+ <td colspan="2">
+ <c:out value="${orderProduct.productName}" /> - <a href="<c:url value="/admin/products/viewEditProduct.html?sku=${orderProduct.sku}"/>"><c:out value="${orderProduct.sku}" /></a>
+ <c:if test="${fn:length(orderProduct.orderAttributes)>0}">
+ <br/>
+ <ul>
+ <c:forEach items="${orderProduct.orderAttributes}" var="attribute">
+ <li>${attribute.productAttributeName} - ${attribute.productAttributeValueName}</li>
+ </c:forEach>
+ </ul>
+ </c:if>
+ </td>
<td ><c:out value="${orderProduct.productQuantity}" /></td>
<td><strong><sm:monetary value="${orderProduct.oneTimeCharge}" currency="${order.order.currency}"/></strong> </td>
<td><strong><sm:monetary value="${total}" currency="${order.order.currency}"/></strong></td>