[Erp5-report] r30683 - in /erp5/trunk/bt5/erp5_commerce: SkinTemplateItem/portal_skins/erp5...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Nov 17 07:41:18 CET 2009
Author: lucas
Date: Tue Nov 17 07:41:16 2009
New Revision: 30683
URL: http://svn.erp5.org?rev=30683&view=rev
Log:
- fixed bug to proceed to payment button
- use Base_redirect instead of ERP5Site_redirect
- removed checkout web section
- fixed the visibility of some fields from SaleOrder_viewAsWeb
- added tips to shopping cart to help with the purchase procedure
- removed useless script
Added:
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartCheckoutStep.xml
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_paymentRedirect.xml
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSection_checkPaypalIdentification.xml
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_setupECommerceWebSite.xml
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Person_viewAsWeb/my_default_address_city.xml
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/comment.xml
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/customer.xml
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_comment.xml
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_payment_mode.xml
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/submit_payment.xml
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewShippingRenderer.xml
erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewShoppingCartRenderer.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=30683&r1=30682&r2=30683&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] Tue Nov 17 07:41:16 2009
@@ -237,8 +237,7 @@
if field_my_shipping_method in [\'\', None] and order_line is not None:\n
shopping_cart.manage_delObjects(order_line.getId())\n
\n
-context.SaleOrder_paymentRedirect(field_my_comment, field_my_payment_mode)\n
-return\n
+return context.SaleOrder_paymentRedirect(field_my_comment, field_my_payment_mode)\n
]]></string> </value>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_paymentRedirect.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_paymentRedirect.xml?rev=30683&r1=30682&r2=30683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_paymentRedirect.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_paymentRedirect.xml [utf8] Tue Nov 17 07:41:16 2009
@@ -84,7 +84,6 @@
\n
context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n
keep_items={\'portal_status_message\': msg})\n
-return\n
</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSection_checkPaypalIdentification.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSection_checkPaypalIdentification.xml?rev=30683&r1=30682&r2=30683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSection_checkPaypalIdentification.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSection_checkPaypalIdentification.xml [utf8] Tue Nov 17 07:41:16 2009
@@ -66,8 +66,8 @@
if parameter_dict[\'PAYERID\'] != payer_id:\n
return "Identification failed.2 : %s" % parameter_dict[\'PAYERID\']\n
\n
-context.ERP5Site_redirect(\'%s/checkout\' % context.getWebSiteValue().absolute_url(), \\\n
- keep_items={\'portal_status_message\':translateString("Your paypal account is authentificated.", mapping = dict()),\n
+context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n
+ keep_items={\'portal_status_message\':translateString("Your paypal account is authentificated.", mapping = dict()),\n
\'token\':token})\n
</string> </value>
</item>
Added: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartCheckoutStep.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartCheckoutStep.xml?rev=30683&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartCheckoutStep.xml (added)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_getShoppingCartCheckoutStep.xml [utf8] Tue Nov 17 07:41:16 2009
@@ -1,0 +1,158 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>""" \n
+ Return the current step for checkout procedure that will be displayed on Shopping Cart page.\n
+"""\n
+web_site = context.getWebSiteValue()\n
+shopping_cart = web_site.SaleOrder_getShoppingCart()\n
+empty_cart = shopping_cart.SaleOrder_isShoppingCartEmpty()\n
+is_consistent = shopping_cart.SaleOrder_isConsistent()\n
+is_anonymous = context.portal_membership.isAnonymousUser()\n
+\n
+if empty_cart:\n
+ return context.Base_translateString(\'Add a product to your Shopping Cart.\')\n
+\n
+if not is_consistent:\n
+ return context.Base_translateString(\'Select a Shipping Service.\')\n
+\n
+if is_consistent and is_anonymous:\n
+ return context.Base_translateString(\'Please, you must login to proceed.\')\n
+\n
+if is_consistent and not is_anonymous:\n
+ return context.Base_translateString(\'Select your billing address.\')\n
+\n
+return\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>_proxy_roles</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>web_site</string>
+ <string>shopping_cart</string>
+ <string>empty_cart</string>
+ <string>is_consistent</string>
+ <string>is_anonymous</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>WebSite_getShoppingCartCheckoutStep</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Get current Shopping Cart step for checkout procedure.</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_setupECommerceWebSite.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_setupECommerceWebSite.xml?rev=30683&r1=30682&r2=30683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_setupECommerceWebSite.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/WebSite_setupECommerceWebSite.xml [utf8] Tue Nov 17 07:41:16 2009
@@ -61,19 +61,17 @@
})\n
\n
# creation the default sections\n
-object_id_list = [\'cart\', \'checkout\', \'account\', \'register\']\n
+object_id_list = [\'cart\', \'account\', \'register\']\n
for id in object_id_list:\n
if id in context.objectIds():\n
context.manage_delObjects([id])\n
\n
cart_section = context.newContent(portal_type=\'Web Section\', title=\'Cart\', id=\'cart\')\n
-checkout_section = context.newContent(portal_type=\'Web Section\', title=\'Checkout\', id=\'checkout\')\n
account_section = context.newContent(portal_type=\'Web Section\', title=\'My account\', id=\'account\')\n
register_section = context.newContent(portal_type=\'Web Section\', title=\'Register\', id=\'register\')\n
\n
# make some visible by default\n
cart_section.setVisible(True)\n
-checkout_section.setVisible(True)\n
\n
# setup site properties\n
context.setContainerLayout(\'erp5_web_multiflex5_commerce_layout\')\n
@@ -87,9 +85,6 @@
cart_section.setCustomRenderMethodId(\'SaleOrder_viewAsWeb\')\n
cart_section.setProperty(\'ecommerce_default_content\', True)\n
cart_section.setProperty(\'ecommerce_product_list\', False)\n
-checkout_section.setCustomRenderMethodId(\'SaleOrder_viewConfirmAsWeb\')\n
-checkout_section.setProperty(\'ecommerce_default_content\', True)\n
-checkout_section.setProperty(\'ecommerce_product_list\', False)\n
account_section.setCustomRenderMethodId(\'WebSection_viewCurrentPersonAsWeb\')\n
account_section.setProperty(\'ecommerce_default_content\', True)\n
account_section.setProperty(\'ecommerce_product_list\', False)\n
@@ -144,7 +139,6 @@
<string>_getiter_</string>
<string>id</string>
<string>cart_section</string>
- <string>checkout_section</string>
<string>account_section</string>
<string>register_section</string>
<string>True</string>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Person_viewAsWeb/my_default_address_city.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Person_viewAsWeb/my_default_address_city.xml?rev=30683&r1=30682&r2=30683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Person_viewAsWeb/my_default_address_city.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Person_viewAsWeb/my_default_address_city.xml [utf8] Tue Nov 17 07:41:16 2009
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
- </tuple>
- <none/>
+ <global name="StringField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/comment.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/comment.xml?rev=30683&r1=30682&r2=30683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/comment.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/comment.xml [utf8] Tue Nov 17 07:41:16 2009
@@ -80,7 +80,9 @@
</item>
<item>
<key> <string>enabled</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>extra</string> </key>
@@ -88,9 +90,7 @@
</item>
<item>
<key> <string>hidden</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -156,7 +156,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>not: here/SaleOrder_isConsistent</string> </value>
+ <value> <string>python: not here.SaleOrder_isShoppingCartEmpty()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/customer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/customer.xml?rev=30683&r1=30682&r2=30683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/customer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/customer.xml [utf8] Tue Nov 17 07:41:16 2009
@@ -163,9 +163,7 @@
</item>
<item>
<key> <string>hidden</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
@@ -308,20 +306,4 @@
</dictionary>
</pickle>
</record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>not: here/SaleOrder_isConsistent</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_comment.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_comment.xml?rev=30683&r1=30682&r2=30683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_comment.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_comment.xml [utf8] Tue Nov 17 07:41:16 2009
@@ -16,6 +16,7 @@
<string>css_class</string>
<string>default</string>
<string>description</string>
+ <string>enabled</string>
<string>hidden</string>
<string>title</string>
</list>
@@ -61,19 +62,23 @@
<dictionary>
<item>
<key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>default</string> </key>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -85,9 +90,7 @@
</item>
<item>
<key> <string>hidden</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
@@ -115,6 +118,10 @@
<item>
<key> <string>description</string> </key>
<value> <string>The customer must be able to add a comment during the checkout procedure.</string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -153,7 +160,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: not here.SaleOrder_isConsistent() and \'hiddenLabel\' or \'\'</string> </value>
+ <value> <string>python: here.SaleOrder_getShoppingCart().getComment()</string> </value>
</item>
</dictionary>
</pickle>
@@ -169,23 +176,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.SaleOrder_getShoppingCart().getComment()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="4" aka="AAAAAAAAAAQ=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>not: here/SaleOrder_isConsistent</string> </value>
+ <value> <string>python: not here.SaleOrder_isShoppingCartEmpty()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_payment_mode.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_payment_mode.xml?rev=30683&r1=30682&r2=30683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_payment_mode.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_payment_mode.xml [utf8] Tue Nov 17 07:41:16 2009
@@ -15,6 +15,7 @@
<list>
<string>css_class</string>
<string>default</string>
+ <string>enabled</string>
<string>items</string>
</list>
</value>
@@ -68,6 +69,12 @@
</value>
</item>
<item>
+ <key> <string>enabled</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -78,7 +85,7 @@
<item>
<key> <string>items</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
@@ -99,6 +106,10 @@
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -151,6 +162,22 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
+ <value> <string>python: not here.SaleOrder_isShoppingCartEmpty()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
<value> <string>python: [o.getTitle() for o in here.getPortalObject().portal_categories.payment_mode.contentValues() if o.getId() in here.getWebSiteValue().getLayoutProperty(\'ecommerce_payment_mode_list\', \'\')]</string> </value>
</item>
</dictionary>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/submit_payment.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/submit_payment.xml?rev=30683&r1=30682&r2=30683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/submit_payment.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/submit_payment.xml [utf8] Tue Nov 17 07:41:16 2009
@@ -96,7 +96,9 @@
</item>
<item>
<key> <string>enabled</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>extra</string> </key>
@@ -104,9 +106,7 @@
</item>
<item>
<key> <string>hidden</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>image</string> </key>
@@ -188,7 +188,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>not: here/SaleOrder_isConsistent</string> </value>
+ <value> <string>python: not here.SaleOrder_isShoppingCartEmpty()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewShippingRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewShippingRenderer.xml?rev=30683&r1=30682&r2=30683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewShippingRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewShippingRenderer.xml [utf8] Tue Nov 17 07:41:16 2009
@@ -48,8 +48,10 @@
<tal:block tal:condition="python: shipping is None">\n
<h3> <span tal:replace="python: here.Base_translateString(\'You have not selected shipping\')"/></h3>\n
<p> \n
- <span tal:replace="python: here.Base_translateString(\'Your current cart selection requires shipping. Please select shipping from\')"/>\n
- <a tal:attributes="href python: \'%s/cart\' % web_site.absolute_url()">here</a>.\n
+ <strong>\n
+ <span tal:replace="python: here.Base_translateString(\'Your current cart selection requires shipping. Please select shipping from\')"/>\n
+ <a tal:attributes="href python: \'%s/cart\' % web_site.absolute_url()">here</a>.\n
+ </strong>\n
</p>\n
</tal:block>\n
\n
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewShoppingCartRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewShoppingCartRenderer.xml?rev=30683&r1=30682&r2=30683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewShoppingCartRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewShoppingCartRenderer.xml [utf8] Tue Nov 17 07:41:16 2009
@@ -48,6 +48,9 @@
<h2>\n
<span tal:replace="python: here.Base_translateString(\'My shopping cart\')"/>\n
</h2>\n
+ <h6>\n
+ <span tal:replace="python: web_site.WebSite_getShoppingCartCheckoutStep()"/>\n
+ </h6>\n
<tal:block tal:condition = "empty_cart"> \n
<h3><span tal:replace="python: here.Base_translateString(\'Your shopping cart is empty.\')"/></h3><br/>\n
</tal:block>\n
@@ -116,7 +119,9 @@
<b><span tal:replace="python: \'%s %s\' % (shipping_obj.getPrice(), currency_code)"/></b>\n
</tal:block>\n
<tal:block tal:condition="python: shipping is None">\n
- <span tal:replace="python: here.Base_translateString(\'Your current cart selection requires shipping.\')"/><br/>\n
+ <b>\n
+ <span tal:replace="python: here.Base_translateString(\'Your current cart selection requires shipping.\')"/><br/>\n
+ </b>\n
</tal:block>\n
</td>\n
</tr>\n
Modified: erp5/trunk/bt5/erp5_commerce/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/bt/revision?rev=30683&r1=30682&r2=30683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/bt/revision [utf8] Tue Nov 17 07:41:16 2009
@@ -1,1 +1,1 @@
-246
+248
More information about the Erp5-report
mailing list