svn commit: r508722 - in /ofbiz/trunk/applications/product: servicedef/services_subscription.xml src/org/ofbiz/product/subscription/SubscriptionServices.java

[byersa-3]

Author: byersa
Date: Fri Feb 16 23:54:44 2007
New Revision: 508722

URL: http://svn.apache.org/viewvc?view=rev&rev=508722
Log:
Modified subscription generating services to set the orderItemSeqId field in the Subscription entity.

Modified:
    ofbiz/trunk/applications/product/servicedef/services_subscription.xml
    ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java

Modified: ofbiz/trunk/applications/product/servicedef/services_subscription.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_subscription.xml?view=diff&rev=508722&r1=508721&r2=508722
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_subscription.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_subscription.xml Fri Feb 16 23:54:44 2007
@@ -92,6 +92,7 @@
         <attribute name="subscriptionResourceId" type="String" mode="IN" optional="false"/>
         <attribute name="productId" type="String" mode="IN" optional="true"/>
         <attribute name="orderId" type="String" mode="IN" optional="true"/>
+        <attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/>
         <attribute name="useRoleTypeId" type="String" mode="IN" optional="true"/>
         <attribute name="useTimeUomId" type="String" mode="IN" optional="false"/>
         <attribute name="useTime" type="Integer" mode="IN" optional="false"/>
@@ -104,6 +105,7 @@
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="orderId" type="String" mode="IN" optional="true"/>
+        <attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/>
         <attribute name="orderCreatedDate" type="Timestamp" mode="IN" optional="true" />
         <attribute name="quantity" type="Integer" mode="IN" optional="false"/>
     </service>

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java?view=diff&rev=508722&r1=508721&r2=508722
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java Fri Feb 16 23:54:44 2007
@@ -80,6 +80,7 @@
             newSubscription.set("roleTypeId", roleTypeId);
             newSubscription.set("productId", context.get("productId"));
             newSubscription.set("orderId", context.get("orderId"));
+            newSubscription.set("orderItemSeqId", context.get("orderItemSeqId"));
         } else {
             newSubscription = lastSubscription;
         }
@@ -250,6 +251,7 @@
                 if (productSubscriptionResourceListFiltered.size() > 0) {
                     context.put("productId", productId);
                     context.put("orderId", orderId);
+                    context.put("orderItemSeqId", orderItem.get("orderItemSeqId"));
                     context.put("quantity", new Integer(qty.intValue()));
                     Map ctx = dctx.getModelService("processExtendSubscriptionByProduct").makeValid(context, ModelService.IN_PARAM);
                     Map thisResult = dispatcher.runSync("processExtendSubscriptionByProduct", ctx);