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.

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

ENT-1289 | Removing enterprise entitlement logic from codebase #590

Merged
merged 1 commit into from
Oct 2, 2019

Conversation

christopappas
Copy link
Contributor

@christopappas christopappas commented Oct 1, 2019

This needs to be merged and deployed AFTER the corresponding ecommerce PR here: https://github.com/edx/ecommerce/pull/2612

Merge checklist:

  • Any new requirements are in the right place (do not manually modify the requirements/*.txt files)
    • base.in if needed in production but edx-platform doesn't install it
    • test-master.in if edx-platform pins it, with a matching version
    • make upgrade && make requirements have been run to regenerate requirements
  • make static has been run to update webpack bundling if any static content was updated
  • Version bumped
  • Changelog record added
  • Translations updated

Post merge:

  • Tag pushed and a new version released
  • Version pushed to PyPI
  • PR created in edx-platform to upgrade dependencies (including edx-enterprise)

Copy link
Member

@adamstankiewicz adamstankiewicz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you got all of the entitlement-related code in edx-enterprise. Only question I have is whether we should also remove enterprise.HistoricalEnterpriseCustomerEntitlement: from the .annotation_safe_list.yml file. I don't see any other references to HistoricalEnterpriseCustomerEntitlement in edx-enterprise.

@@ -43,25 +40,3 @@ def __init__(self, user):

self.user = user
self.client = ecommerce_api_client(user)

def get_course_final_price(self, mode, currency='$', enterprise_catalog_uuid=None):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

although the comment implies this is specific to entitlements, i think it's lying. it seems like this is generally trying to get discounted prices from ecommerce, and this is still relevant to the enterprise enrollment workflow. i would keep this in.

@@ -922,22 +921,6 @@ class CourseEnrollmentView(NonAtomicView):
'self_paced': _('Self-Paced')
}

def set_final_prices(self, modes, request):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, i would keep all of this in.

@christopappas
Copy link
Contributor Author

@brittneyexline tagged you for rereview -- added back in the things you called out in your comments

Updating tests and a few other spots I missed

Adding back in some things I should not have taken out

Bumping version and changelog
@christopappas christopappas merged commit d4b488c into master Oct 2, 2019
@christopappas christopappas deleted the cpappas/ENT-1289 branch October 2, 2019 20:26
sameenfatima78 pushed a commit to sameenfatima78/edx-enterprise that referenced this pull request Nov 21, 2019
…dx#590)

Updating tests and a few other spots I missed

Adding back in some things I should not have taken out

Bumping version and changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants