diff --git a/lms/djangoapps/commerce/utils.py b/lms/djangoapps/commerce/utils.py index 82ed8c4830..617852b4f6 100644 --- a/lms/djangoapps/commerce/utils.py +++ b/lms/djangoapps/commerce/utils.py @@ -238,6 +238,7 @@ def refund_entitlement(course_entitlement): return False +@pluggable_override('OVERRIDE_REFUND_SEAT') def refund_seat(course_enrollment, change_mode=False): """ Attempt to initiate a refund for any orders associated with the seat being unenrolled, @@ -287,7 +288,7 @@ def refund_seat(course_enrollment, change_mode=False): user=enrollee, ) if change_mode: - _auto_enroll(course_enrollment) + auto_enroll(course_enrollment) else: log.info('No refund opened for user [%s], course [%s]', enrollee.id, course_key_str) @@ -354,7 +355,7 @@ def _refund_in_commerce_coordinator(course_enrollment, change_mode): log.info('Refund successfully sent to Commerce Coordinator for user [%s], course [%s].', course_enrollment.user_id, course_key_str) if change_mode: - _auto_enroll(course_enrollment) + auto_enroll(course_enrollment) return True else: # Refund was not meant to be sent to Commerce Coordinator @@ -363,7 +364,7 @@ def _refund_in_commerce_coordinator(course_enrollment, change_mode): return False -def _auto_enroll(course_enrollment): +def auto_enroll(course_enrollment): """ Helper method to update an enrollment to a default course mode. diff --git a/lms/djangoapps/courseware/toggles.py b/lms/djangoapps/courseware/toggles.py index 43fb40436a..e6070a2e3b 100644 --- a/lms/djangoapps/courseware/toggles.py +++ b/lms/djangoapps/courseware/toggles.py @@ -148,7 +148,6 @@ COURSEWARE_OPTIMIZED_RENDER_XBLOCK = CourseWaffleFlag( # .. toggle_creation_date: 2019-05-16 # .. toggle_expiration_date: None # .. toggle_tickets: https://github.com/mitodl/edx-platform/issues/123 -# .. toggle_status: unsupported COURSES_INVITE_ONLY = SettingToggle('COURSES_INVITE_ONLY', default=False) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 1794e8ee58..693d7bc732 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -502,7 +502,7 @@ edx-opaque-keys[django]==2.11.0 # ora2 edx-organizations==6.13.0 # via -r requirements/edx/kernel.in -edx-proctoring==4.18.1 +edx-proctoring==4.18.2 # via # -r requirements/edx/kernel.in # edx-proctoring-proctortrack diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index be79bdfe0c..bb2e335a9f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -790,7 +790,7 @@ edx-organizations==6.13.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-proctoring==4.18.1 +edx-proctoring==4.18.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index db13c9290a..74453bc365 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -581,7 +581,7 @@ edx-opaque-keys[django]==2.11.0 # ora2 edx-organizations==6.13.0 # via -r requirements/edx/base.txt -edx-proctoring==4.18.1 +edx-proctoring==4.18.2 # via # -r requirements/edx/base.txt # edx-proctoring-proctortrack diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index d2c18fb75b..2a9a031603 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -607,7 +607,7 @@ edx-opaque-keys[django]==2.11.0 # ora2 edx-organizations==6.13.0 # via -r requirements/edx/base.txt -edx-proctoring==4.18.1 +edx-proctoring==4.18.2 # via # -r requirements/edx/base.txt # edx-proctoring-proctortrack