EX-71 New shopping Cart UI Single person purchase

Ex-74 Registration Code redemption

fix the translation issues

added a check if a user is already registered in a course. Changed the messages

added course depth=0 and removed pep8 violations

Ex-72-added additional billing information

Added a new CSV file in the instructor dashboard sales tab to download all the order sales separated from the invoice sales

fix path to image

updated the failed unit tests and add some minor tweaks in the Shoppingcart.scss

Ex-78 New UI In receipt page

EX-73 Purchasers can buy a course on behalf of a different student

WL-78 updated the receipt page UI.

Wl-72 updated Billing Information UI and removed the Order Address fields

WL-71 Remove Purchase Type Buttons from UI

WL-71 Updated minor UI issues and updated test cases

WL-78 updated the enrollment links in the receipt page

made changes in Order generated sales csv in Instructor Dashboard.
 The total_registration_codes and total_used_codes
  were not correctly stored in the csv file.

1) The total_registration_codes were not filtered with
 course_id.
2) The total_used_codes that a user had redeemed
 were not correctly included in the CSV.

added a fix in the courseware view to let the users visit the courseware if they have enrolled in the course by clicking on the enrollment link

rebase and resolved conflicts with master

WL-97 Bulk Registration Email Confirmation
Below is the commit summary.
- Make email text bold as per requirement.
- Improve email template quality and reorder points.
- Add text in billing details page : "if no additional billing details are populated the payment confirmation will be sent to the user making the purchase"
- Update text on receipt page "You have successfully purchase 3 course registration codes"

WL-100 fixed the bug on the edit/add coupon and set course price.
Ajax requests were duplicating in each callback. fixed this issue by creating the manual ajax request rather than the Lean Modal Ajax requests

allow for better White Label branding in shopping cart purchase emails

fix up typos and text

fix goof

fix

fix

incorporated model changes as suggested by Jason.

updated order sales csv

updated test cases for CourseRegCodeItem model and csv for the order generated sales

updated the migrations history

fixed the lms acceptance tests

Be sure to check for multiple types

address PR feedback

PR feedback

PR feedback

pep8 fix

lms/djangoapps/instructor_analytics/basic.py

@@ -3,7 +3,10 @@ Student and course analytics.
 
 Serve miscellaneous course and student data
 """
-from shoppingcart.models import PaidCourseRegistration, CouponRedemption, Invoice, RegistrationCodeRedemption
+from shoppingcart.models import (
+    PaidCourseRegistration, CouponRedemption, Invoice, CourseRegCodeItem,
+    OrderTypes, RegistrationCodeRedemption, CourseRegistrationCode
+)
 from django.contrib.auth.models import User
 import xmodule.graders as xmgraders
 from django.core.exceptions import ObjectDoesNotExist
@@ -18,11 +21,77 @@ ORDER_FEATURES = ('purchase_time',)
 SALE_FEATURES = ('total_amount', 'company_name', 'company_contact_name', 'company_contact_email', 'recipient_name',
                  'recipient_email', 'customer_reference_number', 'internal_reference')
 
+SALE_ORDER_FEATURES = ('id', 'company_name', 'company_contact_name', 'company_contact_email', 'purchase_time',
+                       'customer_reference_number', 'recipient_name', 'recipient_email', 'bill_to_street1',
+                       'bill_to_street2', 'bill_to_city', 'bill_to_state', 'bill_to_postalcode',
+                       'bill_to_country', 'order_type',)
+
 AVAILABLE_FEATURES = STUDENT_FEATURES + PROFILE_FEATURES
 COURSE_REGISTRATION_FEATURES = ('code', 'course_id', 'created_by', 'created_at')
 COUPON_FEATURES = ('course_id', 'percentage_discount', 'description')
 
 
+def sale_order_record_features(course_id, features):
+    """
+    Return list of sale orders features as dictionaries.
+
+    sales_records(course_id, ['company_name, total_codes', total_amount])
+    would return [
+        {'company_name': 'group_A', 'total_codes': '1', total_amount:'total_amount1 in decimal'.}
+        {'company_name': 'group_B', 'total_codes': '2', total_amount:'total_amount2 in decimal'.}
+        {'company_name': 'group_C', 'total_codes': '3', total_amount:'total_amount3 in decimal'.}
+    ]
+    """
+    purchased_courses = PaidCourseRegistration.objects.filter(course_id=course_id, status='purchased').order_by('order')
+    purchased_course_reg_codes = CourseRegCodeItem.objects.filter(course_id=course_id, status='purchased').order_by('order')
+
+    def sale_order_info(purchased_course, features):
+        """
+        convert purchase transactions to dictionary
+        """
+
+        sale_order_features = [x for x in SALE_ORDER_FEATURES if x in features]
+        course_reg_features = [x for x in COURSE_REGISTRATION_FEATURES if x in features]
+
+        # Extracting order information
+        sale_order_dict = dict((feature, getattr(purchased_course.order, feature))
+                               for feature in sale_order_features)
+
+        quantity = int(getattr(purchased_course, 'qty'))
+        unit_cost = float(getattr(purchased_course, 'unit_cost'))
+        sale_order_dict.update({"total_amount": quantity * unit_cost})
+
+        sale_order_dict.update({"logged_in_username": purchased_course.order.user.username})
+        sale_order_dict.update({"logged_in_email": purchased_course.order.user.email})
+
+        sale_order_dict.update({"total_codes": 'N/A'})
+        sale_order_dict.update({'total_used_codes': 'N/A'})
+
+        if getattr(purchased_course.order, 'order_type') == OrderTypes.BUSINESS:
+            registration_codes = CourseRegistrationCode.objects.filter(order=purchased_course.order, course_id=course_id)
+            sale_order_dict.update({"total_codes": registration_codes.count()})
+            sale_order_dict.update({'total_used_codes': RegistrationCodeRedemption.objects.filter(registration_code__in=registration_codes).count()})
+
+            codes = list()
+            for reg_code in registration_codes:
+                codes.append(reg_code.code)
+
+            # Extracting registration code information
+            obj_course_reg_code = registration_codes.all()[:1].get()
+            course_reg_dict = dict((feature, getattr(obj_course_reg_code, feature))
+                                   for feature in course_reg_features)
+
+            course_reg_dict['course_id'] = course_id.to_deprecated_string()
+            course_reg_dict.update({'codes': ", ".join(codes)})
+            sale_order_dict.update(dict(course_reg_dict.items()))
+
+        return sale_order_dict
+
+    csv_data = [sale_order_info(purchased_course, features) for purchased_course in purchased_courses]
+    csv_data.extend([sale_order_info(purchased_course_reg_code, features) for purchased_course_reg_code in purchased_course_reg_codes])
+    return csv_data
+
+
 def sale_record_features(course_id, features):
     """
     Return list of sales features as dictionaries.
@@ -73,7 +142,7 @@ def purchase_transactions(course_id, features):
     """
     Return list of purchased transactions features as dictionaries.
 
-    purchase_transactions(course_id, ['username, email', unit_cost])
+    purchase_transactions(course_id, ['username, email','created_by', unit_cost])
     would return [
         {'username': 'username1', 'email': 'email1', unit_cost:'cost1 in decimal'.}
         {'username': 'username2', 'email': 'email2', unit_cost:'cost2 in decimal'.}