Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

254 Commits

Author SHA1 Message Date
Ned Batchelder
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same. 2019-06-10 15:27:39 -04:00
Christie Rice
b5d07783b9 REVMI-234 Include user id in jwt sent to ecommerce (#20743) 
* REVMI-234 Include user id in jwt sent to ecommerce

* Reorder params
 2019-06-05 10:27:23 -04:00
Nimisha Asthagiri
a8e3624d9f Merge pull request #20711 from edx/bom/commerce-readme 
README for commerce and shoppingcart
 2019-05-29 14:12:03 -04:00
Nimisha Asthagiri
9e4a98b712 README for commerce and shoppingcart 2019-05-29 03:12:59 -04:00
Nimisha Asthagiri
6e214a85b0 Move common/djangoapps/enrollment to openedx/core/djangoapps/enrollments 2019-05-28 11:20:53 -04:00
Stu Young
95986d162b INCR-280 Run python-modernize on lms/djangoapps/commerce/api/v1 (#20579) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:41:15 -04:00
Stu Young
94efff4636 INCR-279 Run python-modernize on lms/djangoapps/commerce/migrations (#20580) 
* run python modernize

* run isort
 2019-05-21 11:40:28 -04:00
Stu Young
c2dcbb36b7 incr-278 (#20581) 
* run python modernize

* run isort

* quality

* qual
 2019-05-16 13:20:28 -04:00
Adeel Khan
9c221ebcf5 Fix csrf token error by adding JwtAuthentication. 
BasketView post endpoint is raising csrf token
error because of missing JwtAuthentication class.

LEARNER-6607
 2019-03-19 00:04:18 +05:00
Alex Dusenbery
f35970bb39 EDUCATOR-4189 | Account for undefined values in commerce API Course objects. 2019-03-14 16:47:46 -04:00
Jeremy Bowman
974ae50bf4 Merge pull request #19620 from cclauss/new-style-exceptions 
Old style exceptions --> new style for Python 3
 2019-02-19 16:31:35 -05:00
Julia Eskew
368f221f0a Initial start on annotations. 2019-02-19 11:24:21 -05:00
cclauss
c0c935b685 Old style exceptions --> new style for Python 3 2019-02-19 13:09:23 +01:00
Michael Youngstrom
3221c2b91f Remove lms pytest shards 2019-02-12 11:03:46 -05:00
Matthew Piatetsky
6e81c84d8b fix unicode strings in lms/ part 1 2019-02-05 15:15:02 -05:00
Cali Stenson
7cbe1312a9 Refactor verified_upgrade_link_is_valid to directly call Ecommerce service. 
Additionally update code documentation to clarify expected behavior around
dynamic pacing deadlines.

REVO-69
 2019-01-04 15:07:39 -05:00
Nimisha Asthagiri
dc56a63e03 Remove deprecated JwtBuilder 
ARCH-248
 2018-10-17 07:43:59 -04:00
Robert Raposa
fbc59231fc Update edx-drf-extensions to 2.0.0. 
Note: this version update is backward incompatible.

ARCH-255
 2018-10-17 01:00:34 -04:00
Robert Raposa
ba4cc62ff8 Retire deprecated RequestCache (Take 2) 
ARCH-223
 2018-09-08 15:09:28 -04:00
Nimisha Asthagiri
4ca165f690 Revert "ARCH-223: Retire deprecated RequestCache." 2018-08-30 16:33:03 -04:00
Robert Raposa
3df339a56a Retire deprecated RequestCache. 
ARCH-223
 2018-08-30 08:55:19 -04:00
Jeremy Bowman
1a5bf35357 TE-2689 Remove useless pylint suppressions part 2 2018-08-14 17:39:02 -04:00
Jeremy Bowman
ca3316962d TE-2524 Stop using nose.plugins - LMS 1 2018-07-31 13:03:18 -04:00
Uzair Rasheed
0c610749c9 Refactor Code for LEARNER-5257 
Course key object was not serializable before sending to celery
task.
 2018-07-17 18:20:39 +05:00
ayub-khan
d0d3e3427e Updated intructor unenroll 
If student is in refund window, refund student,
update mode to audit, and set is_active false. if
student is not in refund window, do not refund student
do not change mode, and set is_active to false.
If professional do not change mode after refund just
change is_active to false.

-
 2018-07-12 16:01:12 +05: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
zubair-arbi
66937b2cdf ENT-1052 Rename enterprise customer catalog uuid in queryparam to catalog 2018-07-03 17:09:56 +05:00
zubair-arbi
bbdcf6de7a ENT-1052 discount by enterprise catalog 2018-06-29 16:04:06 +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
J Eskew
edbdae9fb8 Merge pull request #18124 from edx/jeskew/fix_some_django20_deprecation_warnings 
Fix more Django 2.0 deprecation warnings around URLconfs.
 2018-05-08 16:29:12 -04:00
John Eskew
e5ee0fc91f Remove more unneeded 'namespace=' params. 2018-05-07 18:25:36 -04:00
John Eskew
ffb1f9fe2a Fix more Django 2.0 deprecation warnings around URLconfs. 2018-05-03 13:50:08 -04:00
Stuart Young
1fd2167144 rebalance python unittests onto new shards 2018-05-03 11:16:05 -04:00
Eric Fischer
e18448e27d Silence deprecation warnings 
https://docs.djangoproject.com/en/1.11/releases/1.10/#using-user-is-authenticated-and-user-is-anonymous-as-methods
 2018-05-02 10:03:50 -04:00
Brittney Exline
91e63ed8e0 ENT-945 Using SSOVerifications in ID Verification flow 
This reworks what was done #17930, since it had to be reverted from the IDVerificationAggregate migration.
We decided to abandon that model and directly read from both id verification models.
 2018-04-30 11:57:59 -04:00
Brittney Exline
292f9ca831 Partial revert of "ENT-945 Update IDVerification interfaces to accountfor SSOVerification" 
This partially reverts commit ee1c3a4548.
The migration files introduced by the commit have been kept since they have been run
already on several enviornments.
 2018-04-25 16:01:15 -04:00
Brittney Exline
ee1c3a4548 ENT-945 Update IDVerification interfaces to accountfor SSOVerification 2018-04-23 10:48:12 -04:00
Brittney Exline
d31d9bd684 ENT-942 Implement an abstraction layer for SoftwareSecurePhotoVerification class methods 2018-04-05 15:48:59 -04:00
Tasawer Nawaz
4912888168 stop using deprecated single item basket view 
LEARNER-4428
 2018-03-14 20:29:51 +05:00
Matt Tuchfarber
4c7dc0b250 Add bundle key to program purchase button 
In order for a program to be tracked as a bundle in ecommerce and GA
a bundle key must be added to the basket URL. This adds that key to
the purchase button on the program marketing page.
 2018-03-07 15:40:51 -05:00
Michael LoTurco
a4f294b441 Add convenience functions for Entitlement Support Tool 
Adds getter for ecommerce order dashboard url and for getting
the entitlement support details reasons.

Learner-3925
 2018-03-06 17:49:08 -05:00
Albert St. Aubin
b56fdcc652 Changes to auto enroll users using their entitlement if they have one 
available.

[LEARNER-3898]
 2018-02-21 11:17:02 -05:00
Jeremy Bowman
5289c7e828 PLAT-1915 Stop using deprecated BaseException.message 2018-01-31 17:22:01 -05:00
Qubad786
64555c60c0 Move request_cache to openedx.core.djangoapps 2018-01-26 15:09:25 +05:00
Albert St. Aubin
f0436aa832 Refactor of the CourseEntitlement Refund API to handle refund failures 
[LEARNER-3629]

The CourseEntitlement Refund API will not respond with ERROR codes when
the attempted refund call to Ecommerce fails.
 2018-01-24 14:46:58 -05:00
Albert St. Aubin
06c5d0c1a9 Corrected incorrect refund data in refund logic 
[LEARNER-3629]

This is the refactor logic for refunds. With the addition of
Course Entitlement Refunds shared refund logic was merged and tests were added.
 2018-01-04 15:31:33 -05:00
Albert (AJ) St. Aubin
e53013ec70 Revert "Refactor of the CourseEntitlement Refund API to handle refund failures" 2018-01-04 14:28:12 -05:00
Albert St. Aubin
417ef0583b Refactor of the CourseEntitlement Refund API to handle refund failures 
[LEARNER-3629]

The CourseEntitlement Refund API will not respond with ERROR codes when
the attempted refund call to Ecommerce fails.
 2018-01-04 11:02:13 -05:00
bmedx
23503f5226 Fix test issues with new httpretty 2017-12-22 15:36:45 -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