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
Labels
Merge Requests
139
Merge Requests
139
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
7ed4d8dd
Commit
7ed4d8dd
authored
Sep 22, 2021
by
Xiaowu Zhang
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_advanced_ecommerce&test: fix random failed tests
parent
1b5e3c72
Pipeline
#17455
failed with stage
in 0 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/WebSection_updateShoppingCartTradeCondition.py
..._ecommerce/WebSection_updateShoppingCartTradeCondition.py
+1
-1
bt5/erp5_advanced_ecommerce_test/PathTemplateItem/portal_tests/advanced_ecommerce_zuite/test023WechatPayment.zpt
...l_tests/advanced_ecommerce_zuite/test023WechatPayment.zpt
+2
-0
No files found.
bt5/erp5_advanced_ecommerce/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce/WebSection_updateShoppingCartTradeCondition.py
View file @
7ed4d8dd
...
@@ -19,7 +19,7 @@ if payment_mode:
...
@@ -19,7 +19,7 @@ if payment_mode:
reference
=
'%s_%s'
%
(
reference
,
payment_mode
.
lower
())
reference
=
'%s_%s'
%
(
reference
,
payment_mode
.
lower
())
sale_trade_condition
=
portal
.
portal_catalog
.
getResultValue
(
sale_trade_condition
=
portal
.
portal_catalog
.
getResultValue
(
portal_type
=
'Sale Trade Condition'
,
portal_type
=
'Sale Trade Condition'
,
reference
=
'%'
+
reference
+
'%'
,
reference
=
reference
+
'%'
,
validation_state
=
'published'
,
validation_state
=
'published'
,
limit
=
1
,
limit
=
1
,
sort_on
=
((
'version'
,
'descending'
),))
sort_on
=
((
'version'
,
'descending'
),))
...
...
bt5/erp5_advanced_ecommerce_test/PathTemplateItem/portal_tests/advanced_ecommerce_zuite/test023WechatPayment.zpt
View file @
7ed4d8dd
...
@@ -30,6 +30,8 @@
...
@@ -30,6 +30,8 @@
<tal:block
metal:use-macro=
"here/ZuiteAdvancedECommerce_CommonTemplate/macros/reset_shopcart"
/>
<tal:block
metal:use-macro=
"here/ZuiteAdvancedECommerce_CommonTemplate/macros/reset_shopcart"
/>
<tal:block
metal:use-macro=
"here/ZuiteAdvancedECommerce_CommonTemplate/macros/disable_loyalty_reward_by_default"
/>
<tr>
<tr>
<td>
setTimeout
</td>
<td>
setTimeout
</td>
<td>
300000
</td>
<td>
300000
</td>
...
...
Xiaowu Zhang
@xiaowu.zhang
mentioned in merge request
!1487 (closed)
·
Sep 24, 2021
mentioned in merge request
!1487 (closed)
mentioned in merge request !1487
Toggle commit list
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