Commit 99659ce3 by arbisoft

ECOM-528 added donation support for verified courses

parent 58fd7a92
...@@ -112,10 +112,10 @@ class TestRecentEnrollments(ModuleStoreTestCase): ...@@ -112,10 +112,10 @@ class TestRecentEnrollments(ModuleStoreTestCase):
recent_course_list = _get_recently_enrolled_courses(courses_list) recent_course_list = _get_recently_enrolled_courses(courses_list)
self.assertEqual(len(recent_course_list), 5) self.assertEqual(len(recent_course_list), 5)
self.assertEqual(recent_course_list[1], courses[0]) self.assertEqual(recent_course_list[1][0], courses[0])
self.assertEqual(recent_course_list[2], courses[1]) self.assertEqual(recent_course_list[2][0], courses[1])
self.assertEqual(recent_course_list[3], courses[2]) self.assertEqual(recent_course_list[3][0], courses[2])
self.assertEqual(recent_course_list[4], courses[3]) self.assertEqual(recent_course_list[4][0], courses[3])
def test_dashboard_rendering(self): def test_dashboard_rendering(self):
""" """
......
...@@ -712,9 +712,9 @@ def _create_recent_enrollment_message(course_enrollment_pairs, course_modes): ...@@ -712,9 +712,9 @@ def _create_recent_enrollment_message(course_enrollment_pairs, course_modes):
{ {
"course_id": course.id, "course_id": course.id,
"course_name": course.display_name, "course_name": course.display_name,
"allow_donation": _allow_donation(course_modes, course.id) "allow_donation": _allow_donation(course_modes, course.id, enrollment)
} }
for course in recently_enrolled_courses for course, enrollment in recently_enrolled_courses
] ]
return render_to_string( return render_to_string(
...@@ -745,7 +745,7 @@ def _get_recently_enrolled_courses(course_enrollment_pairs): ...@@ -745,7 +745,7 @@ def _get_recently_enrolled_courses(course_enrollment_pairs):
] ]
def _allow_donation(course_modes, course_id): def _allow_donation(course_modes, course_id, enrollment):
"""Determines if the dashboard will request donations for the given course. """Determines if the dashboard will request donations for the given course.
Check if donations are configured for the platform, and if the current course is accepting donations. Check if donations are configured for the platform, and if the current course is accepting donations.
...@@ -761,7 +761,7 @@ def _allow_donation(course_modes, course_id): ...@@ -761,7 +761,7 @@ def _allow_donation(course_modes, course_id):
donations_enabled = DonationConfiguration.current().enabled donations_enabled = DonationConfiguration.current().enabled
is_verified_mode = CourseMode.has_verified_mode(course_modes[course_id]) is_verified_mode = CourseMode.has_verified_mode(course_modes[course_id])
has_payment_option = CourseMode.has_payment_options(course_id) has_payment_option = CourseMode.has_payment_options(course_id)
return donations_enabled and not is_verified_mode and not has_payment_option return donations_enabled and (not is_verified_mode or (is_verified_mode and enrollment.mode in ['audit', 'honor']) )and not has_payment_option
def try_change_enrollment(request): def try_change_enrollment(request):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment