svn commit: r538906 - in /ofbiz/trunk/applications/order: script/org/ofbiz/order/order/OrderSimpleMethods.xml servicedef/secas.xml servicedef/services.xml

[jacopoc]

Author: jacopoc
Date: Thu May 17 06:17:48 2007
New Revision: 538906

URL: http://svn.apache.org/viewvc?view=rev&rev=538906
Log:
Removed service call for the resetGrandTotal from the delete/updateOrderAdjustment services and moved to ECA.

Modified:
    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml
    ofbiz/trunk/applications/order/servicedef/secas.xml
    ofbiz/trunk/applications/order/servicedef/services.xml

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml?view=diff&rev=538906&r1=538905&r2=538906
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml Thu May 17 06:17:48 2007
@@ -41,20 +41,12 @@
         <entity-one entity-name="OrderAdjustment" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
-        
-        <!-- now reset the order grand total -->
-        <set from-field="lookedUpValue.orderId" field="params.orderId"/>
-        <call-service service-name="resetGrandTotal" in-map-name="params"/>
     </simple-method>
     <simple-method method-name="deleteOrderAdjustment" short-description="Delete an OrderAdjustment">
         <check-permission permission="ORDERMGR" action="_DELETE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunDeleteOrderAdjustement"/></check-permission>
         <check-errors/>
         <entity-one entity-name="OrderAdjustment" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
-    
-        <!-- now reset the order grand total -->
-        <set from-field="lookedUpValue.orderId" field="params.orderId"/>
-        <call-service service-name="resetGrandTotal" in-map-name="params"/>
     </simple-method>
     
     <simple-method method-name="createOrderAdjustmentBilling" short-description="Create an OrderAdjustmentBilling">

Modified: ofbiz/trunk/applications/order/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/secas.xml?view=diff&rev=538906&r1=538905&r2=538906
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/secas.xml Thu May 17 06:17:48 2007
@@ -81,8 +81,14 @@
         <action service="processExtendSubscriptionByOrder" mode="sync"/>
     </eca>
 
-    <!-- create adjustment change -->
+    <!-- order adjustments -->
     <eca service="createOrderAdjustment" event="commit">
+        <action service="resetGrandTotal" mode="sync"/>
+    </eca>
+    <eca service="updateOrderAdjustment" event="commit">
+        <action service="resetGrandTotal" mode="sync"/>
+    </eca>
+    <eca service="deleteOrderAdjustment" event="commit">
         <action service="resetGrandTotal" mode="sync"/>
     </eca>
 

Modified: ofbiz/trunk/applications/order/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services.xml?view=diff&rev=538906&r1=538905&r2=538906
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services.xml Thu May 17 06:17:48 2007
@@ -184,14 +184,14 @@
     </service>
     <service name="updateOrderAdjustment" default-entity-name="OrderAdjustment" engine="simple"
         location="org/ofbiz/order/order/OrderSimpleMethods.xml" invoke="updateOrderAdjustment">
-        <description>Update an order adjustment record and reset the order grand total</description>
+        <description>Update an order adjustment record</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
         <override name="orderId" optional="false"/>
     </service>
     <service name="deleteOrderAdjustment" default-entity-name="OrderAdjustment" engine="simple"
         location="org/ofbiz/order/order/OrderSimpleMethods.xml" invoke="deleteOrderAdjustment">
-        <description>Delete an order adjustment record and reset the order grand total</description>
+        <description>Delete an order adjustment record</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>