Commit Graph

184 Commits

Author SHA1 Message Date
Clinton Blackburn
306a267de7 Updated create_order endpoint to use E-Commerce API for order creation and enrollment
This functionality is activated by adding a SKU to a non-honor course mode. When the feature is activated, verified orders will be created by the E-Commerce Service instead of LMS. After payment, the E-Commerce Service will also create the enrollment.
2015-03-20 14:53:23 -04:00
Ned Batchelder
7d799e34f3 Remove unused imports 2015-03-17 07:10:31 -04:00
Andy Armstrong
37dd0ec840 Merge pull request #7327 from edx/andya/preferences-api
Implement full preferences API
2015-03-17 00:57:01 -04:00
Andy Armstrong
6976a33a85 Add the preferences endpoint to the User API
TNL-1493

See https://openedx.atlassian.net/wiki/display/TNL/User+API for details
2015-03-16 23:34:35 -04:00
stv
181eed241f Silence unrelated warnings 2015-03-14 13:35:18 -07:00
stv
0248660214 Fix Pylint: W0631(undefined-loop-variable) 2015-03-13 20:20:04 -07:00
stv
6c06f8ce5d Fix Pylint: C1001(old-style-class) 2015-03-13 20:20:04 -07:00
Awais
4bab316bb9 ECOM-911 no-id-professional mode registration flow 2015-03-13 10:03:05 +00:00
aamir-khan
1512c0609e ECOM-1177: Removed the session variable on pay_and_verify view 2015-03-12 16:40:02 +05:00
Christina Roberts
00313e0e51 Merge pull request #7226 from edx/christina/update-accounts-api
Updates to account and profile APIs based on arch council feedback
2015-03-10 12:47:15 -04:00
cahrens
e30ea5c08b Switch to api directory and improve error handling. 2015-03-09 12:51:43 -04:00
Awais
c8ae32e628 ECOM-1158 fixing astrophysique in html. 2015-03-06 15:12:41 +05:00
cahrens
c8a20df210 Combine account and profile into same API. 2015-03-05 16:13:49 -05:00
cahrens
450d9e37db Limit PATCH to own user information. 2015-03-05 13:30:45 -05:00
Will Daly
7bad603978 Merge pull request #7076 from edx/will/deprecate-embargo
Deprecate old embargo implementation.
2015-03-03 15:54:41 -05:00
Andy Armstrong
dfe0057b79 Implement profile API
TNL-1491

See the API design here:

https://openedx.atlassian.net/wiki/display/TNL/User+API
2015-03-02 16:28:52 -05:00
cahrens
3ed31c2b1b Add name change and email change support to accounts API.
Name change is immediate, email change is multi-step.
2015-02-27 16:35:05 -05:00
Will Daly
ae8ddc8aee Deprecate old embargo implementation.
The new "country access" implementation replaces the old
implementation.  Middleware and tests have been updated
accordingly, but deprecated models are preserved
for backwards compatibility.
2015-02-23 15:48:04 -05:00
Will Daly
e609f982d7 Country Access: block enrollment
Block users from enrolling in a course if the user
is blocked by country access rules.

1) Enrollment via the login/registration page.
2) Enrollment from the marketing iframe (via student.views.change_enrollment)
3) Enrollment using 100% redeem codes.
4) Enrollment via upgrade.

This does NOT cover enrollment through third party authentication,
which is sufficiently complex to deserve its own commit.
2015-02-10 13:07:51 -05:00
Will Daly
b22b0a35be Merge pull request #6924 from edx/will/ECOM-1045
ECOM-1045: Add messaging for when students miss the verification deadline
2015-02-09 10:02:19 -05:00
Will Daly
0da4b13f25 Add messaging for when students miss the verification deadline
Show ordinary receipt unless the student is in the payment flow.
2015-02-08 14:35:11 -05:00
Calen Pennington
2bb1aafaaf Merge pull request #6752 from cpennington/modulestore-test-case-cleanup
Clean up ModuleStoreTestCase
2015-02-04 15:57:01 -05:00
Calen Pennington
b353ed2ea2 Better support specifying of modulestore configuration in test cases
The existing pattern of using `override_settings(MODULESTORE=...)` prevented
us from having more than one layer of subclassing in modulestore tests.

In a structure like:

    @override_settings(MODULESTORE=store_a)
    class BaseTestCase(ModuleStoreTestCase):
        def setUp(self):
            # use store

    @override_settings(MODULESTORE=store_b)
    class ChildTestCase(BaseTestCase):
        def setUp(self):
            # use store

In this case, the store actions performed in `BaseTestCase` on behalf of
`ChildTestCase` would still use `store_a`, even though the `ChildTestCase`
had specified to use `store_b`. This is because the `override_settings`
decorator would be the innermost wrapper around the `BaseTestCase.setUp` method,
no matter what `ChildTestCase` does.

