Commit Graph

27 Commits

Author SHA1 Message Date
Michael LoTurco
2807d9915e Add enrollment_course_run to entitlementserializer
The marketing site currently cannot use the entitlement
api to determine whether a user has an unfilled entitlement.
Including the entitlement enrollment_course_run makes this
information accessible to consumers of the entitlement API.

Learner-3731
2018-01-03 11:28:53 -05:00
Michael LoTurco
f5bc89f1b5 Only upgrade active enrollments for entitlements 2017-12-22 10:25:07 -05:00
Jeff LaJoie
0183913fa4 Merge pull request #16996 from edx/jlajoie/LEARNER-3638
LEARNER-3638: Fixes expiration issues for learners who upgrade late
2017-12-21 11:18:59 -05:00
Michael Terry
f303fd3f5c Merge pull request #16817 from mikix/mikix/entitlement-expiration
Add expire_old_entitlements command
2017-12-21 11:04:10 -05:00
Jeff LaJoie
14986264d9 LEARNER-3638: Fixes expiration issues for learners who upgrade late into a course 2017-12-21 10:44:02 -05:00
Michael Terry
1650813d17 Avoid a dropdown for course runs
Entitlement detail pages in django admin normally show a dropdown
button for the enrollment_course_run field. But on stage, that can
cause a timeout because the enrollment database is so large.
So instead, just show it as a raw id field.
2017-12-20 10:26:46 -05:00
Michael LoTurco
f0ab07a154 Upgrade audit enrollments on entitlement purchase
Adds check for existing upgradeable enrollment on user entitlement
creation, if single upgradeable enrollment is present, upgrades enrollment
to entitlement mode and links the entitlement to the upgraded enrollment

LEARNER-3579
2017-12-19 14:54:10 -05:00
Harry Rein
75aa736dcf Do not show expired, unfulfilled entitlements on course/programs dashboard.
LEARNER-3636
2017-12-18 15:16:35 -05:00
Albert (AJ) St. Aubin
365b4fb312 Merge pull request #16920 from edx/aj/add_is_expired_check_to_policy
Aj/add is expired check to policy
2017-12-15 12:42:45 -05:00
Albert St. Aubin
3fbb1571df Update to policy check utilities for Course Entitlements 2017-12-15 11:32:33 -05:00
Harry Rein
4cccfca8dc Merge pull request #16834 from edx/HarryJeff/LEARNER-3304-policy-front-end
Policy Front end on the Course Dashboard
2017-12-15 09:27:04 -05:00
Harry Rein
610c255bb6 Display the expired at logic for entitlements.
LEARNER-3304

Displays the expired out status for the course dashboard and the programs pages.
2017-12-15 08:25:38 -05:00
Albert St. Aubin
d6feff0ade Minor fixes and code changes to the Entitlement Refund API
[LEARNER-2668]
2017-12-14 09:46:47 -05:00
Albert St. Aubin
1d7443221d Entitlement API Changes to support User Revoke and Refund
[LEARNER-2668]

These changes will support a user intiated Revoke and Refund of
an Entitlement. This includes unenrolling the User from
any related Course Runs they are currently enrolled in.
2017-12-13 13:37:14 -05:00
Michael Terry
4b25ffa39d Add expire_old_entitlements command
This new management command will search for possible entitlements
that are languishing in the database and expire them if they can
be according to our policy.

This is meant to be run on a regular basis to clear out old
entitlements.

LEARNER-3087
2017-12-13 11:11:55 -05:00
Harry Rein
2711fb521a Allowing a user to fulfill their entitlement on the programs dashboard.
LEARNER-3438

The user can now enroll in a session, unenroll from a session or change session
from a new course enrollment card on the programs dashboard.
2017-12-12 10:35:26 -05:00
McKenzie Welter
853cd9a0a7 show programs in which user holds a course entitlement on programs listing page 2017-12-11 12:22:36 -05:00
McKenzie Welter
5d1eecd43c python tests, quality, and html element type fix 2017-12-07 13:50:24 -05:00
Albert St. Aubin
0ea3753d94 Added Entitlement enroll and unenroll logic to the Enrollment API
[LEARNER-3136]

This commit containts the logic and API endpoint for a user to Enroll,
Unenroll, and switch-session on a Course Entitlement.
2017-12-07 10:54:59 -05:00
Jeff LaJoie
a567719236 LEARNER-2983: Adding of helper functions and modification of DRF to use SiteConfiguration policy 2017-12-06 08:36:21 -05:00
Albert St. Aubin
dfa7b73a61 Updates to the API Endpoint to remove the Staff users ability to get all
Entitlements
2017-12-04 08:37:15 -05:00
Anthony Mangano
f72cf800e1 Consider user entitlements and use entitlement products in bundle one-click purchase 2017-11-30 13:59:46 -05:00
Albert St. Aubin
dbbe52abbd Updated the permissions to all non staff users to get their entitlements
[LEARNER-3084]
2017-11-28 11:25:38 -05:00
bmedx
d3e6836d9e Fixes to common/openedx tests that reference apps CMS doesn't use 2017-11-22 15:46:06 -05:00
Albert St. Aubin
d918cdb81e Addition of user filter parameter to the Entitlement API
[LEARNER-3274]
2017-11-16 13:52:54 -05:00
Albert St. Aubin
113e0af104 Added Entitlement API
The Entitlement API will allow for GET, POST, DELETE(Revoke), and
variations of these methods of managing and retrieving data about
Learner Entitlements.
[LEARNER-2661]
2017-11-08 10:03:38 -05:00
Albert St. Aubin
a9011fde58 Implement Entitlement Model for Course Centric Architecture
[LEARNER-1733]
2017-10-24 19:12:55 -04:00