Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
erp5
Commits
564585ff
Commit
564585ff
authored
4 years ago
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_advanced_ecommerce&test: fix order tracking pagination error
parent
99b8694d
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
610 additions
and
5 deletions
+610
-5
bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/WebSite_viewStandardLoginWidgetRenderer.zpt
...ced_ecommerce/WebSite_viewStandardLoginWidgetRenderer.zpt
+1
-1
bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/advanced_ecommerce_template.zpt
...s/erp5_advanced_ecommerce/advanced_ecommerce_template.zpt
+2
-2
bt5/erp5_advanced_ecommerce_test/PathTemplateItem/portal_tests/advanced_ecommerce_zuite/test24OrderTracking.xml
...al_tests/advanced_ecommerce_zuite/test24OrderTracking.xml
+58
-0
bt5/erp5_advanced_ecommerce_test/PathTemplateItem/portal_tests/advanced_ecommerce_zuite/test24OrderTracking.zpt
...al_tests/advanced_ecommerce_zuite/test24OrderTracking.zpt
+98
-0
bt5/erp5_advanced_ecommerce_test/PathTemplateItem/web_site_module/ecommerce_example.xml
...st/PathTemplateItem/web_site_module/ecommerce_example.xml
+2
-2
bt5/erp5_advanced_ecommerce_test/PathTemplateItem/web_site_module/ecommerce_example/order_tracking.xml
...Item/web_site_module/ecommerce_example/order_tracking.xml
+449
-0
No files found.
bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/WebSite_viewStandardLoginWidgetRenderer.zpt
View file @
564585ff
...
...
@@ -47,7 +47,7 @@
</span>
</p>
<a class="articlelink"
tal:attributes="href python: '%s/
SaleOrderModule_viewAsWebSaleOrderList
' % website.absolute_url()">
tal:attributes="href python: '%s/
order_tracking
' % website.absolute_url()">
<span tal:replace="python: here.Base_translateString('My Orders')"/>
</a>
<a class="articlelink"
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/advanced_ecommerce_template.zpt
View file @
564585ff
...
...
@@ -77,11 +77,11 @@
|
</div>
<div
class=
"header_order"
>
<a
href=
"#"
tal:attributes=
"href string:${portal_path}/login_form?came_from=${portal_path}/
SaleOrderModule_viewAsWebSaleOrderList
"
<a
href=
"#"
tal:attributes=
"href string:${portal_path}/login_form?came_from=${portal_path}/
order_tracking
"
tal:condition=
"isAnon"
i18n:translate=
""
i18n:domain=
"ui"
>
order tracking
</a>
<a
href=
"#"
tal:attributes=
"href string:${portal_path}/
SaleOrderModule_viewAsWebSaleOrderList
"
<a
href=
"#"
tal:attributes=
"href string:${portal_path}/
order_tracking
"
tal:condition=
"not:isAnon"
i18n:translate=
""
i18n:domain=
"ui"
>
order tracking
</a>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_advanced_ecommerce_test/PathTemplateItem/portal_tests/advanced_ecommerce_zuite/test24OrderTracking.xml
0 → 100644
View file @
564585ff
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ZopePageTemplate"
module=
"Products.PageTemplates.ZopePageTemplate"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
content_type
</string>
</key>
<value>
<string>
text/html
</string>
</value>
</item>
<item>
<key>
<string>
expand
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
test24OrderTracking
</string>
</value>
</item>
<item>
<key>
<string>
output_encoding
</string>
</key>
<value>
<string>
utf-8
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<unicode></unicode>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
This diff is collapsed.
Click to expand it.
bt5/erp5_advanced_ecommerce_test/PathTemplateItem/portal_tests/advanced_ecommerce_zuite/test24OrderTracking.zpt
0 → 100644
View file @
564585ff
<html
xmlns:tal=
"http://xml.zope.org/namespaces/tal"
xmlns:metal=
"http://xml.zope.org/namespaces/metal"
>
<head>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
>
<title>
Test Front Page
</title>
</head>
<body>
<table
cellpadding=
"1"
cellspacing=
"1"
border=
"1"
>
<thead>
<tr><td
rowspan=
"1"
colspan=
"3"
>
Test Front Page
</td></tr>
</thead><tbody>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplate/macros/init"
/>
<tal:block
metal:use-macro=
"here/ZuiteAdvancedECommerce_CommonTemplate/macros/login_as_super_user"
/>
<tr>
<td>
openAndWait
</td>
<td>
${base_url}/portal_skins/erp5_commerce_widget_library/SaleOrderModule_viewAsWebSaleOrderList/listbox/manage_main
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//input[@name="field_lines"]
</td>
<td></td>
</tr>
<tr>
<td>
type
</td>
<td>
//input[@name="field_lines"]
</td>
<td>
1
</td>
</tr>
<tr>
<td>
clickAndWait
</td>
<td>
//input[@value="Save Changes"]
</td>
<td></td>
</tr>
<tr>
<td>
waitForTextPresent
</td>
<td>
Content changed
</td>
<td></td>
</tr>
<tr>
<td>
openAndWait
</td>
<td>
${base_url}/web_site_module/ecommerce_example/order_tracking
</td>
<td></td>
</tr>
<tr>
<td>
waitForTextPresent
</td>
<td>
My Orders
</td>
<td></td>
</tr>
<tr>
<td>
clickAndWait
</td>
<td>
//a[@title="Page 1" and contains(text(), '1')]
</td>
<td></td>
</tr>
<tr>
<td>
waitForTextPresent
</td>
<td>
My Orders
</td>
<td></td>
</tr>
<tr>
<td>
verifyElementPresent
</td>
<td>
//a[@title="Page 1" and contains(text(), '1') and @class="selected"]
</td>
<td></td>
</tr>
<tr>
<td>
clickAndWait
</td>
<td>
//a[@title="Page 2" and contains(text(), '2')]
</td>
<td></td>
</tr>
<tr>
<td>
waitForTextPresent
</td>
<td>
My Orders
</td>
<td></td>
</tr>
<tr>
<td>
verifyElementPresent
</td>
<td>
//a[@title="Page 2" and contains(text(), '2') and @class="selected"]
</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
bt5/erp5_advanced_ecommerce_test/PathTemplateItem/web_site_module/ecommerce_example.xml
View file @
564585ff
...
...
@@ -859,7 +859,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
983.5
7522.65528.2594
</string>
</value>
<value>
<string>
983.5
8906.34945.3857
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -877,7 +877,7 @@
</tuple>
<state>
<tuple>
<float>
15
89446316.17
</float>
<float>
15
90484588.45
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_advanced_ecommerce_test/PathTemplateItem/web_site_module/ecommerce_example/order_tracking.xml
0 → 100644
View file @
564585ff
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment