Merge pull request #22123 from edx/REV-728

[REV-728] add discount percentage configuration

common/djangoapps/course_modes/views.py

@@ -216,7 +216,7 @@ class ChooseModeView(View):
             )
             if offer_banner_fragment:
                 context['offer_banner_fragment'] = offer_banner_fragment
-                discounted_price = "{:0.2f}".format(price_before_discount * ((100.0 - discount_percentage()) / 100))
+                discounted_price = "{:0.2f}".format(price_before_discount * ((100.0 - discount_percentage(course)) / 100))
                 context["min_price"] = discounted_price
                 context["price_before_discount"] = price_before_discount
 

openedx/features/discounts/admin.py

@@ -10,7 +10,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from openedx.core.djangoapps.config_model_utils.admin import StackedConfigModelAdmin
 
-from .models import DiscountRestrictionConfig
+from .models import DiscountPercentageConfig, DiscountRestrictionConfig
 
 
 class DiscountRestrictionConfigAdmin(StackedConfigModelAdmin):
@@ -43,3 +43,26 @@ class DiscountRestrictionConfigAdmin(StackedConfigModelAdmin):
     raw_id_fields = ('course',)
 
 admin.site.register(DiscountRestrictionConfig, DiscountRestrictionConfigAdmin)
+
+
+class DiscountPercentageConfigAdmin(StackedConfigModelAdmin):
+    """
+    Admin to configure discount percentage
+    """
+    fieldsets = (
+        ('Context', {
+            'fields': DiscountRestrictionConfig.KEY_FIELDS,
+            'description': _(
+                'These define the context to configure the percentage for the first purchase discount.'
+                'If multiple contexts apply to a course (for example, if configuration '
+                'is specified for the course specifically, and for the org that the course '
+                'is in, then the more specific context overrides the more general context.'
+            ),
+        }),
+        ('Configuration', {
+            'fields': ('percentage',),
+        })
+    )
+    raw_id_fields = ('course',)
+
+admin.site.register(DiscountPercentageConfig, DiscountPercentageConfigAdmin)

openedx/features/discounts/applicability.py

@@ -20,7 +20,7 @@ from course_modes.models import CourseMode
 from entitlements.models import CourseEntitlement
 from lms.djangoapps.experiments.stable_bucketing import stable_bucketing_hash_group
 from openedx.core.djangoapps.waffle_utils import WaffleFlag, WaffleFlagNamespace
-from openedx.features.discounts.models import DiscountRestrictionConfig
+from openedx.features.discounts.models import DiscountPercentageConfig, DiscountRestrictionConfig
 from student.models import CourseEnrollment
 from track import segment
 
@@ -181,9 +181,11 @@ def _is_in_holdback(user):
     return bucket == 0
 
 
-def discount_percentage():
+def discount_percentage(course):
     """
     Get the configured discount amount.
     """
-    # TODO: Add configuration information here
+    configured_percentage = DiscountPercentageConfig.current(course_key=course.id).percentage
+    if configured_percentage:
+        return configured_percentage
     return 15

openedx/features/discounts/migrations/0002_auto_20191022_1720.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.25 on 2019-10-22 17:20
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import openedx.core.djangoapps.config_model_utils.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('course_overviews', '0017_auto_20191002_0823'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('sites', '0002_alter_domain_unique'),
+        ('discounts', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DiscountPercentageConfig',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('change_date', models.DateTimeField(auto_now_add=True, verbose_name='Change date')),
+                ('enabled', models.NullBooleanField(default=None, verbose_name='Enabled')),
+                ('org', models.CharField(blank=True, db_index=True, help_text='Configure values for all course runs associated with this Organization. This is the organization string (i.e. edX, MITx).', max_length=255, null=True)),
+                ('org_course', models.CharField(blank=True, db_index=True, help_text="Configure values for all course runs associated with this course. This is should be formatted as 'org+course' (i.e. MITx+6.002x, HarvardX+CS50).", max_length=255, null=True, validators=[openedx.core.djangoapps.config_model_utils.models.validate_course_in_org], verbose_name='Course in Org')),
+                ('percentage', models.PositiveIntegerField()),
+                ('changed_by', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='Changed by')),
+                ('course', models.ForeignKey(blank=True, help_text='Configure values for this course run. This should be formatted as the CourseKey (i.e. course-v1://MITx+6.002x+2019_Q1)', null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='course_overviews.CourseOverview', verbose_name='Course Run')),
+                ('site', models.ForeignKey(blank=True, help_text='Configure values for all course runs associated with this site.', null=True, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddIndex(
+            model_name='discountpercentageconfig',
+            index=models.Index(fields=['site', 'org', 'course'], name='discounts_d_site_id_f87020_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='discountpercentageconfig',
+            index=models.Index(fields=['site', 'org', 'org_course', 'course'], name='discounts_d_site_id_9fe8d6_idx'),
+        ),
+    ]

openedx/features/discounts/models.py

@@ -39,3 +39,18 @@ class DiscountRestrictionConfig(StackedConfigurationModel):
         return "DiscountRestrictionConfig(disabled={!r})".format(
             self.disabled
         )
+
+
+@python_2_unicode_compatible
+class DiscountPercentageConfig(StackedConfigurationModel):
+    """
+    A ConfigurationModel to configure the discount percentage for the first purchase discount
+    """
+    STACKABLE_FIELDS = ('percentage',)
+    percentage = models.PositiveIntegerField()
+
+    def __str__(self):
+        return "DiscountPercentageConfig(enabled={!r},percentage={!r})".format(
+            self.enabled,
+            self.percentage
+        )

openedx/features/discounts/utils.py

@@ -52,7 +52,7 @@ def format_strikeout_price(user, course, base_price=None, check_for_discount=Tru
     original_price = format_course_price(base_price)
 
     if not check_for_discount or can_receive_discount(user, course):
-        discount_price = base_price * ((100.0 - discount_percentage()) / 100)
+        discount_price = base_price * ((100.0 - discount_percentage(course)) / 100)
         if discount_price == int(discount_price):
             discount_price = format_course_price("{:0.0f}".format(discount_price))
         else:

openedx/features/discounts/views.py

@@ -73,7 +73,7 @@ class CourseUserDiscount(DeveloperErrorViewMixin, APIView):
         course_key = CourseKey.from_string(course_key_string)
         course = CourseOverview.get_from_id(course_key)
         discount_applicable = can_receive_discount(user=request.user, course=course)
-        discount_percent = discount_percentage()
+        discount_percent = discount_percentage(course)
         payload = {'discount_applicable': discount_applicable, 'discount_percent': discount_percent}
         return Response({
             'discount_applicable': discount_applicable,
@@ -136,7 +136,7 @@ class CourseUserDiscountWithUserParam(DeveloperErrorViewMixin, APIView):
         course = CourseOverview.get_from_id(course_key)
         user = User.objects.get(id=user_id)
         discount_applicable = can_receive_discount(user=user, course=course)
-        discount_percent = discount_percentage()
+        discount_percent = discount_percentage(course)
         payload = {'discount_applicable': discount_applicable, 'discount_percent': discount_percent}
         return Response({
             'discount_applicable': discount_applicable,