svn commit: r816163 - /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl

[mor-2]

Author: mor
Date: Thu Sep 17 12:24:51 2009
New Revision: 816163

URL: http://svn.apache.org/viewvc?rev=816163&view=rev
Log:
Formatting changes only.

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=816163&r1=816162&r2=816163&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:24:51 2009
@@ -16,64 +16,65 @@
 specific language governing permissions and limitations
 under the License.
 -->
+
 <div>
-<div class="screenlet">
-        <h3>${uiLabelMap.OrderSalesHistory}</h3>
-        <table id="orderSalesHistory" summary="This table display order sales history.">
-          <thead>
-            <tr>
-              <th>${uiLabelMap.CommonDate}</th>
-              <th>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</th>
-              <th>${uiLabelMap.CommonAmount}</th>
-              <th>${uiLabelMap.CommonStatus}</th>
-              <th>${uiLabelMap.OrderInvoices}</th>
-              <th></th>
-            </tr>
-          </thead>
-          <tbody>
-            <#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>
-            <#if !orderHeaderList?has_content>
-              <tr><td colspan="9">${uiLabelMap.OrderNoOrderFound}</td></tr>
+  <div class="screenlet">
+    <h3>${uiLabelMap.OrderSalesHistory}</h3>
+    <table id="orderSalesHistory" summary="This table display order sales history.">
+      <thead>
+        <tr>
+          <th>${uiLabelMap.CommonDate}</th>
+          <th>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</th>
+          <th>${uiLabelMap.CommonAmount}</th>
+          <th>${uiLabelMap.CommonStatus}</th>
+          <th>${uiLabelMap.OrderInvoices}</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <#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>
-          </tbody>
-        </table>
-</div>
-    <div class="screenlet">
-        <h3>${uiLabelMap.OrderPurchaseHistory}</h3>
-        <table id="orderPurchaseHistory" summary="This table display order purchase history.">
-          <thead>
-            <tr>
-              <th>${uiLabelMap.CommonDate}</th>
-              <th>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</th>
-              <th>${uiLabelMap.CommonAmount}</th>
-              <th>${uiLabelMap.CommonStatus}</th>
-              <th></th>
-            </tr>
-          </thead>
-          <tbody>
-   <#if porderHeaderList?has_content>
+            <td><a href="<@ofbizUrl>orderstatus?orderId=${orderHeader.orderId}</@ofbizUrl>" class="button">${uiLabelMap.CommonView}</a></td>
+          </tr>
+        </#list>
+        <#if !orderHeaderList?has_content>
+          <tr><td colspan="9">${uiLabelMap.OrderNoOrderFound}</td></tr>
+        </#if>
+      </tbody>
+    </table>
+  </div>
+  <div class="screenlet">
+    <h3>${uiLabelMap.OrderPurchaseHistory}</h3>
+    <table id="orderPurchaseHistory" summary="This table display order purchase history.">
+      <thead>
+        <tr>
+          <th>${uiLabelMap.CommonDate}</th>
+          <th>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</th>
+          <th>${uiLabelMap.CommonAmount}</th>
+          <th>${uiLabelMap.CommonStatus}</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <#if porderHeaderList?has_content>
           <#list porderHeaderList as porderHeader>
-            <#assign pstatus = porderHeader.getRelatedOneCache("StatusItem")>
+            <#assign pstatus = porderHeader.getRelatedOneCache("StatusItem") />
             <tr>
               <td>${porderHeader.orderDate.toString()}</td>
               <td>${porderHeader.orderId}</td>
@@ -82,41 +83,41 @@
               <td><a href="<@ofbizUrl>orderstatus?orderId=${porderHeader.orderId}</@ofbizUrl>" class="buttont">${uiLabelMap.CommonView}</a></td>
             </tr>
           </#list>
-    </#if>
-          <#if !porderHeaderList?has_content>
-            <tr><td colspan="9">${uiLabelMap.OrderNoOrderFound}</td></tr>
-          </#if>
-          </tbody>
-        </table>
-</div>
-<div class="screenlet">
-        <h3>${uiLabelMap.EcommerceDownloadsAvailableTitle}</h3>
-        <table id="availableTitleDownload" summary="This table display available title for download.">
-        <thead>
+        </#if>
+        <#if !porderHeaderList?has_content>
+          <tr><td colspan="9">${uiLabelMap.OrderNoOrderFound}</td></tr>
+        </#if>
+      </tbody>
+    </table>
+  </div>
+  <div class="screenlet">
+    <h3>${uiLabelMap.EcommerceDownloadsAvailableTitle}</h3>
+    <table id="availableTitleDownload" summary="This table display available title for download.">
+      <thead>
+        <tr>
+          <th>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</th>
+          <th>${uiLabelMap.ProductProductName}</th>
+          <th>${uiLabelMap.CommonName}</th>
+          <th>${uiLabelMap.CommonDescription}</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <#list downloadOrderRoleAndProductContentInfoList as downloadOrderRoleAndProductContentInfo>
           <tr>
-           <th>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</th>
-           <th>${uiLabelMap.ProductProductName}</th>
-           <th>${uiLabelMap.CommonName}</th>
-           <th>${uiLabelMap.CommonDescription}</th>
-           <th></th>
+            <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>
-        </thead>
-        <tbody>
-          <#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>
-          <#if !downloadOrderRoleAndProductContentInfoList?has_content>
-            <tr><td colspan="9">${uiLabelMap.EcommerceDownloadNotFound}</td></tr>
-          </#if>
-        </tbody>
-        </table>
-</div>
+        </#list>
+        <#if !downloadOrderRoleAndProductContentInfoList?has_content>
+          <tr><td colspan="9">${uiLabelMap.EcommerceDownloadNotFound}</td></tr>
+        </#if>
+      </tbody>
+    </table>
+  </div>
 </div>
\ No newline at end of file