Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
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
edx-platform
Commits
b87c5251
Commit
b87c5251
authored
Jul 09, 2015
by
Clinton Blackburn
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8866 from edx/clintonb/commerce-api-expiration-date
Updated Commerce API to return CourseMode expiration date
parents
0220baac
7d91361f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
lms/djangoapps/commerce/api/v1/serializers.py
+2
-1
lms/djangoapps/commerce/api/v1/tests/test_views.py
+2
-1
No files found.
lms/djangoapps/commerce/api/v1/serializers.py
View file @
b87c5251
...
@@ -9,6 +9,7 @@ class CourseModeSerializer(serializers.ModelSerializer):
...
@@ -9,6 +9,7 @@ class CourseModeSerializer(serializers.ModelSerializer):
""" CourseMode serializer. """
""" CourseMode serializer. """
name
=
serializers
.
CharField
(
source
=
'mode_slug'
)
name
=
serializers
.
CharField
(
source
=
'mode_slug'
)
price
=
serializers
.
IntegerField
(
source
=
'min_price'
)
price
=
serializers
.
IntegerField
(
source
=
'min_price'
)
expires
=
serializers
.
DateTimeField
(
source
=
'expiration_datetime'
,
required
=
False
,
blank
=
True
)
def
get_identity
(
self
,
data
):
def
get_identity
(
self
,
data
):
try
:
try
:
...
@@ -18,7 +19,7 @@ class CourseModeSerializer(serializers.ModelSerializer):
...
@@ -18,7 +19,7 @@ class CourseModeSerializer(serializers.ModelSerializer):
class
Meta
(
object
):
# pylint: disable=missing-docstring
class
Meta
(
object
):
# pylint: disable=missing-docstring
model
=
CourseMode
model
=
CourseMode
fields
=
(
'name'
,
'currency'
,
'price'
,
'sku'
)
fields
=
(
'name'
,
'currency'
,
'price'
,
'sku'
,
'expires'
)
class
CourseSerializer
(
serializers
.
Serializer
):
class
CourseSerializer
(
serializers
.
Serializer
):
...
...
lms/djangoapps/commerce/api/v1/tests/test_views.py
View file @
b87c5251
...
@@ -35,7 +35,8 @@ class CourseApiViewTestMixin(object):
...
@@ -35,7 +35,8 @@ class CourseApiViewTestMixin(object):
u'name'
:
course_mode
.
mode_slug
,
u'name'
:
course_mode
.
mode_slug
,
u'currency'
:
course_mode
.
currency
.
lower
(),
u'currency'
:
course_mode
.
currency
.
lower
(),
u'price'
:
course_mode
.
min_price
,
u'price'
:
course_mode
.
min_price
,
u'sku'
:
course_mode
.
sku
u'sku'
:
course_mode
.
sku
,
u'expires'
:
course_mode
.
expiration_datetime
,
}
}
...
...
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