Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: cherry-pick edx-enterprise customizations to Palm [BB-7878] #10

Merged
merged 7 commits into from
Nov 7, 2023
Merged

feat: cherry-pick edx-enterprise customizations to Palm [BB-7878] #10

merged 7 commits into from
Nov 7, 2023

Commits on Oct 30, 2023

  1. feat: allow enrollment api admin to see all enrollments 

    Co-authored-by: Maxim Beder <maxim@opencraft.com>

test: EnterpriseCourseEnrollmentFilterBackend

Co-authored-by: Maxim Beder <maxim@opencraft.com>

feat: add additional fields to EnterpriseCourseEnrollmentViewSet

Created new manager and serializer for EnterpriseCourseEnrollment model,
which add additional fields to the model, which allow to reduce the
number of requests to the API by providing the necessary data in the
feilds along side the model.

Use the new manager and serializer in EnterpriseCourseEnrollmentViewSet.

Co-authored-by: Maxim Beder <maxim@opencraft.com>
    @0x29a @Cup0fCoffee
    0x29a and Cup0fCoffee committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    7e3736e View commit details
    Browse the repository at this point in the history

  2. feat: create CourseEnrollmentAllowed entries for pending enrollments 

    When creating pending enrollments for non-existant users, we also check
to see if the course is "invite_only". If the course is invite only,
then we create corresponding CourseEnrollmentAllowed objects. This fixes
the issue when the enterprise creates pending enrollment, but the user
cannot enroll to the course as platform rejects the enrollment request
due to missing CEA for the user.

(cherry picked from commit 0e06d74)
    @tecoholic @0x29a
    tecoholic authored and 0x29a committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    0ed518a View commit details
    Browse the repository at this point in the history

  3. feat: adds attribute to hide course prices when zero 

    This adds a new attribute `hide_course_price_when_zero` to the
EnterpriseCustomer model, which will hide the pricing information
from the enrollment page when the final price of a premium course
mode is Zero.

fix: removed unused variable from template context

fix: quality issue and add the new attribute to test

fix: update the help text in the db migration

feat: adds final price to logging

fix: change the attribute in the utils test causing test failure

refactor: renamed the migration file
    @tecoholic @0x29a
    tecoholic authored and 0x29a committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    1041541 View commit details
    Browse the repository at this point in the history

  4. feat: create cea for invite only courses before checkout 

    temp: add utility function to add CEA objects

feat: adds allow invite only enrollment flag

feat: adds allow invite only enrollment flag

feat: create cea only when customer has invite-only enrollments enabled

fix: simplify the cea creation logic, update tests

fix: remove a stray empty line

feat: adds the invite-only flag to customer admin

fix: typo in the fuction docstring

Co-authored-by: Piotr Surowiec <piotr@surowiec.it>

refactor: convert the user consent flow handler method to static

fix: move migrations to avoid conflicts

feat: add typing to the ensure cea utility method

Revert "feat: add typing to the ensure cea utility method"

This reverts commit b6b2f25.

refactor: rename the migration with a custom name instead of the auto one
    @tecoholic @0x29a
    tecoholic authored and 0x29a committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    762faa9 View commit details
    Browse the repository at this point in the history

  5. fix: renamed migrations 

    This commit contains renamed migrations that were extracted from other
pull requests. We do this because upstream PRs depend on migrations that
don't exist in v3.61.11

IMPORTANT: if you've previously had `opencraft-release/nutmeg.2`
installed, you'll have to fake all migrations from this commit, as
changes are mostly likely already applied to your DB.

See this and further comments for details: https://tasks.opencraft.com/browse/BB-7619?focusedCommentId=274168&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-274168
    @0x29a
    0x29a committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    9840c0b View commit details
    Browse the repository at this point in the history

  6. build: allow pipeline running for shared branches 

    Also adds a workaround for astral-sh/rye#368
    @0x29a
    0x29a committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    3534251 View commit details
    Browse the repository at this point in the history

  7. chore: version bump, changelog entry

    @0x29a
    0x29a committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    fcd515b View commit details
    Browse the repository at this point in the history