Commit Graph

22621 Commits

Author SHA1 Message Date
Diana Huang
5a90a6590f Put shopping cart views behind flags 2013-08-22 15:39:55 -04:00
Diana Huang
4070984cac Some cleanup fixes to get verified certs working. 2013-08-22 15:39:55 -04:00
Diana Huang
10c96cb897 Remove enrollment_cost from course_module 2013-08-22 15:39:55 -04:00
Diana Huang
23a15aed57 Pull CyberSource values from environment variables
when in a dev environment.
2013-08-22 15:39:55 -04:00
Diana Huang
461b4da349 Add in new VerifiedCertificate order item 2013-08-22 15:39:55 -04:00
Jason Bau
5ae2289df0 about page changes, refactor processor reply handling 2013-08-22 15:39:55 -04:00
Jason Bau
e4e22f0f85 Lots more verification of CyberSource reply + receipt generation 2013-08-22 15:39:55 -04:00
Jason Bau
41b9f9f071 factor out cybersource processor from cart 2013-08-22 15:39:55 -04:00
Jason Bau
44be024168 add Order model fields for receipt generation 2013-08-22 15:39:54 -04:00
Jason Bau
ff5ca76aa6 add Validation function for cybersource receipt POST 2013-08-22 15:39:54 -04:00
Jason Bau
3f9c52cd1c Move shopping cart from session into model/db 2013-08-22 15:39:54 -04:00
Jason Bau
ea7cf3a24e add parameterization of cybersource creds 2013-08-22 15:39:54 -04:00
Jason Bau
4d81383e0a added shopping cart list template, embedded form 2013-08-22 15:39:54 -04:00
Jason Bau
988a7a1fba initial commit of shopping cart and cybersource integration 2013-08-22 15:39:54 -04:00
Vik Paruchuri
26a301f42e Merge pull request #504 from edx/feature/vik/oe-ui
Feature/vik/oe ui
2013-08-22 12:23:29 -07:00
David Ormsbee
2b052c6fd3 fix typo in config file 2013-08-22 14:58:51 -04:00
David Ormsbee
91fab4579b Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/envs/common.py
	lms/envs/dev.py
2013-08-22 14:57:34 -04:00
David Ormsbee
d46ed7ff53 very stupid initial photo verification attempt save just so we can stuff into a cart 2013-08-22 14:54:38 -04:00
David Ormsbee
5422fc94ca very stupid initial photo verification attempt save just so we can stuff into a cart 2013-08-22 14:54:29 -04:00
Vik Paruchuri
a06801432e Fix staff grading test 2013-08-22 14:12:12 -04:00
Will Daly
736b3e0ecd Common djangoapps no longer access courseware; other cleanup 2013-08-22 14:08:35 -04:00
David Ormsbee
4a70f7588e Merge branch 'ormsbee/verifyuser' into ormsbee/verifyuser_func
Conflicts:
	lms/djangoapps/verify_student/models.py
	lms/djangoapps/verify_student/tests/test_models.py
	lms/djangoapps/verify_student/tests/test_views.py
	lms/djangoapps/verify_student/urls.py
	lms/djangoapps/verify_student/views.py
	lms/envs/dev.py
	lms/templates/verify_student/face_upload.html
	lms/templates/verify_student/photo_id_upload.html
	lms/urls.py
2013-08-22 14:07:08 -04:00
chrisndodge
0191ae9417 Merge pull request #652 from edx/feature/ichuang/import-with-no-static
Enable mongodb to be used as back-end for git-based authoring workflow
2013-08-22 11:05:02 -07:00
David Ormsbee
0dd5819683 basic flow from enroll mode selection to verify screen 2013-08-22 13:56:23 -04:00
Jason Bau
dad67cb90a change error HTTP response codes to 400 where appropriate 2013-08-22 10:43:10 -07:00
JonahStanley
5c483d32e6 Removed space 2013-08-22 12:53:58 -04:00
Frances Botsford
0086a054d6 first pass at select a track for verification 2013-08-22 11:37:36 -04:00
Diana Huang
a0948668f4 Remove unnecessary verified certificate view. 2013-08-22 11:01:09 -04:00
Diana Huang
bd576e1e23 Pep8 fixes 2013-08-22 10:34:16 -04:00
JonahStanley
d96595318a Stylistic changes
CMS tests should now run on IE

