Author: jaz
Date: Fri Sep 7 12:02:39 2007
New Revision: 573673
URL: http://svn.apache.org/viewvc?rev=573673&view=rev
Log:
added mass reject
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.properties
ofbiz/trunk/applications/order/servicedef/services.xml
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?rev=573673&r1=573672&r2=573673&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Fri Sep 7
12:02:39 2007
@@ -735,6 +735,7 @@
OrderReceivedInOtherReceive=On Other Delivery Order
OrderReference=Reference
OrderRejected=Rejected
+OrderRejectOrder=Reject Order
OrderRelease=Release Hold
OrderRemaining=Remaining
OrderRemainingSubTotal=Remaining SubTotal
Modified: ofbiz/trunk/applications/order/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services.xml?rev=573673&r1=573672&r2=573673&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services.xml Fri Sep 7 12:02:39
2007
@@ -560,6 +560,10 @@
location="org.ofbiz.order.order.OrderServices"
invoke="massCancelOrders" auth="true">
<implements service="massOrderChangeInterface"/>
</service>
+ <service name="massRejectOrders" engine="java" transaction-timeout="300"
+ location="org.ofbiz.order.order.OrderServices"
invoke="massRejectOrders" auth="true">
+ <implements service="massOrderChangeInterface"/>
+ </service>
<service name="massPrintOrders" engine="java" transaction-timeout="300"
location="org.ofbiz.order.order.OrderServices"
invoke="massPrintOrders" auth="true">
<implements service="massOrderChangeInterface"/>
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=573673&r1=573672&r2=573673&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
(original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Fri Sep 7 12:02:39 2007
@@ -3718,6 +3718,10 @@
return massChangeItemStatus(dctx, context, "ITEM_CANCELLED");
}
+ public static Map massRejectOrders(DispatchContext dctx, Map context) {
+ return massChangeItemStatus(dctx, context, "ITEM_REJECTED");
+ }
+
public static Map massHoldOrders(DispatchContext dctx, Map context) {
return massChangeOrderStatus(dctx, context, "ORDER_HOLD");
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=573673&r1=573672&r2=573673&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Fri
Sep 7 12:02:39 2007
@@ -178,6 +178,12 @@
<response name="success" type="request-redirect" value="findorders"/>
<response name="error" type="request-redirect" value="findorders"/>
</request-map>
+ <request-map uri="massRejectOrders">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="massRejectOrders"/>
+ <response name="success" type="request-redirect" value="findorders"/>
+ <response name="error" type="request-redirect" value="findorders"/>
+ </request-map>
<request-map uri="massPickOrders">
<security https="true" auth="true"/>
<event type="service" path="" invoke="massPickOrders"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=573673&r1=573672&r2=573673&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Fri Sep
7 12:02:39 2007
@@ -414,6 +414,7 @@
<option
value="<@ofbizUrl>massHoldOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderHold}</option>
<option
value="<@ofbizUrl>massProcessOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderProcessOrder}</option>
<option
value="<@ofbizUrl>massCancelOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderCancel}</option>
+ <option
value="<@ofbizUrl>massRejectOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderRejectOrder}</option>
<option
value="<@ofbizUrl>massPickOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderPickOrders}</option>
<option
value="<@ofbizUrl>massPrintOrders?hideFields=${requestParameters.hideFields?default('N')}${paramList}</@ofbizUrl>">${uiLabelMap.CommonPrint}</option>
<option
value="<@ofbizUrl>massCreateFileForOrders?hideFields=${requestParameters.hideFields?default('N')}${paramList}</@ofbizUrl>">${uiLabelMap.ContentCreateFile}</option>
