Commit Graph

600 Commits

Author SHA1 Message Date
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
Will Daly
d3c3f73428 Combine payment and intro step 2014-12-15 13:23:07 -05:00
Will Daly
93cc03a570 Separate verification / payment flow. 2014-12-15 13:11:33 -05:00
christopher lee
3c99912213 Merge branch 'release' 2014-12-03 14:46:40 -05:00
Adam Palay
c0b87d87ab fix typo on course payment page (ECOM-714) 2014-12-03 10:52:34 -05:00
Will Daly
84301e7698 Merge pull request #6070 from edx/will/verified-messaging-per-course
Student verification status
2014-12-02 16:08:25 -05:00
Will Daly
464dfcfabc Show student verification status on the dashboard. 2014-12-02 09:42:24 -05:00
Jesse Zoldak
e26a0c4308 Fix pep8 violations in some tests 2014-12-02 09:39:23 -05:00
Jesse Zoldak
bf3b87bc64 Clean up all modulestore testcases
Move modulestore config for tests to an importable location
Disable pylnt warning for lms imports in common tests
Refactor all testcases that loaded all xml courses
TE-610
TE-489
2014-12-02 07:09:36 -05:00
Sarina Canelake
5f723e8d3c s/pylint: disable=W0703/pylint: disable=broad-except/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
b127d2844b s/pylint: disable=C0103/pylint: disable=invalid-name/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
e0f1d3f3f3 s/pylint: disable=C0111/pylint: disable=missing-docstring/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
0dad9da5e4 s/pylint: disable=W0621/pylint: disable=redefined-outer-name/ 2014-12-01 11:22:08 -05:00
Will Daly
4a814c24ba Merge pull request #5948 from edx/will/combine-reg-login-form
Combined Login/Registration Form
2014-11-17 16:00:20 -05:00
Will Daly
12fec6c918 Send transaction type for donations and verified certificates to CyberSource 2014-11-17 08:10:49 -05:00
Adam Palay
bc8d0a9976 disable "go to payment button" on click (ECOM-643) 2014-11-14 12:22:30 -05:00
Will Daly
a5001bab2a Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
2014-11-13 11:16:16 -05:00
Will Daly
5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form
Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py
2014-11-10 15:05:37 -05:00
stv
fb9f324f2f Fix PEP8: E303 too many blank lines 2014-11-10 11:00:14 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
Daniel Friedman
eaa63da463 Merge branch 'release' 2014-11-05 12:10:55 -05:00
Renzo Lucioni
d9d09e2b4b Fix track selection tests 2014-11-04 15:25:38 -05:00
Renzo Lucioni
17a3f556fb Fix track selection header copy 2014-11-04 13:54:31 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Diana Huang
13986d8475 Update tests to match new text. 2014-10-28 16:28:58 -04:00
Diana Huang
92b0bf10c1 Update tests to match new text. 2014-10-28 11:58:41 -04:00
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00
Will Daly
f8365a2d3b Add donation end-point
Make donations configurable

Added donation button to dashboard

Generalize merchant defined data for payment processor
2014-10-07 14:22:55 -04:00
Don Mitchell
4ca5012f3c Use split to test views 2014-09-29 11:25:55 -04:00
Diana Huang
484f13c3cf Merge pull request #5154 from edx/diana/pass-along-course-id
Pass along course id to CyberSource
2014-09-10 14:58:26 -04:00
Will Daly
c47673bb8b Add a test for the course ID merchant defined field data 2014-09-10 10:08:07 -04:00
Diana Huang
4f67f0dad9 Add course_id as merchant defined data 2014-09-08 15:43:44 -04:00
Will Daly
a9c73d2490 Set order status to "paying" before redirecting to the external payment processor. 2014-09-08 10:51:51 -04:00
Waqas Khalid
d11aaec3a1 Handle the indexerror exception on create_order
LMS-2646
2014-09-02 19:08:53 +05:00
Will Daly
83bfb17807 Use new-style course locators consistently when setting the donation amount in the session
Update devstack settings to use new CyberSource API
2014-08-28 13:55:31 -04:00