Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #23596 from edx/aehsan/1418/refund_message_updated

Browse Source 
Refund text updated.
This commit is contained in:
adeelehsan
2020-04-08 19:50:10 +05:00
committed by GitHub
parent 78aec0513d 02d24fdb63
commit d0c496738d
4 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lms/djangoapps/shoppingcart/models.py
View File

@@ -1964,32 +1964,36 @@ class CertificateItem(OrderItem):
def additional_instruction_text(self):
verification_reminder = ""
refund_reminder_msg = _("You can unenroll in the course and receive a full refund for 14 days after the course "
"start date. ")
domain = configuration_helpers.get_value('SITE_NAME', settings.SITE_NAME)
dashboard_path = reverse('dashboard')
scheme = u"https" if settings.HTTPS == "on" else u"http"
dashboard_url = "{scheme}://{domain}{path}".format(scheme=scheme, domain=domain, path=dashboard_path)
refund_reminder_msg = _("To receive a refund you may unenroll from the course on your edX Dashboard "
"({dashboard_url}) up to 14 days after your payment or 14 days after your"
" course starts (up to six months after your payment).\n"
).format(dashboard_url=dashboard_url)
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:
domain = configuration_helpers.get_value('SITE_NAME', settings.SITE_NAME)
path = reverse('verify_student_verify_now', kwargs={'course_id': six.text_type(self.course_id)})
verification_url = "http://{domain}{path}".format(domain=domain, path=path)
verification_reminder = _(
u"If you haven't verified your identity yet, please start the verification process ({verification_url})."
).format(verification_url=verification_url)
u"If you haven't verified your identity yet, please start the verification process"
u" ({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. ")
"course start date.\n")
refund_reminder = _(
u"{refund_reminder_msg}"
u"To receive your refund, contact {billing_email}. "
u"Please include your order number in your email. "
u"Please do NOT include your credit card information."
).format(
"{refund_reminder_msg}"
"For help unenrolling, Please see How do I unenroll from a course? "
"({how_to_unenroll_link}) in our edX HelpCenter.").format(
refund_reminder_msg=refund_reminder_msg,
billing_email=settings.PAYMENT_SUPPORT_EMAIL
how_to_unenroll_link=settings.SUPPORT_HOW_TO_UNENROLL_LINK
)
# Need this to be unicode in case the reminder strings

2
lms/djangoapps/shoppingcart/tests/test_models.py
View File

@@ -1091,7 +1091,7 @@ class CertificateItemTest(ModuleStoreTestCase):
self.assertEqual('Order Payment Confirmation', email.subject)
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. ",
"You can unenroll in the course and receive a full refund for 2 days after the course start date.\n",
email.body
)

3
lms/envs/common.py
View File

@@ -3889,3 +3889,6 @@ MICROSITE_CONFIGURATION = {}
SYSLOG_SERVER = ''
FEEDBACK_SUBMISSION_EMAIL = ''
GITHUB_REPO_ROOT = '/edx/var/edxapp/data'
##################### SUPPORT URL ############################
SUPPORT_HOW_TO_UNENROLL_LINK = ''

3
lms/envs/production.py
View File

@@ -1158,3 +1158,6 @@ MANUAL_ENROLLMENT_ROLE_CHOICES = ENV_TOKENS.get('MANUAL_ENROLLMENT_ROLE_CHOICES'
########################## limiting dashboard courses ######################
DASHBOARD_COURSE_LIMIT = ENV_TOKENS.get('DASHBOARD_COURSE_LIMIT', None)
##################### SUPPORT URL ############################
SUPPORT_HOW_TO_UNENROLL_LINK = ENV_TOKENS.get('SUPPORT_HOW_TO_UNENROLL_LINK', SUPPORT_HOW_TO_UNENROLL_LINK)