David Ormsbee
247c3ade70
Fix double requirement specification (django-model-utils)
2013-08-22 15:00:56 -04: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
David Ormsbee
25d9c2f385
Merge design first pass at mode choice page
2013-08-22 14:17:57 -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
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
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
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
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
Peter Fogg
7fc8fcde7b
Merge pull request #752 from edx/peter-fogg/unlimited-graceperiod
...
Allow grace periods of > 24 hours.
2013-08-21 13:00:15 -07:00
Diana Huang
bd4cc448af
Clean up models, add some error handling
2013-08-21 15:55:30 -04:00
Jonah Stanley
0138c08288
Merge pull request #758 from edx/jonahstanley/fix-courseteam-test
...
Made the lambda statement more resistant to errors
2013-08-21 12:47:35 -07:00
Frances Botsford
c392349fb0
adjusted controls for v photos
2013-08-21 15:40:08 -04:00
Frances Botsford
abd678e464
initial step interaction for verification
2013-08-21 15:27:37 -04:00
JonahStanley
af028efd00
Made the lambda statement more resistant to errors
...
Made the statement better
pylint fix
Accidently left off parameter
Removed logout
2013-08-21 15:01:33 -04:00
Diana Huang
e2ae0b2970
Remove line_cost from OrderItem
2013-08-21 14:49:18 -04:00
Peter Fogg
eb5b6cc6ea
Allow grace periods of > 24 hours.
2013-08-21 14:37:12 -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
chrisndodge
9dce9d1e23
Merge pull request #755 from edx/fix/cdodge/STUD-671
...
update the PDF textbook url paths as well as update wiki_slug when impor...
2013-08-21 10:54:51 -07:00
Diana Huang
26f1caaf57
Add jsinput_spec back in.
2013-08-21 13:54:22 -04: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
Diana Huang
77ee243e77
Some cleanup fixes to get verified certs working.
2013-08-21 13:14:21 -04:00
Diana Huang
d6e777bc1b
Remove enrollment_cost from course_module
2013-08-21 13:14:21 -04:00
Diana Huang
cff5491f8c
Pull CyberSource values from environment variables
...
when in a dev environment.
2013-08-21 13:14:21 -04:00
Diana Huang
d719f14a52
Add in new VerifiedCertificate order item
2013-08-21 13:14:21 -04:00