To remedy this, we move the call to `override_settings` into the
`ModuleStoreTestCase.setUp` method, and use a cleanup to remove the override.
Subclasses can just defined the `MODULESTORE` class attribute to specify which
modulestore to use _for the entire `setUp` chain_.

[PLAT-419]
2015-02-04 09:09:14 -05:00
Calen Pennington
03a05fd9d4 Always call super(..).setUp() from setUp 2015-02-04 09:09:14 -05:00
Omar Al-Ithawi
4e733c6e1f Unicode fixes for log messages and other things 2015-02-04 09:55:44 +02:00
Renzo Lucioni
80589eab36 Remove old payment and verification flow
Removes old payment and verification endpoints, views, templates, and tests, making the new split flow the default. The SEPARATE_VERIFICATION_FROM_PAYMENT feature flag is also removed.
2015-01-29 10:56:25 -05:00
Carlos Andrés Rocha
6db7a7e688 Merge pull request #6751 from edx/release
Release
2015-01-23 16:10:00 -05:00
stephensanchez
891b952c99 Making verification msg strings unicode friendly. 2015-01-20 21:39:36 +00:00
Diana Huang
134d2f57b2 Show an error when a student needs to reverify
due to expiration.
2015-01-20 14:51:08 -05:00
AlasdairSwan
23da87f078 Merge pull request #6414 from edx/alasdair/decoupled-verified-state-copy-cleanup
ECOM-811 design and layout changes
2014-12-31 14:40:15 -05:00
Will Daly
400efdf153 Merge pull request #6421 from edx/will/ecom-850
Set attempting_upgrade session flag in the new payment flow
2014-12-31 11:04:28 -08:00
Will Daly
c183831b43 Merge pull request #6423 from edx/will/ecom-864
Hide verification messaging if the user has an active verification
2014-12-31 11:03:34 -08:00
Will Daly
c15adf9cd9 Set attempting_upgrade session flag in the new payment flow 2014-12-31 13:11:34 -05:00
Will Daly
01814c3983 Hide verification messaging if the user has an active verification 2014-12-31 13:01:56 -05:00
AlasdairSwan
686905d9a2 ECOM-811 design and layout changes
Copy clean up
2014-12-31 12:07:35 -05:00
Will Daly
a90f7ab1bf Enter the new verification / payment flow using a GET param
Allow disabling of experiment
2014-12-30 13:36:25 -08:00
AlasdairSwan
8eb484c109 ECOM-811 design and layout changes 2014-12-30 06:53:59 -08:00
Will Daly
d3459be05a Add Jasmine tests for the payment/verification flow. 2014-12-22 13:25:49 -05:00
Stephen Sanchez
9bd1f3a8d7 Merge pull request #6327 from edx/sanchez/logging-verified-split
Adding a number of logging messages for verification process.
2014-12-22 10:49:29 -05:00
Awais Qureshi
cf83a3cc2c Merge pull request #6323 from edx/awais786/ECOM-759
ECOM-759  if course is none return 404 error code.
2014-12-22 20:39:35 +05:00
Awais
9d9f0c2f75 ECOM-759 if course is none return 404 error code. 2014-12-22 14:48:32 +05:00
stephensanchez
33f62685a8 Adding a number of logging messages for verification process. 2014-12-19 20:43:49 +00:00
Renzo Lucioni
988785545e Merge pull request #6311 from edx/renzo/photo-submission-confirmation-email
Send confirmation email on successful photo submission
2014-12-19 09:51:54 -05:00
Renzo Lucioni
1e4f890120 Send confirmation email on successful photo submission 2014-12-18 18:27:05 -05:00
Will Daly
5109a862e0 Preserve the contribution amount specified on the track selection page. 2014-12-17 15:35:31 -05:00
stephensanchez
96e22097b2 Add the activate account step to the verified workflow.
Changing approach such that email activation is not a step.

Removing stale line of code.

Update activate account step according to new UI changes.

Adding new test for activation.
2014-12-16 20:24:50 +00:00
Stephen Sanchez
2341bf1d1b Merge pull request #6272 from edx/sanchez/change-skip-step-logic
Positive filtering which steps can be skipped.
2014-12-16 15:38:30 -05:00
stephensanchez
c84a604949 Positive filtering which steps can be skipped. 2014-12-16 18:20:41 +00:00
Renzo Lucioni
cdcd5d79fe Fix unit test failure due to stale urls.py 2014-12-16 12:09:01 -05:00
Will Daly
80f5d4216a Inline underscore templates; add pre render step 2014-12-16 08:38:28 -05:00