Commit Graph

120 Commits

Author SHA1 Message Date
Max Rothman
c97314413b Merge branch 'release' into release-merge-test
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
2015-07-17 17:42:03 -04:00
Sarina Canelake
ba8fd1c21d Eliminate instances of unused-import Pylint violation 2015-07-13 17:33:25 -04: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
zubair-arbi
e369939b4b change redirect url from '/accounts/login' to '/login'
ECOM-1734
2015-07-02 18:44:10 +05:00
Renzo Lucioni
d330831871 Improve logging of ecommerce interactions
Adds standardized audit logging for checkout and enrollment change requests. XCOM-427.
2015-06-30 17:34:16 -04:00
Andy Armstrong
aa76d9482a Update Bok Choy to use optimized static assets
TNL-2465
2015-06-25 09:58:27 -04:00
Christine Lytwynec
f81e373bd4 don't use hardcoded date in verification email test 2015-06-23 14:33:25 -04:00
Will Daly
8c52c92bcb Reverification iOS support and refactor
* Delete reverification templates
* Delete photocapture.js
* Delete unused "name change" end-points
* Rebuild the reverification views using Backbone sub-views
* Stop passing template names to the JavaScript code
* Avoid hard-coding the parent view ID in the webcam view (for getting the capture click sound URL)
2015-06-22 08:45:12 -07:00
Awais
d5b7d285d6 ECOM-1772 Due date issue test case fixed. 2015-06-22 14:55:12 +05:00
Will Daly
69306da49a Remove unused code left over from ECOM-188. 2015-06-10 13:08:23 -04:00
Awais
424e1f5b3c ECOM-1572 implementing code to new branch. 2015-06-08 23:23:23 +05:00
zubair-arbi
803bc5532d use reverification xblock location as an identifier of reverification checkpoint
ECOM-1612
2015-06-01 19:33:04 +05:00
Awais
d0df626685 ECOM-1494 removing code from models. 2015-05-27 16:32:26 +05:00
Awais
58b7e7fb33 ECOM-1531 adding the fake-page for softwar secure. 2015-05-12 14:21:49 +05:00
aamir-khan
a975b8384c ECOM-1476: sending email on software secure response initial work 2015-05-07 18:56:49 +05:00
Jim Abramson
2a449ade58 Merge pull request #7938 from edx/jsa/xcom-287
fix ecommerce api calls in verify_student and add tests.
2015-05-07 08:03:39 -04:00
jsa
cc1c7d5012 fix ecommerce api calls in verify_student and update tests.
XCOM-287
2015-05-06 23:44:25 -04:00
Muhammad Ammar
63f4aa8ceb Merge pull request #7761 from edx/ammar/tnl1886-add-certificate-columns-in-grade-report
Add certificate columns in grade report
2015-05-06 09:32:42 +05:00
Clinton Blackburn
5e68753101 Deprecated Verify Later Page
We are moving toward a single workflow for verification.
2015-05-05 16:42:27 -04:00
muhammad-ammar
3bb7a2508d Add certificate columns to existing grade report
TNL-1886
2015-05-05 17:43:08 +05:00
zubair-arbi
7a1060cf56 Merge pull request #7849 from edx/zub/story/reverification-sevice-get-attempts-method
add 'get_attempts' method for 'ReverificationService'
2015-05-04 12:49:01 +05:00
Clinton Blackburn
1a1fe56b29 Added Oscar-Compatible Receipt Page 2015-05-02 00:18:05 -04:00
zubair-arbi
96d4a895f0 add 'get_attempts' method for 'ReverificationService' 2015-04-30 15:50:12 +05:00
zubair-arbi
da94aca522 add location_id field for the Reverification XBlock in VerificationStatus model
ECOM-1477
2015-04-29 18:41:30 +05:00
Aamir
dc308d4f28 Merge pull request #7772 from edx/awais786/ECOM-1441-additional-methods
ECOM-1441 additional methods for skip re-verification links.
2015-04-29 14:13:10 +05:00
Awais
860467e7d2 ECOM-1441 additional methods for skip re-verification links. 2015-04-29 12:17:15 +05:00
jsa
efde11d552 Use ecommerce api v2.
XCOM-213 XCOM-214
2015-04-27 16:57:17 -04:00
aamir-khan
d606ae97fb ECOM-1396: added the function to check is the xblock published 2015-04-22 19:23:33 +05:00
aamir-khan
ca08b979b3 ECOM-1290: added the redirection back to courseware after re-verification 2015-04-10 19:44:35 +05:00
Awais
1d8b0e3e89 ECOM-1205-adding models and tests 2015-04-02 14:55:41 +05:00
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
stv
0248660214 Fix Pylint: W0631(undefined-loop-variable) 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
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
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
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
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