Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ecommerce
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
ecommerce
Commits
f13df338
Commit
f13df338
authored
Sep 01, 2016
by
Michael Frey
Committed by
GitHub
Sep 01, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #924 from edx/mjfrey/SOL-2048
Use Babel directly to format benefit value.
parents
b6183628
b6f8eddf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
5 deletions
+16
-5
ecommerce/extensions/offer/tests/test_utils.py
+8
-2
ecommerce/extensions/offer/utils.py
+8
-3
No files found.
ecommerce/extensions/offer/tests/test_utils.py
View file @
f13df338
from
decimal
import
Decimal
import
ddt
from
babel.numbers
import
format_currency
from
django.conf
import
settings
from
django.utils.translation
import
get_language
,
to_locale
from
oscar.core.loading
import
get_model
from
oscar.templatetags.currency_filters
import
currency
from
oscar.test.factories
import
*
# pylint:disable=wildcard-import,unused-wildcard-import
from
ecommerce.courses.tests.factories
import
CourseFactory
...
...
@@ -33,7 +36,10 @@ class UtilTests(CourseCatalogTestMixin, TestCase):
self
.
assertEqual
(
benefit_value
,
'35
%
'
)
benefit_value
=
format_benefit_value
(
self
.
value_benefit
)
self
.
assertEqual
(
benefit_value
,
currency
(
self
.
seat_price
-
10
))
expected_benefit
=
format_currency
(
Decimal
((
self
.
seat_price
-
10
)),
settings
.
OSCAR_DEFAULT_CURRENCY
,
format
=
u'#,##0.00'
,
locale
=
to_locale
(
get_language
()))
self
.
assertEqual
(
benefit_value
,
'${expected_benefit}'
.
format
(
expected_benefit
=
expected_benefit
))
@ddt.data
(
(
'1.0'
,
'1'
),
...
...
ecommerce/extensions/offer/utils.py
View file @
f13df338
"""Offer Utility Methods. """
from
decimal
import
Decimal
from
django.utils.translation
import
ugettext_lazy
as
_
from
babel.numbers
import
format_currency
from
django.conf
import
settings
from
django.utils.translation
import
get_language
,
to_locale
,
ugettext_lazy
as
_
from
oscar.core.loading
import
get_model
from
oscar.templatetags.currency_filters
import
currency
Benefit
=
get_model
(
'offer'
,
'Benefit'
)
...
...
@@ -35,5 +37,8 @@ def format_benefit_value(benefit):
if
benefit
.
type
==
Benefit
.
PERCENTAGE
:
benefit_value
=
_
(
'{benefit_value}
%
'
.
format
(
benefit_value
=
benefit_value
))
else
:
benefit_value
=
_
(
'{benefit_value}'
.
format
(
benefit_value
=
currency
(
benefit_value
)))
converted_benefit
=
format_currency
(
Decimal
(
benefit
.
value
),
settings
.
OSCAR_DEFAULT_CURRENCY
,
format
=
u'#,##0.00'
,
locale
=
to_locale
(
get_language
()))
benefit_value
=
_
(
'${benefit_value}'
.
format
(
benefit_value
=
converted_benefit
))
return
benefit_value
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