EX-81 / Ex-84 changes

lms/djangoapps/instructor/views/coupons.py

@@ -9,6 +9,7 @@ from django.utils.translation import ugettext as _
 from util.json_request import JsonResponse
 from django.http import HttpResponse, HttpResponseNotFound
 from shoppingcart.models import Coupon, CourseRegistrationCode
+from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
 import logging
 
@@ -54,11 +55,10 @@ def add_coupon(request, course_id):  # pylint: disable=W0613
     code = request.POST.get('code')
 
     # check if the code is already in the Coupons Table and active
-    coupon = Coupon.objects.filter(is_active=True, code=code)
-
-    if coupon:
-        return HttpResponseNotFound(_("coupon with the coupon code ({code}) already exist").format(code=code))
-
+    try:
+        course_id = SlashSeparatedCourseKey.from_deprecated_string(course_id)
+        coupon = Coupon.objects.get(is_active=True, code=code, course_id=course_id)
+    except Coupon.DoesNotExist:
         # check if the coupon code is in the CourseRegistrationCode Table
         course_registration_code = CourseRegistrationCode.objects.filter(code=code)
         if course_registration_code:
@@ -72,7 +72,7 @@ def add_coupon(request, course_id):  # pylint: disable=W0613
             discount = int(request.POST.get('discount'))
         except ValueError:
             return HttpResponseNotFound(_("Please Enter the Integer Value for Coupon Discount"))
-    if discount > 100:
+        if discount > 100 or discount < 0:
             return HttpResponseNotFound(_("Please Enter the Coupon Discount Value Less than or Equal to 100"))
         coupon = Coupon(
             code=code, description=description, course_id=course_id,
@@ -81,6 +81,9 @@ def add_coupon(request, course_id):  # pylint: disable=W0613
         coupon.save()
         return HttpResponse(_("coupon with the coupon code ({code}) added successfully").format(code=code))
 
+    if coupon:
+        return HttpResponseNotFound(_("coupon with the coupon code ({code}) already exists for this course").format(code=code))
+
 
 @require_POST
 @login_required

lms/djangoapps/instructor_analytics/basic.py

@@ -81,7 +81,7 @@ def purchase_transactions(course_id, features):
     ]
     """
 
-    purchased_courses = PaidCourseRegistration.objects.filter(course_id=course_id, status='purchased')
+    purchased_courses = PaidCourseRegistration.objects.filter(course_id=course_id, status='purchased').order_by('user')
 
     def purchase_transactions_info(purchased_course, features):
         """ convert purchase transactions to dictionary """
@@ -103,12 +103,17 @@ def purchase_transactions(course_id, features):
                                for feature in order_item_features)
         order_item_dict.update({"orderitem_id": getattr(purchased_course, 'id')})
 
-        try:
-            coupon_redemption = CouponRedemption.objects.select_related('coupon').get(order_id=purchased_course.order_id)
-        except CouponRedemption.DoesNotExist:
-            coupon_code_dict = {'coupon_code': 'None'}
+        coupon_redemption = CouponRedemption.objects.select_related('coupon').filter(order_id=purchased_course.order_id)
+        if coupon_redemption:
+            # we format the coupon codes in comma separated way if there are more then one coupon against a order id.
+            coupon_codes = list()
+            for redemption in coupon_redemption:
+                coupon_codes.append(redemption.coupon.code)
+
+            coupon_code_dict = {'coupon_code': ", ".join(coupon_codes)}
+
         else:
-            coupon_code_dict = {'coupon_code': coupon_redemption.coupon.code}
+            coupon_code_dict = {'coupon_code': 'None'}
 
         student_dict.update(dict(order_dict.items() + order_item_dict.items() + coupon_code_dict.items()))
         student_dict.update({'course_id': course_id.to_deprecated_string()})

lms/djangoapps/shoppingcart/exceptions.py

@@ -32,11 +32,7 @@ class CouponDoesNotExistException(InvalidCartItem):
     pass
 
 
-class CouponAlreadyExistException(InvalidCartItem):
-    pass
-
-
-class ItemDoesNotExistAgainstCouponException(InvalidCartItem):
+class MultipleCouponsNotAllowedException(InvalidCartItem):
     pass
 
 

lms/djangoapps/shoppingcart/models.py

@@ -32,8 +32,7 @@ from verify_student.models import SoftwareSecurePhotoVerification
 
 from .exceptions import (InvalidCartItem, PurchasedCallbackException, ItemAlreadyInCartException,
                          AlreadyEnrolledInCourseException, CourseDoesNotExistException,
-                         CouponAlreadyExistException, ItemDoesNotExistAgainstCouponException,
-                         RegCodeAlreadyExistException, ItemDoesNotExistAgainstRegCodeException)
+                         MultipleCouponsNotAllowedException, RegCodeAlreadyExistException, ItemDoesNotExistAgainstRegCodeException)
 
 from microsite_configuration import microsite
 
@@ -508,31 +507,33 @@ class CouponRedemption(models.Model):
         return value - discount
 
     @classmethod
-    def add_coupon_redemption(cls, coupon, order):
+    def add_coupon_redemption(cls, coupon, order, cart_items):
         """
         add coupon info into coupon_redemption model
         """
-        cart_items = order.orderitem_set.all().select_subclasses()
+        is_redemption_applied = False
+        coupon_redemptions = cls.objects.filter(order=order, user=order.user)
+        for coupon_redemption in coupon_redemptions:
+            if coupon_redemption.coupon.code != coupon.code or coupon_redemption.coupon.id == coupon.id:
+                log.exception("Coupon redemption already exist for user '{0}' against order id '{1}'"
+                              .format(order.user.username, order.id))
+                raise MultipleCouponsNotAllowedException
 
         for item in cart_items:
             if getattr(item, 'course_id'):
                 if item.course_id == coupon.course_id:
-                    coupon_redemption, created = cls.objects.get_or_create(order=order, user=order.user, coupon=coupon)
-                    if not created:
-                        log.exception("Coupon '{0}' already exist for user '{1}' against order id '{2}'"
-                                      .format(coupon.code, order.user.username, order.id))
-                        raise CouponAlreadyExistException
-
+                    coupon_redemption = cls(order=order, user=order.user, coupon=coupon)
+                    coupon_redemption.save()
                     discount_price = cls.get_discount_price(coupon.percentage_discount, item.unit_cost)
                     item.list_price = item.unit_cost
                     item.unit_cost = discount_price
                     item.save()
                     log.info("Discount generated for user {0} against order id '{1}' "
                              .format(order.user.username, order.id))
-                    return coupon_redemption
+                    is_redemption_applied = True
+                    return is_redemption_applied
 
-        log.warning("Course item does not exist for coupon '{0}'".format(coupon.code))
-        raise ItemDoesNotExistAgainstCouponException
+        return is_redemption_applied
 
 
 class PaidCourseRegistration(OrderItem):

lms/djangoapps/shoppingcart/views.py

@@ -19,7 +19,8 @@ from courseware.views import registered_for_course
 from shoppingcart.reports import RefundReport, ItemizedPurchaseReport, UniversityRevenueShareReport, CertificateStatusReport
 from student.models import CourseEnrollment
 from .exceptions import ItemAlreadyInCartException, AlreadyEnrolledInCourseException, CourseDoesNotExistException, ReportTypeDoesNotExistException, \
-    CouponAlreadyExistException, ItemDoesNotExistAgainstCouponException, RegCodeAlreadyExistException, ItemDoesNotExistAgainstRegCodeException
+    RegCodeAlreadyExistException, ItemDoesNotExistAgainstRegCodeException,\
+    MultipleCouponsNotAllowedException
 from .models import Order, PaidCourseRegistration, OrderItem, Coupon, CouponRedemption, CourseRegistrationCode, RegistrationCodeRedemption
 from .processors import process_postpay_callback, render_purchase_form_html
 import json
@@ -159,9 +160,8 @@ def use_code(request):
     Valid Code can be either coupon or registration code.
     """
     code = request.POST["code"]
