svn commit: r593895 - in /ofbiz/trunk/applications: order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java product/servicedef/services_pricepromo.xml

Author: jleroux
Date: Sun Nov 11 06:45:44 2007
New Revision: 593895

URL: http://svn.apache.org/viewvc?rev=593895&view=rev
Log:
Reverse the previous change and add an amount attribute which was midsing in calculatePurchasePrice service (from a Jacopo's svn commit comment for services_pricespromo.xml)

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
    ofbiz/trunk/applications/product/servicedef/services_pricepromo.xml

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=593895&r1=593894&r2=593895&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Sun Nov 11 06:45:44 2007
@@ -1028,6 +1028,7 @@
                     priceContext.put("partyId", partyId);
                 }
                 priceContext.put("quantity", new Double(this.getQuantity()));
+                priceContext.put("amount", new Double(this.getSelectedAmount()));
                 priceContext.put("product", this.getProduct());
                 if (cart.getOrderType().equals("PURCHASE_ORDER")) {
                     Map priceResult = dispatcher.runSync("calculatePurchasePrice", priceContext);

Modified: ofbiz/trunk/applications/product/servicedef/services_pricepromo.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_pricepromo.xml?rev=593895&r1=593894&r2=593895&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_pricepromo.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_pricepromo.xml Sun Nov 11 06:45:44 2007
@@ -327,6 +327,7 @@
         <attribute name="currencyUomId" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="true"/>
         <attribute name="quantity" type="Double" mode="IN" optional="true"/>
+        <attribute name="amount" type="Double" mode="IN" optional="true"/>
         
         <attribute name="price" type="Double" mode="OUT" optional="false"/>
         <attribute name="validPriceFound" type="Boolean" mode="OUT" optional="false"/>