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
bc64c668
Commit
bc64c668
authored
Nov 20, 2015
by
Ahsan Ulhaq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refund Policy on Prof Ed Receipts
ECOM-2562
parent
a7e21bf1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
1 deletions
+19
-1
common/djangoapps/student/models.py
+6
-0
lms/djangoapps/shoppingcart/models.py
+9
-1
lms/djangoapps/shoppingcart/tests/test_models.py
+4
-0
No files found.
common/djangoapps/student/models.py
View file @
bc64c668
...
@@ -1419,6 +1419,12 @@ class CourseEnrollment(models.Model):
...
@@ -1419,6 +1419,12 @@ class CourseEnrollment(models.Model):
"""
"""
return
CourseMode
.
is_verified_slug
(
self
.
mode
)
return
CourseMode
.
is_verified_slug
(
self
.
mode
)
def
is_professional_enrollment
(
self
):
"""
Check the course enrollment mode is professional or not
"""
return
CourseMode
.
is_professional_slug
(
self
.
mode
)
@classmethod
@classmethod
def
is_enrolled_as_verified
(
cls
,
user
,
course_key
):
def
is_enrolled_as_verified
(
cls
,
user
,
course_key
):
"""
"""
...
...
lms/djangoapps/shoppingcart/models.py
View file @
bc64c668
...
@@ -1984,7 +1984,10 @@ class CertificateItem(OrderItem):
...
@@ -1984,7 +1984,10 @@ class CertificateItem(OrderItem):
def
additional_instruction_text
(
self
):
def
additional_instruction_text
(
self
):
verification_reminder
=
""
verification_reminder
=
""
refund_reminder_msg
=
_
(
"You can unenroll in the course and receive a full refund for 14 days after the course "
"start date. "
)
is_enrollment_mode_verified
=
self
.
course_enrollment
.
is_verified_enrollment
()
is_enrollment_mode_verified
=
self
.
course_enrollment
.
is_verified_enrollment
()
is_professional_mode_verified
=
self
.
course_enrollment
.
is_professional_enrollment
()
if
is_enrollment_mode_verified
:
if
is_enrollment_mode_verified
:
domain
=
microsite
.
get_value
(
'SITE_NAME'
,
settings
.
SITE_NAME
)
domain
=
microsite
.
get_value
(
'SITE_NAME'
,
settings
.
SITE_NAME
)
...
@@ -1995,12 +1998,17 @@ class CertificateItem(OrderItem):
...
@@ -1995,12 +1998,17 @@ class CertificateItem(OrderItem):
"If you haven't verified your identity yet, please start the verification process ({verification_url})."
"If you haven't verified your identity yet, please start the verification process ({verification_url})."
)
.
format
(
verification_url
=
verification_url
)
)
.
format
(
verification_url
=
verification_url
)
if
is_professional_mode_verified
:
refund_reminder_msg
=
_
(
"You can unenroll in the course and receive a full refund for 2 days after the "
"course start date. "
)
refund_reminder
=
_
(
refund_reminder
=
_
(
"
You have up to two weeks into the course to unenroll and receive a full refund.
"
"
{refund_reminder_msg}
"
"To receive your refund, contact {billing_email}. "
"To receive your refund, contact {billing_email}. "
"Please include your order number in your email. "
"Please include your order number in your email. "
"Please do NOT include your credit card information."
"Please do NOT include your credit card information."
)
.
format
(
)
.
format
(
refund_reminder_msg
=
refund_reminder_msg
,
billing_email
=
settings
.
PAYMENT_SUPPORT_EMAIL
billing_email
=
settings
.
PAYMENT_SUPPORT_EMAIL
)
)
...
...
lms/djangoapps/shoppingcart/tests/test_models.py
View file @
bc64c668
...
@@ -1059,6 +1059,10 @@ class CertificateItemTest(ModuleStoreTestCase):
...
@@ -1059,6 +1059,10 @@ class CertificateItemTest(ModuleStoreTestCase):
email
=
mail
.
outbox
[
0
]
email
=
mail
.
outbox
[
0
]
self
.
assertEquals
(
'Order Payment Confirmation'
,
email
.
subject
)
self
.
assertEquals
(
'Order Payment Confirmation'
,
email
.
subject
)
self
.
assertNotIn
(
"If you haven't verified your identity yet, please start the verification process"
,
email
.
body
)
self
.
assertNotIn
(
"If you haven't verified your identity yet, please start the verification process"
,
email
.
body
)
self
.
assertIn
(
"You can unenroll in the course and receive a full refund for 2 days after the course start date. "
,
email
.
body
)
class
DonationTest
(
ModuleStoreTestCase
):
class
DonationTest
(
ModuleStoreTestCase
):
...
...
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