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
0fa12f17
Commit
0fa12f17
authored
Mar 15, 2016
by
Waheed Ahmed
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated checkout page, now each provider can have their own fulfillment instructions.
ECOM-2934
parent
0358242f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
38 deletions
+11
-38
ecommerce/credit/tests/test_views.py
+5
-0
ecommerce/extensions/analytics/models.py
+1
-1
ecommerce/extensions/offer/models.py
+4
-4
ecommerce/templates/edx/credit/_provider_detail.html
+1
-33
No files found.
ecommerce/credit/tests/test_views.py
View file @
0fa12f17
...
@@ -158,6 +158,11 @@ class CheckoutPageTest(CourseCatalogTestMixin, TestCase, JwtMixin):
...
@@ -158,6 +158,11 @@ class CheckoutPageTest(CourseCatalogTestMixin, TestCase, JwtMixin):
'Congratulations! You are eligible to purchase academic course credit for this course.'
'Congratulations! You are eligible to purchase academic course credit for this course.'
)
)
self
.
assertContains
(
response
,
self
.
provider_data
[
0
][
'fulfillment_instructions'
]
)
def
test_course_not_found
(
self
):
def
test_course_not_found
(
self
):
""" The view should return HTTP 404 if the course cannot be found. """
""" The view should return HTTP 404 if the course cannot be found. """
path
=
reverse
(
'credit:checkout'
,
args
=
[
'course/not/found'
])
path
=
reverse
(
'credit:checkout'
,
args
=
[
'course/not/found'
])
...
...
ecommerce/extensions/analytics/models.py
View file @
0fa12f17
from
oscar.apps.analytics.models
import
*
# pragma: no cover pylint: disable=wildcard-import
from
oscar.apps.analytics.models
import
*
# pragma: no cover pylint: disable=wildcard-import
,unused-wildcard-import
ecommerce/extensions/offer/models.py
View file @
0fa12f17
...
@@ -10,9 +10,9 @@ class Range(AbstractRange):
...
@@ -10,9 +10,9 @@ class Range(AbstractRange):
if
self
.
catalog
:
if
self
.
catalog
:
return
(
return
(
product
.
id
in
self
.
catalog
.
stock_records
.
values_list
(
'product'
,
flat
=
True
)
or
product
.
id
in
self
.
catalog
.
stock_records
.
values_list
(
'product'
,
flat
=
True
)
or
super
(
Range
,
self
)
.
contains_product
(
product
)
super
(
Range
,
self
)
.
contains_product
(
product
)
# pylint: disable=bad-super-call
)
)
return
super
(
Range
,
self
)
.
contains_product
(
product
)
return
super
(
Range
,
self
)
.
contains_product
(
product
)
# pylint: disable=bad-super-call
contains
=
contains_product
contains
=
contains_product
...
@@ -22,7 +22,7 @@ class Range(AbstractRange):
...
@@ -22,7 +22,7 @@ class Range(AbstractRange):
def
all_products
(
self
):
def
all_products
(
self
):
if
self
.
catalog
:
if
self
.
catalog
:
catalog_products
=
[
record
.
product
for
record
in
self
.
catalog
.
stock_records
.
all
()]
catalog_products
=
[
record
.
product
for
record
in
self
.
catalog
.
stock_records
.
all
()]
return
catalog_products
+
list
(
super
(
Range
,
self
)
.
all_products
())
return
catalog_products
+
list
(
super
(
Range
,
self
)
.
all_products
())
# pylint: disable=bad-super-call
return
super
(
Range
,
self
)
.
all_products
()
return
super
(
Range
,
self
)
.
all_products
()
# pylint: disable=bad-super-call
from
oscar.apps.offer.models
import
*
# noqa pylint: disable=wildcard-import,unused-wildcard-import,wrong-import-position
from
oscar.apps.offer.models
import
*
# noqa pylint: disable=wildcard-import,unused-wildcard-import,wrong-import-position
ecommerce/templates/edx/credit/_provider_detail.html
View file @
0fa12f17
...
@@ -29,39 +29,7 @@
...
@@ -29,39 +29,7 @@
</button>
</button>
<div
class=
"collapse"
id=
"fulfillment-instructions-{{ provider.id|lower }}"
>
<div
class=
"collapse"
id=
"fulfillment-instructions-{{ provider.id|lower }}"
>
<p>
{{ provider.fulfillment_instructions|safe }}
{% blocktrans with display_name=provider.display_name %}
You can purchase credit through {{ display_name }} for this course for up to one year
after the course end date. You can use the credit at {{ display_name }} or transfer the
credit to another institution that accepts the credit.
{% endblocktrans %}
</p>
<p>
{% trans "To purchase course credit:" %}
</p>
<ol>
<li>
{% trans "On this page, select a checkout option." %}
</li>
<li>
{% trans "On the payment page, enter your payment information." %}
</li>
<li>
{% blocktrans with display_name=provider.display_name %}
When your payment is complete, follow the link to the {{ display_name }} website.
{% endblocktrans %}
</li>
<li>
{% blocktrans with display_name=provider.display_name %}
On the {{ display_name }} website, enter all required information to request your course
credit.
{% endblocktrans %}
</li>
</ol>
<p>
{% blocktrans with display_name=provider.display_name %}
After {{ display_name }} approves your credit, you can request an official transcript from
{{ display_name }}.
{% endblocktrans %}
</p>
</div>
</div>
</div>
</div>
<div
class=
"col-sm-2 col-xs-2 hidden-xs"
>
<div
class=
"col-sm-2 col-xs-2 hidden-xs"
>
...
...
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