svn commit: r780015 - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml

[jacopoc]

Author: jacopoc
Date: Fri May 29 15:26:08 2009
New Revision: 780015

URL: http://svn.apache.org/viewvc?rev=780015&view=rev
Log:
Misc fixes for the quote to order process.

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=780015&r1=780014&r2=780015&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Fri May 29 15:26:08 2009
@@ -774,7 +774,12 @@
                 Iterator i = cart.iterator();
                 while (i.hasNext()) {
                     ShoppingCartItem item = (ShoppingCartItem) i.next();
-                    adjs = (List)orderAdjsMap.get(item.getOrderItemSeqId());
+                    String orderItemSeqId = item.getOrderItemSeqId();
+                    if (orderItemSeqId != null) {
+                        adjs = (List)orderAdjsMap.get(orderItemSeqId);
+                    } else {
+                        adjs = null;
+                    }
                     if (adjs != null) {
                         item.getAdjustments().addAll(adjs);
                     }

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=780015&r1=780014&r2=780015&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Fri May 29 15:26:08 2009
@@ -1538,6 +1538,7 @@
         <response name="shipping" type="view" value="shipsetting"/>
         <response name="options" type="view" value="optionsetting"/>
         <response name="payment" type="view" value="paymentoptions"/>
+        <response name="term" type="view" value="paymentoptions"/> <!-- this actually wants to go to a page to set the order terms, but for ecommerce we'll skip it and go to the payment options page -->
         <response name="addparty" type="request" value="calcShipping"/> <!-- this actually wants to go to a page to set another party, but for ecommerce we'll skip it and go to the beginning of the chain for review and checkout -->
         <response name="paysplit" type="view" value="checkoutpayment"/>
         <response name="sales" type="request" value="calcShipping"/>