Template changes

lms/djangoapps/shoppingcart/tests/test_models.py

@@ -18,6 +18,7 @@ from xmodule.modulestore.tests.factories import CourseFactory
 from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
 from shoppingcart.models import (Order, OrderItem, CertificateItem, InvalidCartItem, PaidCourseRegistration,
                                  OrderItemSubclassPK, PaidCourseRegistrationAnnotation)
+from shoppingcart.views import initialize_report, REPORT_TYPES
 from shoppingcart.reports import ItemizedPurchaseReport, CertificateStatusReport, UniversityRevenueShareReport, RefundReport
 from student.tests.factories import UserFactory
 from student.models import CourseEnrollment
@@ -26,22 +27,6 @@ from shoppingcart.exceptions import PurchasedCallbackException, ReportTypeDoesNo
 import pytz
 import datetime
 
-REPORT_TYPES = [
-    ("refund_report", RefundReport),
-    ("itemized_purchase_report", ItemizedPurchaseReport),
-    ("university_revenue_share", UniversityRevenueShareReport),
-    ("certificate_status", CertificateStatusReport),
-]
-
-
-def initialize_report(report_type):
-    """
-    Creates the appropriate type of Report object based on the string report_type.
-    """
-    for item in REPORT_TYPES:
-        if report_type in item:
-            return item[1]()
-    raise ReportTypeDoesNotExistException
 
 @override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class OrderTest(ModuleStoreTestCase):

lms/djangoapps/shoppingcart/tests/test_reports.py

@@ -14,17 +14,10 @@ from shoppingcart.reports import ItemizedPurchaseReport, CertificateStatusReport
 from student.tests.factories import UserFactory
 from student.models import CourseEnrollment
 from course_modes.models import CourseMode
-from shoppingcart.views import initialize_report
+from shoppingcart.views import initialize_report, REPORT_TYPES
 import pytz
 import datetime
 
-REPORT_TYPES = [
-    ("refund_report", RefundReport),
-    ("itemized_purchase_report", ItemizedPurchaseReport),
-    ("university_revenue_share", UniversityRevenueShareReport),
-    ("certificate_status", CertificateStatusReport),
-]
-
 
 @override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class ReportTypeTests(ModuleStoreTestCase):

lms/templates/shoppingcart/download_report.html

@@ -19,19 +19,24 @@
     </section>
   % endif
   <form method="post">
+    <p>${_("These reports are delimited by start and end dates.")}</p>
     <label for="start_date">${_("Start Date: ")}</label>
     <input id="start_date" type="text" value="${start_date}" name="start_date"/>
     <label for="end_date">${_("End Date: ")}</label>
     <input id="end_date" type="text" value="${end_date}" name="end_date"/>
+    <br/>
+    <button type = "submit" name="requested_report" value="itemized_purchase_report">Itemized Purchase Report</button>
+    <br/>
+    <button type = "submit" name="requested_report" value="refund_report">Refund Report</button>
+
+    <br/><br/>
+    <p>${_("These reports are delimited alphabetically by university name.  i.e., generating a report with 'Start Letter' A and 'End Letter' C will generate reports for all universities starting with A, B, and C.")}</p>
     <label for="start_letter">${_("Start Letter: ")}</label>
     <input id="start_letter" type="text" value="${start_letter}" name="start_letter"/>
     <label for="end_letter">${_("End Letter: ")}</label>
     <input id="end_letter" type="text" value="${end_letter}" name="end_letter"/>
     <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}" />
-    <br/>
-    <button type = "submit" name="requested_report" value="itemized_purchase_report">Itemized Purchase Report</button>
-    <br/>
-    <button type = "submit" name="requested_report" value="refund_report">Refund Report</button>
+
     <br/>
     <button type = "submit" name="requested_report" value="university_revenue_share">University Revenue Share</button>
     <br/>