You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2008/08/08 08:35:30 UTC
svn commit: r683873 -
/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Author: mor
Date: Thu Aug 7 23:35:29 2008
New Revision: 683873
URL: http://svn.apache.org/viewvc?rev=683873&view=rev
Log:
Removed a duplicate link Create return in Actions block on Order Detail Page. Also show return links only if there is any returable items
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=683873&r1=683872&r2=683873&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Thu Aug 7 23:35:29 2008
@@ -68,8 +68,10 @@
<li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewEditDeliveryScheduleInfo}</a></li>
</#if>
<#if security.hasEntityPermission("ORDERMGR", "_RETURN", session) && orderHeader.statusId == "ORDER_COMPLETED">
- <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickRefundEntireOrder}</a></li>
- <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></li>
+ <#if returnableItems?has_content>
+ <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickRefundEntireOrder}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></li>
+ </#if>
</#if>
<#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED">
@@ -80,9 +82,6 @@
<li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderEditItems}</a></li>
</#if>
<li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateAsNewOrder}</a></li>
- <#if returnableItems?has_content>
- <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></li>
- </#if>
</#if>
</ul>
</div>