[Erp5-report] r28418 - in /erp5/trunk/bt5/erp5_commerce: SkinTemplateItem/portal_skins/erp5...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Aug 17 17:36:31 CEST 2009
Author: lucas
Date: Mon Aug 17 17:36:31 2009
New Revision: 28418
URL: http://svn.erp5.org?rev=28418&view=rev
Log:
Fixed bugs.
When you are editing the Shopping Cart without shipping service or with a shipping service without price.
Modified:
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_editShoppingCart.xml
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartTotalPrice.xml
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_shipping_method.xml
erp5/trunk/bt5/erp5_commerce/bt/revision
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_editShoppingCart.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_editShoppingCart.xml?rev=28418&r1=28417&r2=28418&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_editShoppingCart.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_editShoppingCart.xml [utf8] Mon Aug 17 17:36:31 2009
@@ -202,36 +202,40 @@
translateString = context.Base_translateString \n
quantity = field_my_buy_quantity\n
shipping_method = field_my_shipping_method\n
-shopping_cart_items = context.SaleOrder_getShoppingCartItemList(include_shipping = True)\n
+shopping_cart_items = context.SaleOrder_getShoppingCartItemList(include_shipping=True)\n
shopping_cart_products_items = filter(lambda x: x.getId()!=\'shipping_method\', shopping_cart_items)\n
shopping_cart = context.SaleOrder_getShoppingCart()\n
\n
# handle change in quantity for shopping items\n
if quantity is not None:\n
- ## when we have one item in shoppping cart we get \n
- ## quantity as a string rather as a list\n
+ # when we have one item in shoppping cart we get \n
+ # quantity as a string rather as a list\n
if isinstance(quantity, str):\n
quantity = [quantity]\n
+\n
counter = 0\n
for order_line in shopping_cart_products_items:\n
new_quantity = int(quantity[counter])\n
if new_quantity>=1:\n
order_line.setQuantity(new_quantity)\n
else:\n
- ## remove it from shopping cart\n
+ # remove it from shopping cart\n
shopping_cart.manage_delObjects(order_line.getId())\n
counter += 1\n
\n
-## handle shipping\n
-if shipping_method is not None:\n
+# handle shipping\n
+order_line = getattr(shopping_cart, \'shipping_method\', None)\n
+if shipping_method not in [\'\', None]:\n
shipping = context.getPortalObject().restrictedTraverse(shipping_method)\n
- order_line = getattr(shopping_cart, \'shipping_method\', None)\n
if order_line is None:\n
- ## create new shipping method order line\n
+ # create new shipping method order line\n
order_line = shopping_cart.newContent(id=\'shipping_method\', portal_type=\'Sale Order Line\')\n
- ## .. and update it\n
+ # .. and update it\n
order_line.setResource(shipping.getRelativeUrl())\n
order_line.setQuantity(1)\n
+else:\n
+ if field_my_shipping_method in [\'\', None] and order_line is not None:\n
+ shopping_cart.manage_delObjects(order_line.getId())\n
\n
context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n
keep_items={\'portal_status_message\': translateString("Your cart was successfuly updated.", mapping = dict())})\n
@@ -307,8 +311,8 @@
<string>_getitem_</string>
<string>new_quantity</string>
<string>_inplacevar_</string>
+ <string>getattr</string>
<string>shipping</string>
- <string>getattr</string>
<string>dict</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartTotalPrice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartTotalPrice.xml?rev=28418&r1=28417&r2=28418&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartTotalPrice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCartTotalPrice.xml [utf8] Mon Aug 17 17:36:31 2009
@@ -69,7 +69,8 @@
shopping_cart_items = context.SaleOrder_getShoppingCartItemList(include_shipping)\n
for order_line in shopping_cart_items:\n
resource = context.restrictedTraverse(order_line.getResource())\n
- total += order_line.getPrice() * order_line.getQuantity()\n
+ if order_line.getPrice() is not None:\n
+ total += order_line.getPrice() * order_line.getQuantity()\n
\n
# XXX: CHECK if we have to include taxes on shipping service\n
if include_taxes:\n
@@ -137,9 +138,9 @@
<string>_getiter_</string>
<string>order_line</string>
<string>resource</string>
+ <string>None</string>
<string>_inplacevar_</string>
<string>tax_info</string>
- <string>None</string>
<string>tax_name</string>
<string>tax_percent</string>
<string>currency</string>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_shipping_method.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_shipping_method.xml?rev=28418&r1=28417&r2=28418&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_shipping_method.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_shipping_method.xml [utf8] Mon Aug 17 17:36:31 2009
@@ -311,7 +311,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: [(\'\', \'\')] + [( \'%s - %s %s\' %(o.getObject().getTitle(), o.getObject().getPrice(), here.SaleOrder_getShoppingCartDefaultCurrency().getTitle() ), o.getObject().getRelativeUrl(),) for o in here.SaleOrder_getAvailableShippingResourceList()]</string> </value>
+ <value> <string>python: [(\'\', \'\')] + [( \'%s - %s %s\' %(o.getObject().getTitle(), o.getObject().getPrice(), here.SaleOrder_getShoppingCartDefaultCurrency().getTitle() ), o.getObject().getRelativeUrl(),) for o in here.SaleOrder_getAvailableShippingResourceList() if o.getObject().getPrice() is not None]</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_commerce/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/bt/revision?rev=28418&r1=28417&r2=28418&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/bt/revision [utf8] Mon Aug 17 17:36:31 2009
@@ -1,1 +1,1 @@
-155
+147
More information about the Erp5-report
mailing list