Author: jleroux
Date: Fri Apr 24 07:57:56 2009
New Revision: 768212
URL: http://svn.apache.org/viewvc?rev=768212&view=rev
Log:
A patch from CJ Horton " Add Cancel Order Functionality to
https://localhost:8443/ordermgr/control/orderview";
https://issues.apache.org/jira/browse/OFBIZ-2283 - OFBIZ-2283
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=768212&r1=768211&r2=768212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Fri Apr
24 07:57:56 2009
@@ -59,6 +59,17 @@
<input type="hidden" name="fromDate"
value="${fromDate?if_exists}"/>
</form>
</#if>
+ <#if currentStatus.statusId != "ORDER_COMPLETED" &&
currentStatus.statusId != "ORDER_CANCELLED">
+ <li><a
href="javascript:document.OrderCancel.submit()">${uiLabelMap.OrderCancelOrder}</a></li>
+ <form name="OrderCancel" method="post"
action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>">
+ <input type="hidden" name="statusId" value="ORDER_CANCELLED"/>
+ <input type="hidden" name="workEffortId"
value="${workEffortId?if_exists}"/>
+ <input type="hidden" name="orderId"
value="${orderId?if_exists}"/>
+ <input type="hidden" name="partyId"
value="${assignPartyId?if_exists}"/>
+ <input type="hidden" name="roleTypeId"
value="${assignRoleTypeId?if_exists}"/>
+ <input type="hidden" name="fromDate"
value="${fromDate?if_exists}"/>
+ </form>
+ </#if>
<#if setOrderCompleteOption>
<li><a
href="javascript:document.OrderCompleteOrder.submit()">${uiLabelMap.OrderCompleteOrder}</a></li>
<form name="OrderCompleteOrder" method="post"
action="<@ofbizUrl>changeOrderStatus</@ofbizUrl>">