CMS tests will now run on Safari

Rebased wrong

Forgot to update the test_acceptance.sh

Changed way of string splitting
2013-08-22 10:08:35 -04:00
lapentab
d894a065df Stylistic changes 2013-08-22 09:28:37 -04:00
lapentab
1759191370 Remove network calls in tests 2013-08-22 08:43:28 -04:00
Jason Bau
b674aabbe7 remove DEBUG flag from cart addition urls--causing test failure 2013-08-21 19:17:31 -07:00
Jason Bau
5b25940cde shopping cart view tests. coverage full except for debug line 2013-08-21 18:56:03 -07:00
Chris Dodge
ef98c54f5b fix some pylint violations 2013-08-21 20:06:10 -04:00
Will Daly
8165a033b1 Pep8/pylint fixes
Fixed test_masquerade failure due to not clearing the modulestore
between tests.
2013-08-21 19:42:59 -04:00
Jason Bau
a5ee2add05 started view tests 2013-08-21 14:54:00 -07:00
Diana Huang
f5290e4397 Make each item purchase transaction atomic
and add the ability to record the fulfillment time
2013-08-21 17:35:15 -04:00
Will Daly
151782acf0 LMS acceptance tests use mixed modulestore 2013-08-21 16:23:48 -04:00
David Ormsbee
1676fc31a5 Halfway state for course enrollment by mode 2013-08-21 16:21:53 -04:00
David Ormsbee
775ae010a2 Shorted names of models in verify_student 2013-08-21 16:21:52 -04:00
David Ormsbee
8f572e537e Flesh out the Software Secure model and add SS-specific encryption functions 2013-08-21 16:21:52 -04:00
David Ormsbee
086f55643e Bare bones outline of ID verification templates 2013-08-21 16:21:52 -04:00
David Ormsbee
0db7884354 Basic first commit of Photo ID Verification model and test code 2013-08-21 16:21:52 -04:00
JonahStanley
b2480b5f00 Changed way feature flags are interpreted
Configurations must be defined before hand

Reduced pylint violations

We only support 4 browsers
2013-08-21 16:05:53 -04:00
JonahStanley
21f75ff250 Various stylistic and pylint fixes / changes
Version numbers have very different ranges for different browsers so not having a dictionary of those.

Fixed a whitespace issue

Fixed pylint/pep8 violations

Don't need django_url

Spacing issues

Changed how commenting works

Forgot one

Used wrong name

Changed around importing

Remove django_url

Fixed function orderingn

Made logic nicer for getting a new browser

Modifying tests to run in opera

Needed to increase time to account for slow sauce loading

Now safari LMS works

Forgot an assert statement

Skipping a few tests for opera
2013-08-21 16:05:52 -04:00
JonahStanley
bb7cbf4d62 If sauce is not enabled, allow full range of ports
Forgot an import
2013-08-21 16:05:03 -04:00
JonahStanley
4c3dcda7e8 Hack to get around many types of string encodings
Changed the port listing

Changing to better readability
2013-08-21 16:05:03 -04:00
JonahStanley
22b3f2b161 Factored out Sauce related things to one file
LMS was arbitrarily chosen for now.

Fixed up pylint and pep8 errors

Fixed up pylint and pep8 errors

Changed naming to be better

Changed Sauce Info to obtaining a JSON string
2013-08-21 16:05:03 -04:00
JonahStanley
35e5f4cab5 Moved global things in browser.py to functions 2013-08-21 16:05:02 -04:00