svn commit: r935146 - in /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order: orderheader.ftl orderitems.ftl

[lektran]

Author: lektran
Date: Sat Apr 17 08:17:19 2010
New Revision: 935146

URL: http://svn.apache.org/viewvc?rev=935146&view=rev
Log:
Fix OFBIZ-3523, the demo order confirmation email wasn't including full urls

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl?rev=935146&r1=935145&r2=935146&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl 
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl 
Sat Apr 17 08:17:19 2010
@@ -30,15 +30,15 @@ under the License.
 <div class="screenlet">
   <h3>
     <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" 
&& (orderHeader.statusId)?if_exists == "ORDER_COMPLETED" && 
roleTypeId?if_exists == "PLACING_CUSTOMER">
-      <a 
href="<@ofbizUrl>makeReturn?orderId=${orderHeader.orderId}</@ofbizUrl>" 
class="submenutextright">${uiLabelMap.OrderRequestReturn}</a>
+      <a href="<@ofbizUrl 
fullPath="true">makeReturn?orderId=${orderHeader.orderId}</@ofbizUrl>" 
class="submenutextright">${uiLabelMap.OrderRequestReturn}</a>
     </#if>
     ${uiLabelMap.OrderOrder}
     <#if orderHeader?has_content>
-      ${uiLabelMap.CommonNbr}<a 
href="<@ofbizUrl>orderstatus?orderId=${orderHeader.orderId}</@ofbizUrl>" 
class="lightbuttontext">${orderHeader.orderId}</a>
+      ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl 
fullPath="true">orderstatus?orderId=${orderHeader.orderId}</@ofbizUrl>" 
class="lightbuttontext">${orderHeader.orderId}</a>
     </#if>
     ${uiLabelMap.CommonInformation}
     <#if (orderHeader.orderId)?exists>
-      ${externalOrder?if_exists} [ <a 
href="<@ofbizUrl>order.pdf?orderId=${(orderHeader.orderId)?if_exists}</@ofbizUrl>"
 class="lightbuttontext">PDF</a> ]
+      ${externalOrder?if_exists} [ <a href="<@ofbizUrl 
fullPath="true">order.pdf?orderId=${(orderHeader.orderId)?if_exists}</@ofbizUrl>"
 class="lightbuttontext">PDF</a> ]
     </#if>
   </h3>
   <#-- placing customer information -->

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=935146&r1=935145&r2=935146&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl 
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl 
Sat Apr 17 08:17:19 2010
@@ -25,7 +25,7 @@ under the License.
       <#assign numColumns = 8>
       <#if maySelectItems?default("N") == "Y" && roleTypeId?if_exists == 
"PLACING_CUSTOMER">
           <#assign numColumns = 11>
-          <a 
href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()"
 class="submenutext">${uiLabelMap.OrderAddAllToCart}</a><a 
href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()"
 class="submenutext">${uiLabelMap.OrderAddCheckedToCart}</a><a 
href="<@ofbizUrl>createShoppingListFromOrder?orderId=${orderHeader.orderId}&amp;frequency=6&amp;intervalNumber=1&amp;shoppingListTypeId=SLT_AUTO_REODR</@ofbizUrl>"
 class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a>
+          <a 
href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()"
 class="submenutext">${uiLabelMap.OrderAddAllToCart}</a><a 
href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()"
 class="submenutext">${uiLabelMap.OrderAddCheckedToCart}</a><a href="<@ofbizUrl 
fullPath="true">createShoppingListFromOrder?orderId=${orderHeader.orderId}&amp;frequency=6&amp;intervalNumber=1&amp;shoppingListTypeId=SLT_AUTO_REODR</@ofbizUrl>"
 class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a>
       </#if>
       ${uiLabelMap.OrderOrderItems}
   </h3>
@@ -122,7 +122,7 @@ under the License.
         <#else>
           <#assign product = 
orderItem.getRelatedOneCache("Product")?if_exists/> <#-- should always exist 
because of FK constraint, but just in case -->
           <td >
-            <a 
href="<@ofbizUrl>product?product_id=${orderItem.productId}</@ofbizUrl>" 
class="linktext">${orderItem.productId} - 
${orderItem.itemDescription?default("")}</a>
+            <a href="<@ofbizUrl 
fullPath="true">product?product_id=${orderItem.productId}</@ofbizUrl>" 
class="linktext">${orderItem.productId} - 
${orderItem.itemDescription?default("")}</a>
             <#if product?has_content>
               <#if product.piecesIncluded?exists && 
product.piecesIncluded?long != 0>
                   [${uiLabelMap.OrderPieces}: ${product.piecesIncluded}]
@@ -222,7 +222,7 @@ under the License.
             ${uiLabelMap.CommonComments}
             <input class="inputBox" type="text" 
name="icm_${orderItem.orderItemSeqId}" value="" size="30" maxlength="60"/>
           </td>
-          <td colspan="4"><a 
href="javascript:document.addCommonToCartForm.action='<@ofbizUrl>cancelOrderItem</@ofbizUrl>';document.addCommonToCartForm.submit()"
 class="buttontext">${uiLabelMap.CommonCancel}</a>
+          <td colspan="4"><a 
href="javascript:document.addCommonToCartForm.action='<@ofbizUrl 
fullPath="true">cancelOrderItem</@ofbizUrl>';document.addCommonToCartForm.submit()"
 class="buttontext">${uiLabelMap.CommonCancel}</a>
             <input type="hidden" name="orderItemSeqId" 
value="${orderItem.orderItemSeqId}"/>
           </td>
         </tr>