Skip to content

erp5
erp5
Commit 04849a93 authored by Rafael Monnerat's avatar Rafael Monnerat Committed by Xiaowu Zhang
Browse files
Options

Fix name convention for SaleOrder_viewAsWeb and WebSection_viewShoppingCart 

- SaleOrder_viewAsWeb (previously SaleOrder_viewDetailAsWeb) is now the SaleOrder_view in web mode, where it is used to view the previous Sale Orders informations.
- WebSection_viewShoppingCart is now the shopping cart (previously was calledSaleOrder_viewAsWeb)

- Introduce improvements on current forms in meanwhile.
parent 766405bf
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1018 additions and 394 deletions
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb.xml
View file @ 04849a93
......@@ -41,13 +41,19 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string></string> </value>
<value> <string>multipart/form-data</string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
......@@ -57,6 +63,7 @@
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
</item>
......@@ -67,7 +74,9 @@
<item>
<key> <string>bottom</string> </key>
<value>
<list/>
<list>
<string>listbox</string>
</list>
</value>
</item>
<item>
......@@ -76,18 +85,26 @@
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_variation_title</string>
</list>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>shopping_cart</string>
<string>my_shipping_method</string>
<string>my_payment_mode</string>
<string>customer</string>
<string>discounts</string>
<string>comment</string>
<string>my_comment</string>
<string>submit_payment</string>
<string>header_sale_order</string>
<string>my_title</string>
<string>my_reference</string>
<string>total_price</string>
<string>my_creation_date</string>
<string>my_translated_simulation_state_title</string>
<string>my_start_date</string>
<string>my_stop_date</string>
</list>
</value>
</item>
......@@ -110,11 +127,11 @@
</item>
<item>
<key> <string>name</string> </key>
<value> <string>Product_view</string> </value>
<value> <string>SaleOrder_view</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_view_editable</string> </value>
<value> <string>form_view</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
......@@ -126,7 +143,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Edit Shopping Cart</string> </value>
<value> <string>Sale Order</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
......@@ -136,6 +153,10 @@
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewDetailAsWeb/listbox.xml → bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/listbox.xml
View file @ 04849a93
......@@ -576,11 +576,11 @@
</tuple>
<tuple>
<string>variation_title</string>
<string>Variation</string>
<string>SaleOrder_getResourceUrl</string>
</tuple>
<tuple>
<string>getSizeTitle</string>
<string>Size</string>
<string>SaleOrder_getResourceUrl</string>
</tuple>
<tuple>
<string>getTotalQuantity</string>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewDetailAsWeb/creation_date.xml → bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/my_creation_date.xml
View file @ 04849a93
......@@ -8,7 +8,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>creation_date</string> </value>
<value> <string>my_creation_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -261,19 +261,13 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>here/SaleOrder_getFormattedCreationDate</string> </value>
<value> <string>python: here.getCreationDate().strftime(\'%a, %d %b %Y %H:%M %p\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewDetailAsWeb.xml → bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/WebSection_viewShoppingCart.xml
View file @ 04849a93
......@@ -35,7 +35,17 @@
</item>
<item>
<key> <string>action</string> </key>
<value> <string>Base_edit</string> </value>
<value> <string>SaleOrder_editShoppingCart</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
......@@ -43,15 +53,16 @@
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string>multipart/form-data</string> </value>
<value> <string></string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>left checkout</string>
<string>right checkout</string>
<string>center checkout info</string>
<string>center checkout</string>
<string>bottom</string>
<string>hidden</string>
</list>
......@@ -64,43 +75,52 @@
<item>
<key> <string>bottom</string> </key>
<value>
<list/>
<list>
<string>your_update_shipping_method_button</string>
<string>submit_payment</string>
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<key> <string>center checkout</string> </key>
<value>
<list/>
<list>
<string>my_comment</string>
</list>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>center checkout info</string> </key>
<value>
<list>
<string>listbox_variation_title</string>
<string>customer</string>
</list>
</value>
</item>
<item>
<key> <string>left</string> </key>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left checkout</string> </key>
<value>
<list>
<string>header_sale_order</string>
<string>my_title</string>
<string>my_reference</string>
<string>total_price</string>
<string>creation_date</string>
<string>my_translated_simulation_state_title</string>
<string>my_start_date</string>
<string>my_stop_date</string>
<string>listbox</string>
<string>header_message</string>
<string>empty_cart_message</string>
<string>shopping_cart</string>
<string>discounts</string>
</list>
</value>
</item>
<item>
<key> <string>right</string> </key>
<key> <string>right checkout</string> </key>
<value>
<list/>
<list>
<string>shipping_method</string>
<string>my_payment_mode</string>
</list>
</value>
</item>
</dictionary>
......@@ -108,7 +128,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SaleOrder_viewDetailAsWeb</string> </value>
<value> <string>WebSection_viewShoppingCart</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......@@ -116,11 +136,11 @@
</item>
<item>
<key> <string>name</string> </key>
<value> <string>SaleOrder_view</string> </value>
<value> <string>Product_view</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_view</string> </value>
<value> <string>form_view_editable</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
......@@ -132,7 +152,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Sale Order</string> </value>
<value> <string>Edit Shopping Cart</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
......@@ -142,6 +162,10 @@
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/WebSection_viewShoppingCart/customer.xml 0 → 100644
View file @ 04849a93
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="FormBox" module="Products.ERP5Form.FormBox"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>customer</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>
<item>
<key> <string>form_invalidated</string> </key>
<value> <string>Form invalidated.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
</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>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>formbox_target_id</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>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>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>formbox_target_id</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>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></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> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>formbox_target_id</string> </key>
<value> <string>SaleOrder_viewCustomerRenderer</string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Customer Information</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: not here.getPortalObject().portal_membership.isAnonymousUser() and not here.SaleOrder_isShoppingCartEmpty()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/customer.xml → bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/WebSection_viewShoppingCart/header_message.xml
View file @ 04849a93
......@@ -8,7 +8,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>customer</string> </value>
<value> <string>header_message</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -97,6 +97,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>
......@@ -215,7 +219,13 @@
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
<value> <string encoding="cdata"><![CDATA[
<h2>\n
My shopping cart\n
</h2>
]]></string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -267,7 +277,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Customer Information</string> </value>
<value> <string>My shopping cart</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
......@@ -289,16 +299,17 @@
</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>here/SaleOrder_viewCustomerRenderer</string> </value>
<value> <string encoding="cdata"><![CDATA[
python: "<h2>%s </h2>"% here.Base_translateString(\'My shopping cart\')
]]></string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/shopping_cart.xml → bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/WebSection_viewShoppingCart/shopping_cart.xml
View file @ 04849a93
......@@ -144,7 +144,9 @@
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>external_validator</string> </key>
......@@ -289,10 +291,7 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
......@@ -303,4 +302,17 @@
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</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_viewAsWeb/submit_payment.xml → bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/WebSection_viewShoppingCart/submit_payment.xml
View file @ 04849a93
......@@ -81,7 +81,9 @@
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -94,7 +96,7 @@
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
......@@ -162,7 +164,7 @@
</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>
......@@ -176,16 +178,26 @@
</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>
<value> <string>python: here.Base_translateString(\'Proceed to Payment\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: not here.SaleOrder_isShoppingCartEmpty() and here.SaleOrder_getSelectedShippingResource() is not None</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb/comment.xml → bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/WebSection_viewShoppingCart/your_update_shipping_method_button.xml
View file @ 04849a93
......@@ -2,13 +2,13 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="LabelField" module="Products.Formulator.StandardFields"/>
<global name="InputButtonField" module="Products.ERP5Form.InputButtonField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>comment</string> </value>
<value> <string>your_update_shipping_method_button</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -20,6 +20,10 @@
<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>
......@@ -48,6 +52,14 @@
<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>
......@@ -59,13 +71,19 @@
<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>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -78,7 +96,7 @@
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
......@@ -89,6 +107,14 @@
<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>
......@@ -100,17 +126,17 @@
<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</string> </value>
<value> <string>hiddenLabel shopping_cart_renderer_update_submit</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string encoding="cdata"><![CDATA[
<h2>Add A Comment</h2>
]]></string> </value>
<value> <string>Update Shipping Method</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -132,9 +158,17 @@
<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>WebSection_viewSelectShipmentMethod:method</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Add Comment</string> </value>
<value> <string>Update Shipping</string> </value>
</item>
</dictionary>
</value>
......@@ -144,10 +178,20 @@
</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.Base_translateString(\'Update Shipping Method\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
......
bt5/erp5_commerce/bt/revision
View file @ 04849a93
298
\ No newline at end of file
299
\ 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