From 1a99f634d84c580f9377b4a9356355fd904b4a8d Mon Sep 17 00:00:00 2001 From: Muhammad Noyan Aziz Date: Thu, 19 Sep 2024 07:34:56 +0500 Subject: [PATCH 1/4] feat: override refund --- lms/djangoapps/commerce/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lms/djangoapps/commerce/utils.py b/lms/djangoapps/commerce/utils.py index 82ed8c4830..d942e64733 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, From 3d12640d158926436ecd848c2da7719cffe874c5 Mon Sep 17 00:00:00 2001 From: Muhammad Noyan Aziz Date: Mon, 30 Sep 2024 17:30:27 +0500 Subject: [PATCH 2/4] fix: _auto_enroll is private --- lms/djangoapps/commerce/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lms/djangoapps/commerce/utils.py b/lms/djangoapps/commerce/utils.py index d942e64733..617852b4f6 100644 --- a/lms/djangoapps/commerce/utils.py +++ b/lms/djangoapps/commerce/utils.py @@ -288,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) @@ -355,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 @@ -364,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. From 31a3c44a73bce2fb3f50c7cc3b8d7026977c402b Mon Sep 17 00:00:00 2001 From: Paulo Viadanna Date: Thu, 3 Oct 2024 13:04:25 -0300 Subject: [PATCH 3/4] fix: remove 'toggle_status: unsupported' from COURSES_INVITE_ONLY (#35572) --- lms/djangoapps/courseware/toggles.py | 1 - 1 file changed, 1 deletion(-) 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) From 9ff0dac55cb30c21f7973d503c40f2755671f2de Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 15:07:29 -0400 Subject: [PATCH 4/4] feat: Upgrade Python dependency edx-proctoring (#35589) 4.18.2 fixes bugs caused by a removed proctoring provider Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master` Co-authored-by: alangsto <46360176+alangsto@users.noreply.github.com> --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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