Author: mor
Date: Thu Sep 17 12:33:03 2009
New Revision: 816167
URL: http://svn.apache.org/viewvc?rev=816167&view=rev
Log:
Formatting changes again.
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl?rev=816167&r1=816166&r2=816167&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl
Thu Sep 17 12:33:03 2009
@@ -33,27 +33,27 @@
</thead>
<tbody>
<#if orderHeaderList?has_content>
- <#list orderHeaderList as orderHeader>
- <#assign status = orderHeader.getRelatedOneCache("StatusItem") />
- <tr>
- <td>${orderHeader.orderDate.toString()}</td>
- <td>${orderHeader.orderId}</td>
- <td><@ofbizCurrency amount=orderHeader.grandTotal
isoCode=orderHeader.currencyUom /></td>
- <td>${status.get("description",locale)}</td>
- <#-- invoices -->
- <#assign invoices = delegator.findByAnd("OrderItemBilling",
Static["org.ofbiz.base.util.UtilMisc"].toMap("orderId",
"${orderHeader.orderId}"),
Static["org.ofbiz.base.util.UtilMisc"].toList("invoiceId")) />
- <#if invoices?has_content>
- <td>
- <#list invoices as invoice>
- <a
href="<@ofbizUrl>invoice.pdf?invoiceId=${invoice.invoiceId}</@ofbizUrl>"
class="button">(${invoice.invoiceId} PDF)</a>
- </#list>
- </td>
- <#else>
- <td></td>
- </#if>
- <td><a
href="<@ofbizUrl>orderstatus?orderId=${orderHeader.orderId}</@ofbizUrl>"
class="button">${uiLabelMap.CommonView}</a></td>
- </tr>
- </#list>
+ <#list orderHeaderList as orderHeader>
+ <#assign status = orderHeader.getRelatedOneCache("StatusItem") />
+ <tr>
+ <td>${orderHeader.orderDate.toString()}</td>
+ <td>${orderHeader.orderId}</td>
+ <td><@ofbizCurrency amount=orderHeader.grandTotal
isoCode=orderHeader.currencyUom /></td>
+ <td>${status.get("description",locale)}</td>
+ <#-- invoices -->
+ <#assign invoices = delegator.findByAnd("OrderItemBilling",
Static["org.ofbiz.base.util.UtilMisc"].toMap("orderId",
"${orderHeader.orderId}"),
Static["org.ofbiz.base.util.UtilMisc"].toList("invoiceId")) />
+ <#if invoices?has_content>
+ <td>
+ <#list invoices as invoice>
+ <a
href="<@ofbizUrl>invoice.pdf?invoiceId=${invoice.invoiceId}</@ofbizUrl>"
class="button">(${invoice.invoiceId} PDF)</a>
+ </#list>
+ </td>
+ <#else>
+ <td></td>
+ </#if>
+ <td><a
href="<@ofbizUrl>orderstatus?orderId=${orderHeader.orderId}</@ofbizUrl>"
class="button">${uiLabelMap.CommonView}</a></td>
+ </tr>
+ </#list>
<#else>
<tr><td colspan="9">${uiLabelMap.OrderNoOrderFound}</td></tr>
</#if>
@@ -104,17 +104,17 @@
</thead>
<tbody>
<#if downloadOrderRoleAndProductContentInfoList?has_content>
- <#list downloadOrderRoleAndProductContentInfoList as
downloadOrderRoleAndProductContentInfo>
- <tr>
- <td>${downloadOrderRoleAndProductContentInfo.orderId}</td>
- <td>${downloadOrderRoleAndProductContentInfo.productName}</td>
-
<td>${downloadOrderRoleAndProductContentInfo.contentName?if_exists}</td>
-
<td>${downloadOrderRoleAndProductContentInfo.description?if_exists}</td>
- <td>
- <a
href="<@ofbizUrl>downloadDigitalProduct/${downloadOrderRoleAndProductContentInfo.contentName?if_exists}?dataResourceId=${downloadOrderRoleAndProductContentInfo.dataResourceId}</@ofbizUrl>"
class="button">Download</a>
- </td>
- </tr>
- </#list>
+ <#list downloadOrderRoleAndProductContentInfoList as
downloadOrderRoleAndProductContentInfo>
+ <tr>
+ <td>${downloadOrderRoleAndProductContentInfo.orderId}</td>
+ <td>${downloadOrderRoleAndProductContentInfo.productName}</td>
+
<td>${downloadOrderRoleAndProductContentInfo.contentName?if_exists}</td>
+
<td>${downloadOrderRoleAndProductContentInfo.description?if_exists}</td>
+ <td>
+ <a
href="<@ofbizUrl>downloadDigitalProduct/${downloadOrderRoleAndProductContentInfo.contentName?if_exists}?dataResourceId=${downloadOrderRoleAndProductContentInfo.dataResourceId}</@ofbizUrl>"
class="button">Download</a>
+ </td>
+ </tr>
+ </#list>
<#else>
<tr><td colspan="9">${uiLabelMap.EcommerceDownloadNotFound}</td></tr>
</#if>
