[Erp5-report] r28192 - in /erp5/trunk/bt5/erp5_commerce: SkinTemplateItem/portal_skins/erp5...

[nobody at svn.erp5.org]

Author: vincentd
Date: Tue Jul 28 17:14:43 2009
New Revision: 28192

URL: http://svn.erp5.org?rev=28192&view=rev
Log:
#vincentd
Dont generate Order dict if there is no product in the cart. And fix the price of shipping to 0 if no shipping selected (shipping requierement is not to handle at this level).

Modified:
    erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalOrderParameterDict.xml
    erp5/trunk/bt5/erp5_commerce/bt/revision

Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalOrderParameterDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalOrderParameterDict.xml?rev=28192&r1=28191&r2=28192&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalOrderParameterDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getPaypalOrderParameterDict.xml [utf8] Tue Jul 28 17:14:43 2009
@@ -59,11 +59,17 @@
 \n
 shopping_cart = context.SaleOrder_getShoppingCart()\n
 shopping_cart_product_list = shopping_cart.SaleOrder_getShoppingCartItemList()\n
+\n
+if len(shopping_cart_product_list) == 0:\n
+  return None \n
+\n
 shopping_cart_price = float(shopping_cart.SaleOrder_getShoppingCartTotalPrice())\n
 taxes_amount = float(shopping_cart.SaleOrder_getShoppingCartTotalPrice(include_taxes=True, include_shipping=True)) - \\\n
                float(shopping_cart.SaleOrder_getShoppingCartTotalPrice(include_shipping=True));\n
 shipping = context.SaleOrder_getSelectedShippingResource()\n
 shipping_price = context.restrictedTraverse(shipping).getPrice()\n
+if shipping_price is None:\n
+  shipping_price = 0\n
 customer = context.SaleOrder_getShoppingCartCustomer()\n
 site_url = context.getWebSiteValue().absolute_url()\n
 \n
@@ -134,6 +140,7 @@
                             <string>None</string>
                             <string>shopping_cart</string>
                             <string>shopping_cart_product_list</string>
+                            <string>len</string>
                             <string>float</string>
                             <string>shopping_cart_price</string>
                             <string>True</string>

Modified: erp5/trunk/bt5/erp5_commerce/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/bt/revision?rev=28192&r1=28191&r2=28192&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/bt/revision [utf8] Tue Jul 28 17:14:43 2009
@@ -1,1 +1,1 @@
-144
+145