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
c1314393
Commit
c1314393
authored
Feb 23, 2013
by
Rafael Monnerat
Committed by
Xiaowu Zhang
Feb 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure we use sale price
parent
4df644c6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
bt5/erp5_commerce/ExtensionTemplateItem/Ecommerce.py
bt5/erp5_commerce/ExtensionTemplateItem/Ecommerce.py
+2
-2
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_addToShoppingCart.xml
...portal_skins/erp5_commerce/Resource_addToShoppingCart.xml
+1
-1
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_getPriceCalculationDefaultContext.xml
...5_commerce/Resource_getPriceCalculationDefaultContext.xml
+1
-1
bt5/erp5_commerce/bt/revision
bt5/erp5_commerce/bt/revision
+1
-1
No files found.
bt5/erp5_commerce/ExtensionTemplateItem/Ecommerce.py
View file @
c1314393
...
...
@@ -5,7 +5,7 @@ import mechanize
def
getProductPrice
(
product
):
getPrice
=
UnrestrictedMethod
(
product
.
getPrice
)
return
getPrice
()
return
getPrice
(
supply_path_type
=
[
"Sale Supply Line"
,
"Sale Supply Cell"
]
)
def
submitPaypalNVPRequest
(
parameter_dict
,
nvp_url
):
request
=
mechanize
.
Request
(
nvp_url
)
...
...
@@ -19,4 +19,4 @@ def submitPaypalNVPRequest(parameter_dict, nvp_url):
for
parameter
in
parameter_list
:
tmp
=
parameter
.
split
(
'='
)
response_parameter_dict
[
tmp
[
0
]]
=
tmp
[
1
]
return
response_parameter_dict
return
response_parameter_dict
\ No newline at end of file
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_addToShoppingCart.xml
View file @
c1314393
...
...
@@ -121,7 +121,7 @@ if not line_found:\n
order_line.setQuantity(quantity)\n
if variation: order_line.setVariation(variation)\n
if size: order_line.setSize(size)\n
order_line.setPrice(context.getPrice(context=order_line))\n
order_line.setPrice(context.getPrice(
supply_path_type=["Sale Supply Line", "Sale Supply Cell"],
context=order_line))\n
\n
if( context.getPortalType() == \'Product\'):\n
context.Base_redirect(\'Resource_viewAsShop\',\n
...
...
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_getPriceCalculationDefaultContext.xml
View file @
c1314393
...
...
@@ -95,7 +95,7 @@ return movement\n
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string></string>
</value>
<value>
<string>
**kw
</string>
</value>
</item>
<item>
<key>
<string>
_proxy_roles
</string>
</key>
...
...
bt5/erp5_commerce/bt/revision
View file @
c1314393
31
5
31
6
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