Commit c0c8b3ff authored by Lucas Carvalho's avatar Lucas Carvalho

- improved message.

- for now, you can not search by Price.
- customer information can only be displayed if the user is not Anonymous.
- fixed a bug of register url and improved the code style.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29043 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f787b7bf
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string>
<string>default</string> <string>default</string>
<string>width</string> <string>enabled</string>
<string>height</string> <string>height</string>
<string>text_editor</string> <string>text_editor</string>
<string>enabled</string> <string>title</string>
<string>whitespace_preserve</string> <string>whitespace_preserve</string>
<string>width</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string>login is not available actually.</string> </value> <value> <string>Login is not available actually.</string> </value>
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
......
...@@ -493,10 +493,6 @@ ...@@ -493,10 +493,6 @@
<string>title</string> <string>title</string>
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple>
<string>decoratedPrice</string>
<string>Price</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -39,10 +39,10 @@ ...@@ -39,10 +39,10 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<tal:block tal:define="customer here/SaleOrder_getShoppingCartCustomer">\n <tal:block tal:condition="python: not here.getPortalObject().portal_membership.isAnonymousUser()">\n
<tal:block tal:define="customer here/SaleOrder_getShoppingCartCustomer">\n
<br />\n <br />\n
<h2>Customer Information</h2>\n <h2>Customer Information</h2>\n
\n
<table>\n <table>\n
<tr>\n <tr>\n
<td>Name:</td>\n <td>Name:</td>\n
...@@ -62,19 +62,18 @@ ...@@ -62,19 +62,18 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>City:</td>\n <td>City:</td>\n
<td><span tal:content="customer/getDefaultAddressCity"/>\n <td><span tal:content="customer/getDefaultAddressCity"/></td>\n
</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>ZIP:</td>\n <td>ZIP:</td>\n
<td><span tal:content="customer/getDefaultAddressZipCode"/>\n <td><span tal:content="customer/getDefaultAddressZipCode"/></td>\n
</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>Country:</td>\n <td>Country:</td>\n
<td><span tal:content="customer/getDefaultAddressRegionTitle"/></td>\n <td><span tal:content="customer/getDefaultAddressRegionTitle"/></td>\n
</tr>\n </tr>\n
</table>\n </table>\n
</tal:block>\n
</tal:block> </tal:block>
]]></string> </value> ]]></string> </value>
......
...@@ -45,7 +45,8 @@ ...@@ -45,7 +45,8 @@
<span tal:replace="python: here.Base_translateString(\'You are not logged in\')"/>\n <span tal:replace="python: here.Base_translateString(\'You are not logged in\')"/>\n
</p>\n </p>\n
<p class="article">\n <p class="article">\n
<a class="articlelink" href="register">\n <a tal:attributes="href python: here.getWebSiteValue().absolute_url()+\'/register\';\n
class string: articlelink">\n
&#149; <span tal:replace="python: here.Base_translateString(\'I want to create an account\')"/>\n &#149; <span tal:replace="python: here.Base_translateString(\'I want to create an account\')"/>\n
</a>\n </a>\n
</p>\n </p>\n
...@@ -77,7 +78,7 @@ ...@@ -77,7 +78,7 @@
<span><span tal:replace="python: here.Base_translateString(\'You are logged as\')"/> <span tal:replace="customer/getTitle"/></span>\n <span><span tal:replace="python: here.Base_translateString(\'You are logged as\')"/> <span tal:replace="customer/getTitle"/></span>\n
</p>\n </p>\n
<a class="articlelink" \n <a class="articlelink" \n
tal:attributes="href python: \'%s/SaleOrderModule_viewAsWebSaleOrderList\' %website.sale_order_module.absolute_url()">\n tal:attributes="href python: \'%s/SaleOrderModule_viewAsWebSaleOrderList\' % website.sale_order_module.absolute_url()">\n
<span tal:replace="python: here.Base_translateString(\'My Orders\')"/>\n <span tal:replace="python: here.Base_translateString(\'My Orders\')"/>\n
</a> &nbsp;\n </a> &nbsp;\n
<a class="articlelink" \n <a class="articlelink" \n
......
204 211
\ 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