Commit Graph

3005 Commits

Author SHA1 Message Date
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
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
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
5422fc94ca very stupid initial photo verification attempt save just so we can stuff into a cart 2013-08-22 14:54:29 -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
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
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
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
58bb6e1ea3 Changed tags to be lowercase to prevent preprocessing
Changed to have a default for device since it isn't always needed

Tags are more clear

Fixed stylistic issues
2013-08-21 16:05:02 -04:00
JonahStanley
3746c654d8 Added a tag for things that will not work on Firefox
Added tags for tests that will not work on Sauce

Changed build name

Tightened up logic

Conflicts:
	common/djangoapps/terrain/browser.py

Added flag for session name
2013-08-21 16:05:01 -04:00
Diana Huang
bd4cc448af Clean up models, add some error handling 2013-08-21 15:55:30 -04:00
Diana Huang
e2ae0b2970 Remove line_cost from OrderItem 2013-08-21 14:49:18 -04:00
Peter Fogg
e177270d0d Merge pull request #700 from edx/peter-fogg/course-image-upload
WIP: Peter fogg/course image upload
2013-08-21 11:17:12 -07:00
Jason Bau
ef4e8f7e13 move currency formatting into template 2013-08-21 10:31:26 -07:00
Jason Bau
f59e7edb8f minor changes to PaidCourseRegistrationTest.test_purchased_callback 2013-08-21 13:16:06 -04:00
Jason Bau
1c2d84077b 100% coverage on shoppingcart/models.py 2013-08-21 13:15:37 -04:00
Diana Huang
42f8b970fc Clean up views and models. 2013-08-21 13:14:23 -04:00
Diana Huang
76766cbcae Some pep8/pylint cleanup 2013-08-21 13:14:22 -04:00
Jason Bau
d38748b300 100% coverage on CyberSource.py 2013-08-21 13:14:22 -04:00
Jason Bau
3da149ad76 Start of tests for CyberSource processor 2013-08-21 13:14:22 -04:00
Jason Bau
3ecdb6711f change method sig of process_postpay_callback 2013-08-21 13:14:22 -04:00
Jason Bau
64c8a7444f add handling of CyberSource non-ACCEPT decisions 2013-08-21 13:14:22 -04:00
Jason Bau
efbb439cb5 Adding migration to store purchased mode in PaidCourseRegistration 2013-08-21 13:14:22 -04:00
Jason Bau
65f2814d73 make PaidCourseRegistration mode aware 2013-08-21 13:14:22 -04:00
Diana Huang
c5f353ec05 Major cleanup work on ShoppingCart models
* Make currency a property of the Order (for validation purposes)
* Remove null=True from Char fields
* Use InheritanceManager for subclassing OrderItem
* Change VerifiedCertificate to better handle some new use cases
* Cleaned out old migrations
* Tests!
2013-08-21 13:14:21 -04:00
Diana Huang
38ba856ddc Start building tests 2013-08-21 13:14:21 -04:00
Diana Huang
88f54fff20 Put shopping cart views behind flags 2013-08-21 13:14:21 -04:00