Author: ashish
Date: Sat Feb 20 12:47:42 2016
New Revision: 1731393
URL: http://svn.apache.org/viewvc?rev=1731393&view=rev
Log:
Applied patch from jira issue - OFBIZ-6012. Show "Create Return" button on
order view screen other than when order status is complete. Thanks Christian
Carlow for creating the issue and providing the patch for the same. Thanks
Aditi for providing the improved patch.
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=1731393&r1=1731392&r2=1731393&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Sat Feb 20 12:47:42 2016
@@ -143,8 +143,8 @@ under the License.
<#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId
!= "ORDER_CANCELLED">
<li><a
href="<@ofbizUrl>OrderDeliveryScheduleInfo?orderId=${orderId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderViewEditDeliveryScheduleInfo}</a></li>
</#if>
- <#if security.hasEntityPermission("ORDERMGR", "_RETURN", session) &&
orderHeader.statusId == "ORDER_COMPLETED">
- <#if returnableItems?has_content>
+ <#if security.hasEntityPermission("ORDERMGR", "_RETURN", session)>
+ <#if orderHeader.statusId == "ORDER_COMPLETED" &&
returnableItems?has_content>
<li>
<form name="quickRefundOrder" method="post"
action="<@ofbizUrl>quickRefundOrder</@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>
@@ -153,6 +153,8 @@ under the License.
</form>
<a href="javascript:document.quickRefundOrder.submit()"
class="buttontext">${uiLabelMap.OrderQuickRefundEntireOrder}</a>
</li>
+ </#if>
+ <#if returnableItems?has_content>
<li>
<form name="quickreturn" method="post"
action="<@ofbizUrl>quickreturn</@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>
