Skip to content

E
edx-platform
Commit d4b99561 by srpearce
Options

Merge pull request #8326 from edx/sylvia/docs/SOL_ECOM 

Sylvia/docs/sol ecom
parents 44dfecf7 ceb0fc79
Showing with 22 additions and 22 deletions
lms/djangoapps/instructor/tests/test_api.py
......@@ -2115,7 +2115,7 @@ class TestInstructorAPILevelsDataDump(ModuleStoreTestCase, LoginEnrollmentTestCa
# check that the coupon redeem count should be 0
resp = self.client.get(instructor_dashboard)
self.assertEqual(resp.status_code, 200)
self.assertIn('Redeem Count', resp.content)
self.assertIn('Number Redeemed', resp.content)
self.assertIn('<td>0</td>', resp.content)
# now make the payment of your cart items
......@@ -2125,7 +2125,7 @@ class TestInstructorAPILevelsDataDump(ModuleStoreTestCase, LoginEnrollmentTestCa
resp = self.client.get(instructor_dashboard)
self.assertEqual(resp.status_code, 200)
self.assertIn('Redeem Count', resp.content)
self.assertIn('Number Redeemed', resp.content)
self.assertIn('<td>1</td>', resp.content)
def test_get_sale_records_features_csv(self):
......
lms/djangoapps/instructor/tests/test_ecommerce.py
......@@ -46,7 +46,7 @@ class TestECommerceDashboardViews(ModuleStoreTestCase):
response = self.client.get(self.url)
self.assertTrue(self.e_commerce_link in response.content)
# Coupons should show up for White Label sites with priced honor modes.
self.assertTrue('Coupons' in response.content)
self.assertTrue('Coupon Code List' in response.content)
def test_user_has_finance_admin_rights_in_e_commerce_tab(self):
response = self.client.get(self.url)
......@@ -77,7 +77,7 @@ class TestECommerceDashboardViews(ModuleStoreTestCase):
course_honor_mode = CourseMode.mode_for_course(self.course.id, 'honor')
price = course_honor_mode.min_price
self.assertTrue('Course Price: <span>$' + str(price) + '</span>' in response.content)
self.assertTrue('Course price per seat: <span>$' + str(price) + '</span>' in response.content)
self.assertFalse('+ Set Price</a></span>' in response.content)
# removing the course finance_admin role of login user
......@@ -109,7 +109,7 @@ class TestECommerceDashboardViews(ModuleStoreTestCase):
url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
response = self.client.get(url)
self.assertTrue('Course Price: <span>$' + str(price) + '</span>' in response.content)
self.assertTrue('Course price per seat: <span>$' + str(price) + '</span>' in response.content)
def test_user_admin_set_course_price(self):
"""
......
lms/templates/emails/registration_codes_sale_email.txt
<%! from django.utils.translation import ugettext as _ %>
${_("Thank you for your purchase of {course_name}!").format(course_name=course.display_name)}
${_("Thank you for purchasing enrollments in {course_name}.").format(course_name=course.display_name)}
${_("An invoice for {currency_symbol}{total_price} is attached. Payment is due immediately. Information on payment methods can be found on the invoice.").format(currency_symbol=currency_symbol, total_price=sale_price)}
${_("An invoice for {currency_symbol}{total_price} is attached. Payment is due upon receipt. You can find information about payment methods on the invoice.").format(currency_symbol=currency_symbol, total_price=sale_price)}
${_("A CSV file of your registration codes is attached. Please distribute registration codes to each student planning to enroll using the email template below.")}
${_("A .csv file that lists your enrollment codes is attached. You can use the email template below to distribute enrollment codes to your students. Each student must use a separate enrollment code.")}
## Translators: This is the signature of an email. "\n" is a newline character
## and should be placed between the closing word and the signature.
......
lms/templates/emails/registration_codes_sale_invoice_attachment.txt
......@@ -7,7 +7,7 @@ ${corp_address}
${_("Date: {date}").format(date=date)}
${_("Invoice No: {invoice_number}").format(invoice_number=invoice.id)}
${_("Terms: Due Immediately")}
${_("Terms: Due Upon Receipt")}
${_("Due Date: {date}").format(date=date)}
${_("Bill to:")}
......@@ -33,10 +33,10 @@ ${_("Total: {currency_symbol}{sale_price}").format(sale_price=sale_price, c
———————————————————————————————————————————
${_("Payment instructions")}
${_("Payment Instructions")}
${payment_instructions}
${_("Failure to pay this invoice will result the invalidation of student enrollment that use these codes. All purchases are final. Please refer to the cancellation policy on {site_name} for more information.").format(site_name=site_name)}
${_("If we do not receive payment, the learner enrollments that use these codes will be canceled and learners will not be able to access course materials. All purchases are final. For more information, see the {site_name} cancellation policy.").format(site_name=site_name)}
${_("If you have payment questions, please contact {contact_email}").format(contact_email=contact_email)}
${_("For payment questions, contact {contact_email}").format(contact_email=contact_email)}
lms/templates/instructor/instructor_dashboard_2/add_coupon_modal.html
......@@ -3,7 +3,7 @@ from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse
%>
<%page args="section_data"/>
<section id="add-coupon-modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Add Coupon')}">
<section id="add-coupon-modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Add Coupon Code')}">
<div class="inner-wrapper">
<button class="close-modal">
<i class="icon fa fa-remove"></i>
......@@ -15,12 +15,12 @@ from django.core.urlresolvers import reverse
<div id="coupon-content">
<header>
<h2>${_("Add Coupon")}</h2>
<h2>${_("Add Coupon Code")}</h2>
</header>
<div class="instructions">
<p>
${_("Please enter Coupon detail below")}</p>
${_("Enter information about the coupon code below.")}</p>
</div>
<form id="add_coupon_form">
......@@ -30,12 +30,12 @@ from django.core.urlresolvers import reverse
<ol class="list-input">
<li class="field required text" id="add-coupon-modal-field-code">
<label for="coupon_code" class="required">${_("Code")}</label>
<label for="coupon_code" class="required">${_("Coupon Code")}</label>
<input class="" id="coupon_code" type="text" name="code" maxlength="16" value="" placeholder="example: A123DS"
aria-required="true"/>
</li>
<li class="field required text" id="add-coupon-modal-field-discount">
<label for="coupon_discount" class="required text">${_("Percentage Discount")}</label>
<label for="coupon_discount" class="required text">${_("Discount Percentage")}</label>
<input class="field required" id="coupon_discount" type="text" name="discount" value="" maxlength="3"
aria-required="true"/>
</li>
......@@ -62,7 +62,7 @@ from django.core.urlresolvers import reverse
</fieldset>
<div class="submit">
<input name="submit" type="button" id="add_coupon_button" value="${_('Add Coupon')}"/>
<input name="submit" type="button" id="add_coupon_button" value="${_('Add Coupon Code')}"/>
</div>
</form>
</div>
......
lms/templates/instructor/instructor_dashboard_2/edit_coupon_modal.html
......@@ -3,7 +3,7 @@ from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse
%>
<%page args="section_data"/>
<section id="edit-coupon-modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Edit Coupon')}">
<section id="edit-coupon-modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Edit Coupon Code')}">
<div class="inner-wrapper">
<button class="close-modal">
<i class="icon fa fa-remove"></i>
......@@ -15,12 +15,12 @@ from django.core.urlresolvers import reverse
<div id="coupon-content">
<header>
<h2>${_("Update Coupon")}</h2>
<h2>${_("Edit Coupon Code")}</h2>
</header>
<div class="instructions">
<p>
${_("Update Coupon Information")}</p>
${_("Edit Coupon Code Information")}</p>
</div>
<form id="edit_coupon_form" action="${section_data['ajax_update_coupon']}" method="post" data-remote="true">
......@@ -62,7 +62,7 @@ from django.core.urlresolvers import reverse
<div class="submit">
<input type="hidden" name="coupon_id" id="coupon_id"/>
<input name="submit" type="button" id="update_coupon_button" value="${_('Update Coupon')}"/>
<input name="submit" type="button" id="update_coupon_button" value="${_('Update Coupon Code')}"/>
</div>
</form>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment