Commit Graph

2373 Commits

Author SHA1 Message Date
Waheed Ahmed
5d6a2ea022 Merge pull request #21787 from edx/waheed/PROD-454-use-order-date-attr-for-refund
Use order date_placed enrollment attribute for refund.
2019-09-26 21:20:27 +05:00
Ned Batchelder
58828da55b Fix patches to use proper courseware imports 2019-09-26 10:53:55 -04:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
aarif
90b0130a55 python 3 fixes 2019-09-26 18:34:17 +05:00
Waheed Ahmed
68b5f98485 Save order date attribute and some refactoring.
Save order placement date attribute so that we don't need to call
ecommerce again. Also did some refactoring.
2019-09-26 17:46:14 +05:00
Waheed Ahmed
551f690ade Use order date_placed enrollment attribute for refund.
Use order date_placed enrollment attribute for refund if exist otherwise
fetch it from ecommerce.

PROD-454
2019-09-26 15:20:00 +05:00
Aarif
6f1c05e28c Merge pull request #21744 from edx/BOM-645
BOM-645
2019-09-26 12:36:00 +05:00
Ayub khan
5c47a3b425 BOM Project
Updated __unicode__ to __str__
2019-09-25 18:31:54 +05:00
aarif
54cb483fc0 python 3 fixes 2019-09-23 15:30:18 +05:00
Aarif
e7a509faf0 Merge pull request #21704 from edx/BOM-724
BOM-724
2019-09-23 14:24:35 +05:00
Awais Qureshi
d8e49fadab Merge pull request #21727 from edx/awais786/BOM-637
BOM-637
2019-09-21 17:59:58 +05:00
Feanil Patel
57af13ddc4 Merge pull request #21721 from edx/python3-swarm-2
Python3 swarm 2
2019-09-20 08:48:19 -04:00
Ayub
39fed7c8fa Merge pull request #21706 from edx/BOM-723
BOM-723
2019-09-20 15:39:43 +05:00
Awais Qureshi
63ff4c147c BOM-637
Fixing python3
2019-09-20 15:19:05 +05:00
Feanil Patel
4eaf875741 BOM-621 Fix hashing in a bunch of places. 2019-09-19 15:53:39 -04:00
Feanil Patel
cbf35593ac BOM-618 Decode to utf-8 before loading as json in tests. 2019-09-19 11:15:11 -04:00
Feanil Patel
f259a911c7 BOM-618 Decode content we get from test requests. 2019-09-19 10:32:23 -04:00
Ayub khan
00a1db4109 BOM-723
python3 compatibility
2019-09-19 15:51:20 +05:00
aarif
048d7740b5 python 3 fixes 2019-09-19 15:08:05 +05:00
Jeremy Bowman
f68c7e87f7 Fix student.helpers logging tests 2019-09-18 12:59:32 -04:00
aarif
18ac219171 python 3 fixes
made changes as requested

minor fixes

quality fixes
2019-09-16 22:09:49 +05:00
aarif
ae8126bf98 python 3 fixes 2019-09-13 16:50:20 +05:00
Waheed Ahmed
6612423420 Merge pull request #21524 from edx/waheed/LEARNER-5114-fix-reset-password
Fixed password reset for authenticated user.
2019-09-04 16:26:44 +05:00
Feanil Patel
ca9cfb128c Fix errors when running runserver in python 3.
- The fields need to be unicode not bytes.  In python 2 it was auto
converting.
- The static url base has been allowed to be a unicode string for a
while.
2019-09-03 09:10:58 -04:00
Waheed Ahmed
9f80fd2b87 Fixed password reset for authenticated user.
Password reset link for one user is working for other logged in users.
Fixed by verifying the token with request.user if authenticated.

LEARNER-5114
2019-09-02 15:30:25 +05:00
Dave St.Germain
a3b52662d1 Prevent changing dict while iterating 2019-08-19 16:27:04 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375)
Convert response bytes to str before JSON parsing.
2019-08-19 11:01:55 -04:00
Dave St.Germain
5febcce20c Fix python3 compatibility in SafeCookieData and elsewhere 2019-08-19 10:24:15 -04:00
Zainab Amir
db67a212e8 Remove create_user management command (#21322)
Our internal docs suggest using manage_user instead of create_user. We
are no longer using it and it can be removed

LEARNER-3934
2019-08-17 13:50:58 +05:00
Diana Huang
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -04:00
Ayub khan
2244540ade BOM-78
Update uuid4().hex.decode(ascii) calls
2019-08-06 17:16:08 +05:00
uzairr
80316c632d Update Help msgs of management commands
PROD-399
2019-08-02 15:20:26 +05:00
Ayub khan
4b2f68da84 INCR-405 python3 compatibility 2019-08-02 13:51:10 +05:00
Christie Rice
3d062aab62 REVMI-354 Add enroll_in_course permission (#21243)
* REVMI-354 Add enroll_in_course permission

* Fix test
2019-08-01 08:37:41 -04:00
Waheed Ahmed
ecf9485e59 Remove UTM params from password reset link.
This type of email is just a transactional message
and should not be crediting revenue to email. Removed
UTM parameters and added ?track=pwreset query param.

PROD-482
2019-07-29 18:21:30 +05:00
Adeel Khan
7d9be69112 Fix edx-ace templates
This patch is part of multiple PR's to
protect templates against xss attack

PROD-465
2019-07-25 12:51:05 +05:00
Ayub
d98133a96a Merge pull request #21071 from edx/INCR-407
INCR-407 python3 compatibility
2019-07-23 12:30:41 +05:00
Ayub
829855f6c5 Merge pull request #21070 from edx/INCR-406
INCR-406 python3 compatibility
2019-07-23 12:30:14 +05:00
David Ormsbee
0f51b58f75 Remove user cookie reset on Student Dashboard.
The enrollmentStatusHash cookie value was created in commit f0030334
as an optimization, in order to determine whether the marketing site
needs to refresh the list of a student's enrolled courses with a
call to the LMS. To ensure that this value was kept up to date,
commit d7a7bcc1 reset the user's cookies every time they go to the
learner dashboard page (which used to be the next page loaded after
you enrolled in a course). This didn't just reset the
enrollmentStatusHash though -- it recalculated all the cookie
values, as if you had just logged in.

A number of things have changed since then:

1. Enrolling in a course now goes to that course's info/navigation
   page, rather than going to the student dashboard.
2. It doesn't appear that the value of enrollmentStatusHash is
   actually being examined anywhere -- it's set in a cookie on the
   LMS and read/written by the edX marketing front end code, but
   the value is never looked at to make any decisions.
3. The introduction of add_email_marketing_cookies (which triggers
   off of the CREATE_LOGON_COOKIE signal) has made cookie resets
   far more expensive, as there is a blocking call to Sailthru if
   you have that enabled in EmailMarketingConfiguration (which
   edx.org does). This can add over two seconds to the server
   processing time for the student dashboard at certain times of
   day.

Given this, I'm removing both the call to resetting the cookie on
the student dashboard page, as well as setting the value for
enrollmentStatusHash.
2019-07-21 20:16:19 -04:00
David Ormsbee
a712f1f93b Remove full table scan of VerificationDeadline. (#21119)
* Remove full table scan of VerificationDeadline.

Before this commit, we were doing a full table scan of
student_verificationdeadline, loading the results into a giant
dict, and reading/writing that to the cache. This was fine when the
code was introduced and there were dozens of courses, but now that
we're over 12K courses, it's becoming a major performance issue for
the Student Dashboard.

This uses a subquery to the course enrollment table so that we're
only ever pulling back the deadlines to a student's enrolled courses
for any given request. It removes the cache access entirely.
2019-07-17 10:25:08 -04:00
Ayub khan
07275a5715 INCR-407 python3 compatibility 2019-07-11 15:14:30 +05:00
Ayub khan
8a7a39af11 INCR-406 python3 compatibility 2019-07-11 15:09:27 +05:00
Matt Tuchfarber
2583d317db Remove all references to Journals 2019-07-09 14:19:25 -04:00
Zainab Amir
f6603cb8cf Update verification expiry email criteria (#20725)
If already DEFAULT Number of emails are sent, then verify that user
is enrolled in at least one verified course run for which the course
has not ended else stop sending emails

LEARNER-7313
2019-07-03 14:19:22 +05:00
adeelehsan
2d369490dd Flag added to load limited courses on Dashboard
Dashboard is set to load 250 courses instead of
all the courses. A flag is also added to change
the number the courses to load.

PROD-204
2019-06-28 22:51:41 +05:00
Calen Pennington
39efc54a27 Merge pull request #20884 from cpennington/discount-no-previous-purchase
REVEM-289: Discount no previous purchase
2019-06-25 17:12:19 -04:00
Calen Pennington
390122ec93 Make CourseOverviewFactory create new courses every time (unless otherwise specified) 2019-06-25 12:04:59 -04:00
Christie Rice
b8401beaae REVEM-374 Remove course prices from dashboard (#20856) 2019-06-24 08:56:05 -04:00
Michael Roytman
05c0510cd3 add external_user_key to response and add ability to search by username, email, or external user key
Code review comments - EDUCATOR-4319

undoing changes temporarily

undoing changes temporarily

Fixed exception handling

re-added changes after hard reset

removed waffle flag (wrong merge

removed waffle flag (wrong merge
2019-06-14 08:36:00 -04:00
edx-pipeline-bot
de5d25eccc Merge pull request #20794 from edx/private_to_public_55dd3e1
Mergeback PR from private to public.
2019-06-11 19:17:13 +05:00