Skip to content

erp5
erp5
Commit deb61379 authored by Lucas Carvalho's avatar Lucas Carvalho
Browse files
Options

- fixed the script redirect. 

- removed update button.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30673 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 65abf96e
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 251 deletions
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_editShoppingCart.xml
View file @ deb61379
...@@ -237,8 +237,8 @@ else:\n ...@@ -237,8 +237,8 @@ else:\n
if field_my_shipping_method in [\'\', None] and order_line is not None:\n if field_my_shipping_method in [\'\', None] and order_line is not None:\n
shopping_cart.manage_delObjects(order_line.getId())\n shopping_cart.manage_delObjects(order_line.getId())\n
\n \n
context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n context.SaleOrder_paymentRedirect(field_my_comment, field_my_payment_mode)\n
keep_items={\'portal_status_message\': translateString("Your cart was successfuly updated.", mapping = dict())})\n return\n
]]></string> </value> ]]></string> </value>
...@@ -251,7 +251,7 @@ context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n ...@@ -251,7 +251,7 @@ context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <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>
<item> <item>
<key> <string>_proxy_roles</string> </key> <key> <string>_proxy_roles</string> </key>
...@@ -280,7 +280,7 @@ context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n ...@@ -280,7 +280,7 @@ context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>2</int> </value> <value> <int>4</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -288,6 +288,9 @@ context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n ...@@ -288,6 +288,9 @@ context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n
<tuple> <tuple>
<string>field_my_buy_quantity</string> <string>field_my_buy_quantity</string>
<string>field_my_shipping_method</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>Products.ERP5Type.Document</string>
<string>newTempOrderLine</string> <string>newTempOrderLine</string>
<string>_getattr_</string> <string>_getattr_</string>
...@@ -313,7 +316,6 @@ context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n ...@@ -313,7 +316,6 @@ context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n
<string>_inplacevar_</string> <string>_inplacevar_</string>
<string>getattr</string> <string>getattr</string>
<string>shipping</string> <string>shipping</string>
<string>dict</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -328,6 +330,8 @@ context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n ...@@ -328,6 +330,8 @@ context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n
<tuple> <tuple>
<none/> <none/>
<none/> <none/>
<none/>
<none/>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_paymentRedirect.xml
View file @ deb61379
...@@ -82,7 +82,7 @@ else:\n ...@@ -82,7 +82,7 @@ else:\n
msg = translateString("This payment mode is actually not activated, sorry: ${payment_mode}", \n msg = translateString("This payment mode is actually not activated, sorry: ${payment_mode}", \n
mapping=dict(payment_mode=field_my_payment_mode))\n mapping=dict(payment_mode=field_my_payment_mode))\n
\n \n
context.Base_redirect(\'SaleOrder_viewConfirmAsWeb\', \\\n context.Base_redirect(\'SaleOrder_viewAsWeb\', \\\n
keep_items={\'portal_status_message\': msg})\n keep_items={\'portal_status_message\': msg})\n
return\n return\n
</string> </value> </string> </value>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb.xml
View file @ deb61379
...@@ -86,7 +86,6 @@ ...@@ -86,7 +86,6 @@
<string>shopping_cart</string> <string>shopping_cart</string>
<string>my_shipping_method</string> <string>my_shipping_method</string>
<string>my_payment_mode</string> <string>my_payment_mode</string>
<string>submit_update</string>
<string>customer</string> <string>customer</string>
<string>discounts</string> <string>discounts</string>
<string>comment</string> <string>comment</string>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_payment_mode.xml
View file @ deb61379
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
<list> <list>
<string>css_class</string> <string>css_class</string>
<string>default</string> <string>default</string>
<string>hidden</string>
<string>items</string> <string>items</string>
</list> </list>
</value> </value>
...@@ -60,14 +59,12 @@ ...@@ -60,14 +59,12 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -78,16 +75,10 @@ ...@@ -78,16 +75,10 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>hidden</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>items</string> </key> <key> <string>items</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -117,10 +108,6 @@ ...@@ -117,10 +108,6 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>TradeCondition_viewPayment</string> </value> <value> <string>TradeCondition_viewPayment</string> </value>
</item> </item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>items</string> </key> <key> <string>items</string> </key>
<value> <value>
...@@ -138,22 +125,6 @@ ...@@ -138,22 +125,6 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: not here.SaleOrder_isConsistent() and \'hiddenLabel\' or \'shopping_cart_renderer_shipping\'</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
...@@ -169,23 +140,7 @@ ...@@ -169,23 +140,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ="> <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>
<record id="5" aka="AAAAAAAAAAU=">
<pickle> <pickle>
<tuple> <tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/submit_payment.xml
View file @ deb61379
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string>hiddenLabel</string> </value> <value> <string>hiddenLabel shopping_cart_renderer_submit</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
</item> </item>
<item> <item>
<key> <string>name</string> </key> <key> <string>name</string> </key>
<value> <string>SaleOrder_paymentRedirect:method</string> </value> <value> <string>SaleOrder_editShoppingCart:method</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/submit_update.xml deleted 100644 → 0
View file @ 65abf96e
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="InputButtonField" module="Products.ERP5Form.InputButtonField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>submit_update</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>image</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string>hiddenLabel shopping_cart_renderer_submit</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string>Update</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>image</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>SaleOrder_editShoppingCart:method</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Update</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: not here.SaleOrder_isShoppingCartEmpty()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_commerce/bt/revision
View file @ deb61379
244 246
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7