Author: mor
Date: Mon Jun 29 08:35:25 2009
New Revision: 789259
URL: http://svn.apache.org/viewvc?rev=789259&view=rev
Log:
No functional changes, only formatting changes for the last commit
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl?rev=789259&r1=789258&r2=789259&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
Mon Jun 29 08:35:25 2009
@@ -33,42 +33,40 @@
</div>
<div class="screenlet-body">
<#if orderHeaderList?has_content>
- <table class="basic-table hover-bar" cellspacing='0'>
- <tr class="header-row">
- <td width="20%">${uiLabelMap.OrderOrder} #</td>
- <td width="25%">${uiLabelMap.OrderOrderBillToParty}</td>
- <td width="15%">${uiLabelMap.CommonAmount}</td>
- <td width="20%">${uiLabelMap.OrderTrackingCode}</td>
- <td width="20%">${uiLabelMap.CommonStatus}</td>
- </tr>
- <#assign alt_row = false>
- <#list orderHeaderList as orderHeader>
- <#assign status = orderHeader.getRelatedOneCache("StatusItem")>
- <#assign orh =
Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)>
- <#assign billToParty = orh.getBillToParty()?if_exists>
- <#if billToParty?has_content>
- <#assign billToPartyNameResult =
dispatcher.runSync("getPartyNameForDate",
Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId,
"compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
- <#assign billTo =
billToPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")/>
- </#if>
- <tr<#if alt_row> class="alternate-row"</#if>>
- <#assign alt_row = !alt_row>
- <td>
- <a
href="/ordermgr/control/orderview?orderId=${orderHeader.orderId}"
class="buttontext">${orderHeader.orderId}</a>
- </td>
- <td>${billTo?if_exists}</td>
- <td><@ofbizCurrency amount=orderHeader.grandTotal
isoCode=orderHeader.currencyUom/></td>
- <td>
- <#assign trackingCodes =
orderHeader.getRelated("TrackingCodeOrder")>
- <#list trackingCodes as trackingCode>
- <#if trackingCode?has_content>
- <a
href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br/>
- </#if>
- </#list>
- </td>
-
<td>${orderHeader.getRelatedOneCache("StatusItem").get("description",locale)}</td>
+ <table class="basic-table hover-bar" cellspacing='0'>
+ <tr class="header-row">
+ <td width="20%">${uiLabelMap.OrderOrder} #</td>
+ <td width="25%">${uiLabelMap.OrderOrderBillToParty}</td>
+ <td width="15%">${uiLabelMap.CommonAmount}</td>
+ <td width="20%">${uiLabelMap.OrderTrackingCode}</td>
+ <td width="20%">${uiLabelMap.CommonStatus}</td>
</tr>
- </#list>
- </table>
+ <#assign alt_row = false>
+ <#list orderHeaderList as orderHeader>
+ <#assign status = orderHeader.getRelatedOneCache("StatusItem")>
+ <#assign orh =
Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)>
+ <#assign billToParty = orh.getBillToParty()?if_exists>
+ <#if billToParty?has_content>
+ <#assign billToPartyNameResult =
dispatcher.runSync("getPartyNameForDate",
Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId,
"compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
+ <#assign billTo =
billToPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")/>
+ </#if>
+ <tr<#if alt_row> class="alternate-row"</#if>>
+ <#assign alt_row = !alt_row>
+ <td><a
href="/ordermgr/control/orderview?orderId=${orderHeader.orderId}"
class="buttontext">${orderHeader.orderId}</a></td>
+ <td>${billTo?if_exists}</td>
+ <td><@ofbizCurrency amount=orderHeader.grandTotal
isoCode=orderHeader.currencyUom/></td>
+ <td>
+ <#assign trackingCodes =
orderHeader.getRelated("TrackingCodeOrder")>
+ <#list trackingCodes as trackingCode>
+ <#if trackingCode?has_content>
+ <a
href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br/>
+ </#if>
+ </#list>
+ </td>
+
<td>${orderHeader.getRelatedOneCache("StatusItem").get("description",locale)}</td>
+ </tr>
+ </#list>
+ </table>
<#else>
<h3>${uiLabelMap.OrderNoOrderFound}</h3>
</#if>
