Merge pull request #918 from edx/diana/custom-price-fixes

Clean up - Add chosen price to the choose mode page

common/djangoapps/course_modes/models.py

@@ -55,7 +55,11 @@ class CourseMode(models.Model):
 
     @classmethod
     def modes_for_course_dict(cls, course_id):
-        return { mode.slug : mode for mode in cls.modes_for_course(course_id) }
+        """
+        Returns the modes for a particular course as a dictionary with
+        the mode slug as the key
+        """
+        return {mode.slug: mode for mode in cls.modes_for_course(course_id)}
 
     @classmethod
     def mode_for_course(cls, course_id, mode_slug):

common/djangoapps/course_modes/views.py

@@ -25,6 +25,10 @@ class ChooseModeView(View):
         if CourseEnrollment.enrollment_mode_for_user(request.user, course_id) == 'verified':
             return redirect(reverse('dashboard'))
         modes = CourseMode.modes_for_course_dict(course_id)
+
+        donation_for_course = request.session.get("donation_for_course", {})
+        chosen_price = donation_for_course.get(course_id, None)
+
         course = course_from_id(course_id)
         context = {
             "course_id": course_id,
@@ -32,7 +36,7 @@ class ChooseModeView(View):
             "course_name": course.display_name_with_default,
             "course_org" : course.display_org_with_default,
             "course_num" : course.display_number_with_default,
-            "chosen_price": None,
+            "chosen_price": chosen_price,
             "error": error,
         }
         if "verified" in modes: