Skip to content

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

- improving the checkout procedure even more. 

- fixed a bug for account registration during the checkout procedure.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30500 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c1f184c3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1463 additions and 49 deletions
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_finalizeShopping.xml
View file @ cb6925bf
......@@ -204,10 +204,9 @@ customer = context.SaleOrder_getShoppingCartCustomer()\n
\n
if isAnon:\n
# create first an account for user\n
msg = translateString("You need to create an account to continue If you already have please login.")\n
context.Base_redirect(\'WebSite_viewRegistrationDialog\', \\\n
keep_items={\'portal_status_message\': msg,\n
\'editable_mode\': 1})\n
msg = translateString("You need to create an account to continue. If you already have please login.")\n
web_site.Base_redirect(\'register\', \\\n
keep_items={\'portal_status_message\': msg})\n
return\n
\n
# XXX: Implement check if payment is sucessfull\n
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_paymentRedirect.xml
View file @ cb6925bf
......@@ -65,10 +65,10 @@ if field_my_comment is not None:\n
\n
if isAnon:\n
# create first an account for user\n
web_site = context.getWebSiteValue()\n
msg = translateString("You need to create an account to continue. If you already have please login.")\n
context.Base_redirect(\'WebSite_viewRegistrationDialog\', \\\n
keep_items={\'editable_mode\': 0,\n
\'portal_status_message\': msg})\n
web_site.Base_redirect(\'register\', \\\n
keep_items={\'portal_status_message\': msg})\n
return\n
\n
if field_my_payment_mode is None:\n
......@@ -139,6 +139,7 @@ return\n
<string>translateString</string>
<string>None</string>
<string>shopping_cart</string>
<string>web_site</string>
<string>msg</string>
<string>dict</string>
</tuple>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_multiflex_layout/mf54_commerce.css.xml
View file @ cb6925bf
......@@ -77,15 +77,16 @@
">\n
\n
.main_content h2 {margin:0px;}\n
.main_content h3 {font-size:120% !important; color:#FF0000;}\n
div.portal_status_message h3 {margin:0px;}\n
\n
#fieldset_left {padding:10px;}\n
#fieldset_left div.field {margin-top:5px; margin-bottom: 10px;}\n
#fieldset_left label {font-size: 120% !important; color:#505050; float:left; width: <tal:block tal:replace="python: main_content_width / 5"/>px;}\n
#fieldset_left label {width: 135px !important; font-size: 120% !important; color:#505050; float:left; width: <tal:block tal:replace="python: main_content_width / 5"/>px;}\n
#fieldset_left label a {display:none;}\n
#fieldset_right {padding:10px;}\n
#fieldset_right div.field {margin-top:5px; margin-bottom: 10px;}\n
#fieldset_right label {font-size: 120% !important; color:#505050; float:left; width:<tal:block tal:replace="python: main_content_width / 5"/>px;}\n
#fieldset_right label {width: 135px !important; font-size: 120% !important; color:#505050; float:left; width:<tal:block tal:replace="python: main_content_width / 5"/>px;}\n
#fieldset_right label a {display:none;}\n
#fieldset_center {padding:10px;}\n
#fieldset_center div.field {margin-top:5px; margin-bottom: 10px;}\n
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb.xml
View file @ cb6925bf
......@@ -85,6 +85,12 @@
<list>
<string>shopping_cart</string>
<string>my_shipping_method</string>
<string>my_payment_mode</string>
<string>submit2</string>
<string>customer</string>
<string>discounts</string>
<string>comment</string>
<string>my_comment</string>
<string>submit</string>
</list>
</value>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/comment.xml 0 → 100644
View file @ cb6925bf
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="LabelField" module="Products.Formulator.StandardFields"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>comment</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>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>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<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>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</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>css_class</string> </key>
<value> <string>hiddenLabel</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string encoding="cdata"><![CDATA[
<h2>Add A Comment</h2>
]]></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>title</string> </key>
<value> <string>Add Comment</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>not: here/SaleOrder_isConsistent</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_comment.xml 0 → 100644
View file @ cb6925bf
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>css_class</string>
<string>default</string>
<string>description</string>
<string>hidden</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_comment</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>css_class</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>default</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>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>target</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>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>The customer must be able to add a comment during the checkout procedure.</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_comment</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>SaleOrder_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Comment</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_isConsistent() and \'hiddenLabel\' or \'\'</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.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>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_payment_mode.xml 0 → 100644
View file @ cb6925bf
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>css_class</string>
<string>default</string>
<string>hidden</string>
<string>items</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_payment_mode</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<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>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>css_class</string> </key>
<value> <string>shopping_cart_renderer_shipping</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_payment_condition_payment_mode</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<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/>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</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: 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>not: here/SaleOrder_isConsistent</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>
</pickle>
</record>
</ZopeData>
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/shopping_cart.xml
View file @ cb6925bf
......@@ -181,6 +181,10 @@
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>text_editor</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
......@@ -289,11 +293,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/submit.xml
View file @ cb6925bf
......@@ -55,6 +55,10 @@
<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>
......@@ -92,9 +96,7 @@
</item>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
......@@ -102,7 +104,9 @@
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>image</string> </key>
......@@ -129,11 +133,11 @@
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string>hiddenLabel shopping_cart_renderer_submit</string> </value>
<value> <string>hiddenLabel</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string>Update</string> </value>
<value> <string>Proceed to Payment</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -161,11 +165,11 @@
</item>
<item>
<key> <string>name</string> </key>
<value> <string>SaleOrder_editShoppingCart:method</string> </value>
<value> <string>SaleOrder_paymentRedirect:method</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Update</string> </value>
<value> <string>Pay Button</string> </value>
</item>
</dictionary>
</value>
......@@ -184,7 +188,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: not here.SaleOrder_isShoppingCartEmpty()</string> </value>
<value> <string>not: here/SaleOrder_isConsistent</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/submit2.xml 0 → 100644
View file @ cb6925bf
<?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>submit2</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/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewConfirmAsWeb/my_comment.xml
View file @ cb6925bf
......@@ -13,6 +13,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>css_class</string>
<string>default</string>
<string>description</string>
<string>hidden</string>
......@@ -59,11 +60,17 @@
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<key> <string>css_class</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
......@@ -79,7 +86,7 @@
<item>
<key> <string>hidden</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
......@@ -97,6 +104,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
......@@ -142,12 +153,28 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.SaleOrder_getShoppingCart().getComment()</string> </value>
<value> <string>python: not here.SaleOrder_isConsistent() and \'hiddenLabel\' or \'\'</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.SaleOrder_getShoppingCart().getComment()</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewConfirmAsWeb/submit.xml
View file @ cb6925bf
......@@ -137,7 +137,7 @@
</item>
<item>
<key> <string>default</string> </key>
<value> <string>Buy</string> </value>
<value> <string>Proceed to Payment</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewShoppingCartRenderer.xml
View file @ cb6925bf
......@@ -44,8 +44,7 @@
currency_code web_site/WebSite_getShoppingCartDefaultCurrencyCode;\n
shopping_cart_item_list shopping_cart/SaleOrder_getShoppingCartItemList;\n
empty_cart shopping_cart/SaleOrder_isShoppingCartEmpty;\n
total_price python: shopping_cart.SaleOrder_getShoppingCartTotalPrice(include_currency=False);\n
confirm_mode python: bool(options.get(\'confirm_mode\', 0));">\n
total_price python: shopping_cart.SaleOrder_getShoppingCartTotalPrice(include_currency=False);">\n
<h2>\n
<span tal:replace="python: here.Base_translateString(\'My shopping cart\')"/>\n
</h2>\n
......@@ -69,28 +68,25 @@
price python: resource.getPrice();\n
order_line_id python: order_line.getId();">\n
<td>\n
<div tal:attributes="class python: bool(confirm_mode) and \' \' or \'shopping_cart_renderer_title\'">\n
<div tal:attributes="class string: shopping_cart_renderer_title">\n
<a href="" tal:attributes="href python: \'%s/%s\' % (resource.absolute_url(), \'Resource_viewAsShop\');">\n
<span tal:replace="resource/getTitle"/> \n
</a>\n
</div>\n
<div class="shopping_cart_renderer_remove">\n
<a tal:condition="not: confirm_mode"\n
tal:attributes="href python: \'%s/SaleOrder_deleteShoppingCartItem?field_my_order_line_id=%s\' \n
<a tal:attributes="href python: \'%s/SaleOrder_deleteShoppingCartItem?field_my_order_line_id=%s\' \n
%(here.absolute_url(), order_line_id)">\n
<img src="mf54_image/icon_remove.gif" title="Remove from shopping cart"/>\n
</a>\n
</div>\n
</td>\n
<td>\n
<select tal:condition="not: confirm_mode"\n
name="field_my_buy_quantity">\n
<select name="field_my_buy_quantity">\n
<tal:block tal:repeat="index python: range(1,31)">\n
<option tal:condition="python: index!=quantity" tal:content="index" tal:attributes="value index"/>\n
<option SELECTED tal:condition="python: index==quantity" tal:content="index" tal:attributes="value index"/>\n
</tal:block>\n
</select>\n
<span tal:condition="confirm_mode" tal:content="quantity"/>\n
</td>\n
<td>\n
<span tal:replace="price"/> <span tal:replace="currency_code"/>\n
......@@ -110,7 +106,7 @@
</b>\n
</td>\n
</tr>\n
<tr class="shopping_cart_end_lines" tal:condition="confirm_mode">\n
<tr class="shopping_cart_end_lines">\n
<td></td>\n
<td></td>\n
<td class="used"><span tal:replace="python: here.Base_translateString(\'Shipping Price\')"/></td>\n
......@@ -120,14 +116,12 @@
<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
<span tal:replace="python: here.Base_translateString(\'Please select shipping from \')"/>\n
<a tal:attributes="href python: \'%s/cart\' % here.getWebSiteValue().absolute_url()">here</a>.\n
<span tal:replace="python: here.Base_translateString(\'Your current cart selection requires shipping.\')"/><br/>\n
</tal:block>\n
</td>\n
</tr>\n
<tr class="shopping_cart_end_lines"\n
tal:condition="python: shipping is not None and confirm_mode">\n
tal:condition="python: shipping is not None">\n
<td></td>\n
<td></td>\n
<td class="used"><span tal:replace="python: here.Base_translateString(\'Total HT\')"/></td>\n
......@@ -138,7 +132,7 @@
</td>\n
</tr>\n
<tr class="shopping_cart_end_lines"\n
tal:condition="python: shipping is not None and confirm_mode"\n
tal:condition="python: shipping is not None"\n
tal:define="shipping here/SaleOrder_getSelectedShippingResource;\n
total_price python: here.SaleOrder_getShoppingCartTotalPrice(include_shipping=True, \n
include_taxes=True,\n
......@@ -166,7 +160,7 @@
</a><br />\n
</div>\n
</tal:block>\n
<tal:block tal:condition="python: here.SaleOrder_getSelectedShippingResource() is not None and confirm_mode"\n
<tal:block tal:condition="python: here.SaleOrder_getSelectedShippingResource() is not None"\n
tal:define="tax_info here/Person_getApplicableTaxList">\n
<p tal:condition="python: tax_info is not None">\n
<span tal:replace="python: here.Base_translateString(\'* Applicable taxes\')"/> :\n
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewShoppingCartWidgetRenderer.xml
View file @ cb6925bf
......@@ -94,12 +94,6 @@
<span tal:replace="python: here.Base_translateString(\'Shopping Cart\')"/>\n
</a>\n
</div>\n
<div class="cart_right">\n
<a class="articlelink"\n
tal:attributes="href python: \'%s/%s\' % (web_site.absolute_url(), web_site.getLayoutProperty(\'ecommerce_checkout_section_id\', \'\'))">\n
<span tal:replace="python: here.Base_translateString(\'Checkout\')"/>\n
</a>\n
</div>\n
</td>\n
</tr>\n
</tal:block>\n
......
bt5/erp5_commerce/bt/revision
View file @ cb6925bf
241
\ No newline at end of file
226
\ 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