-    try:
-        coupon = Coupon.objects.get(code=code, is_active=True)
-    except Coupon.DoesNotExist:
+    coupons = Coupon.objects.filter(code=code, is_active=True)
+    if not coupons:
         # If not coupon code then we check that code against course registration code
         try:
             course_reg = CourseRegistrationCode.objects.get(code=code)
@@ -170,7 +170,7 @@ def use_code(request):
 
         return use_registration_code(course_reg, request.user)
 
-    return use_coupon_code(coupon, request.user)
+    return use_coupon_code(coupons, request.user)
 
 
 def get_reg_code_validity(registration_code, request, limiter):
@@ -272,17 +272,23 @@ def use_registration_code(course_reg, user):
     return HttpResponse(json.dumps({'response': 'success'}), content_type="application/json")
 
 
-def use_coupon_code(coupon, user):
+def use_coupon_code(coupons, user):
     """
     This method utilize course coupon code
     """
-    try:
     cart = Order.get_cart_for_user(user)
-        CouponRedemption.add_coupon_redemption(coupon, cart)
-    except CouponAlreadyExistException:
-        return HttpResponseBadRequest(_("Coupon '{0}' already used.".format(coupon.code)))
-    except ItemDoesNotExistAgainstCouponException:
-        return HttpResponseNotFound(_("Coupon '{0}' is not valid for any course in the shopping cart.".format(coupon.code)))
+    cart_items = cart.orderitem_set.all().select_subclasses()
+    is_redemption_applied = False
+    for coupon in coupons:
+        try:
+            if CouponRedemption.add_coupon_redemption(coupon, cart, cart_items):
+                is_redemption_applied = True
+        except MultipleCouponsNotAllowedException:
+            return HttpResponseBadRequest(_("Only one coupon redemption is allowed against an order"))
+
+    if not is_redemption_applied:
+        log.warning("Course item does not exist for coupon '{0}'".format(coupons[0].code))
+        return HttpResponseNotFound(_("Coupon '{0}' is not valid for any course in the shopping cart.".format(coupons[0].code)))
 
     return HttpResponse(json.dumps({'response': 'success'}), content_type="application/json")