Commit Graph

113 Commits

Author SHA1 Message Date
Calen Pennington
e37e7e67fb Add metrics and logging around track selection rendering without enrollment 2019-06-21 13:15:14 -04:00
Matthew Piatetsky
ad77392f8d add discount banner to track selection 2019-06-03 14:18:17 -04:00
Dave St.Germain
0e590c0f7e Moved these functions out of helpers because they're not needed elsewhere 2019-04-24 15:53:24 -04:00
Dave St.Germain
27437bc03f Ran python-modernize 2019-04-23 15:29:27 -04:00
Audrey Kao
3b4c4c30cb Tearing down data from bundling test, see REVEM-136 2019-01-28 15:00:28 -05:00
Bill Filler
c253374372 Conditionalize track selection based on settings of course duration and content gating 2019-01-07 09:47:37 -05:00
Bill Filler
684d6e3669 check if user is in holdback before showing new track selection 2018-12-17 16:05:13 -05:00
Calen Pennington
0cb48dfe1c Add StackedConfigurationModels for managing content_type_gating and course_duration_limits 2018-11-21 12:18:10 -05:00
Matthew Piatetsky
6f8090eadb handle case when list of programs for course is empty 2018-11-20 13:11:33 -05:00
Matt Tuchfarber
2f283c411b Update course mode selection text for content gating 2018-10-30 15:04:44 -04:00
Emma Green
5af901e016 fix-bundle-info 2018-10-09 09:27:15 -04:00
Emma Green
fcc1b55496 rev-bundle-discount 2018-10-03 17:20:43 -04:00
Matthew Piatetsky
30c14b36ba bundles on track selection 2018-09-27 14:45:32 -04:00
uzairr
d84d47f32c Update sailthru audit purchase calls
Currently, there are two purchase calls are occurring for each audit
purchase on sail-thru.To avoid it,code is updated so that a single
call will occur for each purchase.

LEARNER-5257
2018-07-09 01:09:27 +05:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
2018-06-05 13:59:09 -04:00
Jeremy Bowman
d3d6272d8f PLAT-1873 to_deprecated_string() cleanup part 1 2018-01-08 13:51:42 -05:00
Douglas Hall
d8494483c1 ENT-779 Remove code references to ProviderConfig.drop_existing_session.
We no longer need the drop_existing_session flag on IdP configurations
because dropping the existing session should actually be the only
behavior for certain view in the edx-enterprise code.
2017-12-21 14:39:46 -05:00
Ned Batchelder
e23e3a0486 Fix a number of unused-import pylint violations 2017-11-21 19:57:06 -05:00
Matthew Piatetsky
e1c24084e9 Fix request to currency endpoint 2017-10-25 15:38:10 -04:00
Matthew Piatetsky
c741bcbee7 Implement local currency in lms
LEARNER-2412
2017-10-11 14:37:18 -04:00
Matthew Piatetsky
d394c05236 Take users from track selection to course home instead of dashboard
LEARNER-2546
2017-10-02 12:15:12 -04:00
Calen Pennington
127e90e3a3 Remove extraneous request argument to experiments.utils.check_and_get_upgrade_link 2017-08-23 10:38:39 -04:00
Jesse Shapiro
7a31441ebc Move to new consent API 2017-08-16 22:58:09 -04:00
cahrens
819a56fee3 Remove usages of deprecated SlashSeparatedCourseKey. 2017-08-14 11:01:00 -04:00
Calen Pennington
1edd367008 Add course_start to the fields, and put all fields on the track selection page 2017-08-01 10:14:35 -04:00
Brittney Exline
8c362d4df6 Revert "Create EnterpriseCourseEnrollment when enrolling via Track Selection page"
This reverts commit d940bbfd09.
2017-07-17 14:11:24 -04:00
Jesse Shapiro
d940bbfd09 Create EnterpriseCourseEnrollment when enrolling via Track Selection page 2017-06-30 12:39:14 -04:00
Marko Jevtic
2422728671 LEARNER-1366 EcommerceService should be able to provide a link to the basket page that contains multiple products 2017-06-09 12:29:29 +02:00
Andy Armstrong
93235d118d Reorder imports using isort (except lms and cms) 2017-05-30 16:04:54 -04:00
Matt Drayer
5f5a44e062 Hide the audit option from track selection for certain enterprise use cases 2017-05-22 17:14:27 -04:00
asadiqbal
47cdf39266 ENT-342 2017-05-03 15:03:34 +05:00
Jesse Shapiro
3f6e690827 When visiting track selection page with a TPA hint, logout the existing session 2017-04-17 23:09:01 -04:00
Andy Armstrong
0325425c8c Add data sharing consent redirect for more course tabs
LEARNER-394
2017-03-31 19:12:13 -04:00
asadiqbal
ed33d3b09f ENT-287 Track Selection: Enterprise messaging only for catalog courses 2017-03-31 16:54:16 +05:00
Matt Drayer
e2610a31fb Enroll learner in Audit track on postback 2017-03-30 14:29:31 -04:00
asadiqbal
bfde6d63c5 ENT-251 Updated track selection UI for Enterprise context 2017-03-22 17:32:58 +05:00
asadiqbal
8f5ba0115c WL-606 2017-01-25 15:05:57 +05:00
John Eskew
e3cb462d18 Move embargo from common to openedx/core/djangoapps. 2016-11-07 08:47:36 -05:00
Matt Drayer
c2c2a67753 mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users 2016-06-03 13:00:45 -04:00
Matt Drayer
a9b7e4c63d mattdrayer/course-mode-bulk-sku: Add new CourseMode field
* mattdrayer: Add bulk checkout link to course views
* asadiqbal08: MAYN-225 replace the "Verify Now" button by the "Go to Dashboard" button in case of themed sites.
* mattdrayer: Add bulk_sku check in courseware.views
2016-05-11 10:57:24 -04:00
vkaracic
3c8ae7c3b2 Change EcommerceService's is_enabled to accept User instead of request
. And change the verification link in the sidebar to redirect to new basket if the EcommerceService is enabled.
2016-03-23 07:44:55 +00:00
Peter Fogg
91fd6dbea2 Merge pull request #11769 from edx/peter-fogg/disable-order-closed-course
Prevent ordering closed courses, and give a good user message.
2016-03-08 20:32:25 -05:00
Peter Fogg
fd2f3b69ef Prevent ordering closed courses, and give a good user message.
When Drupal attempts to enroll a user in a closed course, a 406 will
be returned. This causes the marketing site to redirect to the track
selection page for that course, which will then redirect to the
dashboard with a nice message.

ECOM-2317
2016-03-08 16:45:49 -05:00
Michael Frey
8502093f50 Redirect to otto checkout for prof ed courses if enabled 2016-03-07 14:16:49 -05:00
Michael Frey
90146d9ae0 Only allow ecommerce checkout if user is also activated 2016-02-23 10:11:14 -05:00
vkaracic
86a4710ee8 Otto checkout flow 2016-02-17 18:16:44 +01:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
2015-12-22 11:52:04 -05:00
Bill DeRusha
4b94d6367a Update dashboard banners and track selection for audit track
Remove cert messaging from audit cert/grade info partial

move enrollment display method to helpers
2015-12-03 13:22:08 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
AlasdairSwan
51deec380e ECOM-1661 removed nav links for logged out states
Add context for navigation states
added find course to dashboard sidebar and included check for context that Will adds in PR
removed nav_course_search context due to design change so replaced with nav_hidden
Removed rwd_header.js and all references as no longer being used.

Wrapped Find Courses in dashboard sidebar in if statement
2015-07-13 15:33:00 -04:00