[Erp5-report] r30672 - in /erp5/trunk/bt5/erp5_commerce: SkinTemplateItem/portal_skins/erp5...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Nov 16 16:26:02 CET 2009
Author: lucas
Date: Mon Nov 16 16:26:01 2009
New Revision: 30672
URL: http://svn.erp5.org?rev=30672&view=rev
Log:
- fixed the script redirect.
- removed update button.
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_widget_library/SaleOrder_viewAsWeb.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/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=30672&r1=30671&r2=30672&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 Nov 16 16:26:01 2009
@@ -237,8 +237,8 @@
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
+context.SaleOrder_paymentRedirect(field_my_comment, field_my_payment_mode)\n
+return\n
]]></string> </value>
@@ -251,7 +251,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>field_my_buy_quantity=None, field_my_shipping_method=None</string> </value>
+ <value> <string>field_my_buy_quantity=None, field_my_shipping_method=None, field_my_comment=None, field_my_payment_mode=None, **kw</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
@@ -280,7 +280,7 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>2</int> </value>
+ <value> <int>4</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
@@ -288,6 +288,9 @@
<tuple>
<string>field_my_buy_quantity</string>
<string>field_my_shipping_method</string>
+ <string>field_my_comment</string>
+ <string>field_my_payment_mode</string>
+ <string>kw</string>
<string>Products.ERP5Type.Document</string>
<string>newTempOrderLine</string>
<string>_getattr_</string>
@@ -313,7 +316,6 @@
<string>_inplacevar_</string>
<string>getattr</string>
<string>shipping</string>
- <string>dict</string>
</tuple>
</value>
</item>
@@ -328,6 +330,8 @@
<tuple>
<none/>
<none/>
+ <none/>
+ <none/>
</tuple>
</value>
</item>
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=30672&r1=30671&r2=30672&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] Mon Nov 16 16:26:01 2009
@@ -82,7 +82,7 @@
msg = translateString("This payment mode is actually not activated, sorry: ${payment_mode}", \n
mapping=dict(payment_mode=field_my_payment_mode))\n
\n
-context.Base_redirect(\'SaleOrder_viewConfirmAsWeb\', \\\n
+context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n
keep_items={\'portal_status_message\': msg})\n
return\n
</string> </value>
Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb.xml?rev=30672&r1=30671&r2=30672&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb.xml [utf8] Mon Nov 16 16:26:01 2009
@@ -86,7 +86,6 @@
<string>shopping_cart</string>
<string>my_shipping_method</string>
<string>my_payment_mode</string>
- <string>submit_update</string>
<string>customer</string>
<string>discounts</string>
<string>comment</string>
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=30672&r1=30671&r2=30672&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] Mon Nov 16 16:26:01 2009
@@ -15,7 +15,6 @@
<list>
<string>css_class</string>
<string>default</string>
- <string>hidden</string>
<string>items</string>
</list>
</value>
@@ -60,14 +59,12 @@
<dictionary>
<item>
<key> <string>css_class</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
@@ -79,15 +76,9 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>hidden</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
- </value>
- </item>
- <item>
<key> <string>items</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
@@ -118,10 +109,6 @@
<value> <string>TradeCondition_viewPayment</string> </value>
</item>
<item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
<key> <string>items</string> </key>
<value>
<list/>
@@ -148,44 +135,12 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: not here.SaleOrder_isConsistent() and \'hiddenLabel\' or \'shopping_cart_renderer_shipping\'</string> </value>
+ <value> <string>python: here.getWebSiteValue().SaleOrder_getShoppingCart().getPaymentConditionPaymentMode()</string> </value>
</item>
</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>python: here.getWebSiteValue().SaleOrder_getShoppingCart().getPaymentConditionPaymentMode()</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>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="5" aka="AAAAAAAAAAU=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
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=30672&r1=30671&r2=30672&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] Mon Nov 16 16:26:01 2009
@@ -133,7 +133,7 @@
</item>
<item>
<key> <string>css_class</string> </key>
- <value> <string>hiddenLabel</string> </value>
+ <value> <string>hiddenLabel shopping_cart_renderer_submit</string> </value>
</item>
<item>
<key> <string>default</string> </key>
@@ -165,7 +165,7 @@
</item>
<item>
<key> <string>name</string> </key>
- <value> <string>SaleOrder_paymentRedirect:method</string> </value>
+ <value> <string>SaleOrder_editShoppingCart:method</string> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: erp5/trunk/bt5/erp5_commerce/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/bt/revision?rev=30672&r1=30671&r2=30672&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/bt/revision [utf8] Mon Nov 16 16:26:01 2009
@@ -1,1 +1,1 @@
-244
+246
More information about the Erp5-report
mailing list