Skip to content

E
edx-platform
Commit 30966eb6 by srpearce
Options

Merge pull request #6772 from edx/sylvia/docs/EnrollCodesUI 

Update UI text for enrollment codes
parents b17290cd fbbe307f
Showing with 43 additions and 50 deletions
lms/djangoapps/instructor/tests/test_ecommerce.py
......@@ -58,10 +58,9 @@ class TestECommerceDashboardViews(ModuleStoreTestCase):
self.assertTrue(self.e_commerce_link in response.content)
# Order/Invoice sales csv button text should render in e-commerce page
self.assertTrue('Total CC Amount' in response.content)
self.assertTrue('Download All CC Sales' in response.content)
self.assertTrue('Download All Invoice Sales' in response.content)
self.assertTrue('Enter the invoice number to invalidate or re-validate sale' in response.content)
self.assertTrue('Total Credit Card Purchases' in response.content)
self.assertTrue('Download All Credit Card Purchases' in response.content)
self.assertTrue('Download All Invoices' in response.content)
# removing the course finance_admin role of login user
CourseFinanceAdminRole(self.course.id).remove_users(self.instructor)
......@@ -69,9 +68,7 @@ class TestECommerceDashboardViews(ModuleStoreTestCase):
# Order/Invoice sales csv button text should not be visible in e-commerce page if the user is not finance admin
url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id.to_deprecated_string()})
response = self.client.post(url)
self.assertFalse('Download All Order Sales' in response.content)
self.assertFalse('Download All Invoice Sales' in response.content)
self.assertFalse('Enter the invoice number to invalidate or re-validate sale' in response.content)
self.assertFalse('Download All Invoices' in response.content)
def test_user_view_course_price(self):
"""
......
lms/static/sass/course/instructor/_instructor_2.scss
......@@ -1854,17 +1854,13 @@ input[name="subject"] {
}
span.code_tip {
display: block;
margin-bottom: 6px;
@include padding(($baseline/2) 15px ($baseline/2) $baseline);
background: none repeat scroll 0 0 #F8F4EC;
border-bottom: 1px solid #DDDDDD;
border-top: 1px solid #DDDDDD;
margin-bottom: 30px;
@include padding(($baseline/2) 15px ($baseline/2) 0);
color: #3C3C3C;
line-height: 30px;
.add{
@include button(simple, $blue);
@extend .button-reset;
@include float(right);
font-size: em(13);
}
}
......@@ -1875,7 +1871,6 @@ input[name="subject"] {
@include padding(($baseline/2) 15px ($baseline/2) 1px);
.add{
font-size: em(13);
@include float(right);
}
}
span.invalid_sale {
......
lms/templates/instructor/instructor_dashboard_2/e-commerce.html
......@@ -13,32 +13,33 @@
<h2>${_('Registration Codes')}</h2>
<div>
%if section_data['sales_admin']:
<span class="code_tip">${_('Click to generate Registration Codes')}
<a id="registration_code_generation_link" href="#reg_code_generation_modal" class="add blue-button">${_('Generate Registration Codes')}</a>
<span class="code_tip">
<p>${_('Create one or more pre-paid course enrollment codes. Students can use these codes to enroll in the course.')}</p>
<a id="registration_code_generation_link" href="#reg_code_generation_modal" class="add blue-button">${_('Create Enrollment Codes')}</a>
</span>
%endif
<p>${_('Click to generate a CSV file of all Course Registrations Codes:')}</p>
<p>${_('Download a .csv file of all enrollment codes for this course')}</p>
<p>
<form action="${ section_data['get_registration_code_csv_url'] }" id="download_registration_codes" method="post">
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
<input type="text" name="download_company_name" placeholder="Company Name (Optional)"/>
<input type="submit" name="list-registration-codes-csv" value="${_("Download Registration Codes")}" data-csv="true">
<input type="text" name="download_company_name" placeholder="Company Name (optional)"/>
<input type="submit" name="list-registration-codes-csv" value="${_("Download All Enrollment Codes")}" data-csv="true">
</form>
</p>
<p>${_('Click to generate a CSV file of all Active Course Registrations Codes:')}</p>
<p>${_('Download a .csv file of all unused enrollment codes for this course')}</p>
<p>
<form action="${ section_data['active_registration_code_csv_url'] }" id="active_registration_codes" method="post">
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
<input type="text" name="active_company_name" placeholder="Company Name (Optional)"/>
<input type="submit" name="active-registration-codes-csv" value="${_("Active Registration Codes")}" data-csv="true">
<input type="text" name="active_company_name" placeholder="Company Name (optional)"/>
<input type="submit" name="active-registration-codes-csv" value="${_("Download Unused Enrollment Codes")}" data-csv="true">
</form>
</p>
<p>${_('Click to generate a CSV file of all Spent Course Registrations Codes:')}</p>
<p>${_('Download a .csv file of all used enrollment codes for this course')}</p>
<p>
<form action="${ section_data['spent_registration_code_csv_url'] }" id="spent_registration_codes" method="post">
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
<input type="text" name="spent_company_name" placeholder="Company Name (Optional)"/>
<input type="submit" name="spent-registration-codes-csv" value="${_("Spent Registration Codes")}" data-csv="true">
<input type="text" name="spent_company_name" placeholder="Company Name (optional)"/>
<input type="submit" name="spent-registration-codes-csv" value="${_("Download Used Enrollment Codes")}" data-csv="true">
</form>
</p>
<a id="registration_code_generation_link-trigger" href="#registration_code_generation_modal" rel="leanModal"></a>
......@@ -63,21 +64,21 @@
<h2>${_("Sales")}</h2>
<div>
%if section_data['total_amount'] is not None:
<span><strong>${_("Total CC Amount: ")}</strong></span><span>$${section_data['total_amount']}</span>
<span><strong>${_("Total Credit Card Purchases: ")}</strong></span><span>$${section_data['total_amount']}</span>
%endif
<span class="csv_tip">
<div >
${_("Click to generate a CSV file for all sales records in this course")}
<input type="button" class="add blue-button" name="list-sale-csv" value="${_("Download All Invoice Sales")}" data-endpoint="${ section_data['get_sale_records_url'] }" data-csv="true">
<input type="button" class="add blue-button" name="list-order-sale-csv" value="${_("Download All CC Sales")}" data-endpoint="${ section_data['get_sale_order_records_url'] }" data-csv="true">
<div>
<p>${_("Download a .csv file for all credit card purchases or for all invoices, regardless of status")}</p>
<input type="button" class="add blue-button" name="list-sale-csv" value="${_("Download All Invoices")}" data-endpoint="${ section_data['get_sale_records_url'] }" data-csv="true">
<input type="button" class="add blue-button" name="list-order-sale-csv" value="${_("Download All Credit Card Purchases")}" data-endpoint="${ section_data['get_sale_order_records_url'] }" data-csv="true">
</div>
</span>
<hr>
<p>${_("Enter the invoice number to invalidate or re-validate sale")}</p>
<p>${_("To cancel or resubmit an invoice, enter the invoice number below.")}</p>
<span class="invalid_sale">
<input type="number" id="invoice_number" placeholder= "${_("Enter Invoice Number")}"/>
<input type="button" class="add blue-button" id="invalidate_invoice" value="${_("Invalidate Sale")}">
<input type="button" class="add blue-button" id="re_validate_invoice" value="${_("Revalidate Sale")}">
<input type="number" id="invoice_number" placeholder= "${_("Invoice Number")}"/>
<input type="button" class="add blue-button" id="invalidate_invoice" value="${_("Cancel Invoice")}">
<input type="button" class="add blue-button" id="re_validate_invoice" value="${_("Resubmit Invoice")}">
</span>
</div>
......
lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html
......@@ -13,12 +13,12 @@
<div id="registration-content">
<header>
<h2>${_("Generate Registration Codes")}</h2>
<h2>${_("Create Enrollment Codes")}</h2>
</header>
<div class="instructions">
<p>
${_("Please enter the details below")}</p>
${_("* Required Information")}</p>
</div>
<form id="generate_codes" action="${section_data['generate_registration_code_csv_url']}" method="post">
......@@ -33,15 +33,15 @@
<input class="field required" id="id_company_name" type="text" name="company_name"
placeholder="${_('Organization Name')}" aria-required="true" />
<span class="tip-text">
${_("What is the company the seats were sold to?")}
${_("The organization that purchased enrollments in the course")}
</span>
</li>
<li class="field required text" id="generate-registration-modal-field-company-contact-name">
<label for="id_company_contact_name" class="required text">${_("Organization Contact")}</label>
<input class="field required" id="id_company_contact_name" type="text" name="company_contact_name"
placeholder="${_('Name')}" aria-required="true" />
placeholder="${_('Organization Contact Name')}" aria-required="true" />
<span class="tip-text">
${_("Who is the key contact at the company the sale was made to? ")}
${_("The primary contact at the organization")}
</span>
</li>
<li class="field text" id="generate-registration-modal-field-company-email">
......@@ -55,7 +55,7 @@
<input class="field required" id="id_recipient_name" type="text" name="recipient_name"
placeholder="${_('Name')}" aria-required="true"/>
<span class="tip-text">
${_("Who at the company should the invoice be sent to?")}
${_("The contact who should receive the invoice")}
</span>
</li>
<li class="field text" id="generate-registration-modal-field-recipient-email">
......@@ -103,36 +103,36 @@
</li>
<div class="clearfix"></div>
<li class="field required text" id="generate-registration-modal-field-total-price">
<label for="id_sale_price" class="required text">${_("Price of Sale")}</label>
<label for="id_sale_price" class="required text">${_("Sale Price")}</label>
<input class="field required" id="id_sale_price" type="text" name="sale_price"
aria-required="true" />
<span class="tip-text">
${_("What was the total sale price for all seats sold?")}
${_("The total price for all enrollments purchased")}
</span>
</li>
<li class="field required text" id="generate-registration-modal-field-total-codes">
<label for="id_total_registration_codes" class="required text">${_("Number of registrations")}</label>
<label for="id_total_registration_codes" class="required text">${_("Number of Enrollment Codes")}</label>
<input class="field required" id="id_total_registration_codes" type="text" name="total_registration_codes"
aria-required="true"/>
<span class="tip-text">
${_("Number of codes to generate for the Invoice")}
${_("The total number of enrollment codes to create")}
</span>
</li>
<div class="clearfix"></div>
<li class="field text" id="generate-registration-modal-field-internal-reference">
<label for="id_internal_reference" >${_("(Optional) Sale Label")}</label>
<label for="id_internal_reference" >${_("Course Team Internal Reference")}</label>
<input class="field" id="id_internal_reference" type="text" name="internal_reference"
aria-required="true" placeholder="BigCorp-IT-Department-1"/>
aria-required="true" placeholder=""/>
<span class="tip-text">
${_("Internal tag to associate with the sale")}
${_("Internal reference information for the sale")}
</span>
</li>
<li class="field text" id="generate-registration-modal-field-custom-reference-number">
<label for="id_customer_reference_number" >${_("(Optional) Customer Reference Number")}</label>
<label for="id_customer_reference_number" >${_("Customer Reference")}</label>
<input class="field" id="id_customer_reference_number" type="text" name="customer_reference_number"
aria-required="true" placeholder="PO #"/>
<span class="tip-text">
${_("Any reference specific to the purchasing company, e.g. PO #")}
${_("Customer's purchase order or other reference information")}
</span>
</li>
<div class="clearfix"></div>
......@@ -144,7 +144,7 @@
</ol>
</fieldset>
<div class="submit">
<input name="generate-registration-codes-csv" type="submit" value="${_('Generate Registration Codes')}" data-csv="true"/>
<input name="generate-registration-codes-csv" type="submit" value="${_('Create Enrollment Codes')}" data-csv="true"/>
</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