Jason Bau
2c4b1e17b4
started view tests
2013-08-22 15:39:57 -04:00
Diana Huang
e8db9e8f2a
Make each item purchase transaction atomic
...
and add the ability to record the fulfillment time
2013-08-22 15:39:57 -04:00
Diana Huang
dee127360b
Clean up models, add some error handling
2013-08-22 15:39:56 -04:00
Diana Huang
3a0a56f3a9
Remove line_cost from OrderItem
2013-08-22 15:39:56 -04:00
Diana Huang
6c19f3a7ad
Add jsinput_spec back in.
2013-08-22 15:39:56 -04:00
Jason Bau
e30ebf5041
move currency formatting into template
2013-08-22 15:39:56 -04:00
Jason Bau
ee10cf7e96
minor changes to PaidCourseRegistrationTest.test_purchased_callback
2013-08-22 15:39:56 -04:00
Jason Bau
1bff390ba8
100% coverage on shoppingcart/models.py
2013-08-22 15:39:56 -04:00
Diana Huang
9798d020d1
Clean up views and models.
2013-08-22 15:39:56 -04:00
Diana Huang
b475ac36f1
Some pep8/pylint cleanup
2013-08-22 15:39:56 -04:00
Jason Bau
055ad5357d
100% coverage on CyberSource.py
2013-08-22 15:39:56 -04:00
Jason Bau
d140ffd868
Start of tests for CyberSource processor
2013-08-22 15:39:56 -04:00
Jason Bau
9fdf60ff45
change method sig of process_postpay_callback
2013-08-22 15:39:56 -04:00
Jason Bau
ca3651fa35
add handling of CyberSource non-ACCEPT decisions
2013-08-22 15:39:56 -04:00
Jason Bau
6f70c9b9ce
Adding migration to store purchased mode in PaidCourseRegistration
2013-08-22 15:39:55 -04:00
Jason Bau
5fbb12cb61
make PaidCourseRegistration mode aware
2013-08-22 15:39:55 -04:00
Diana Huang
6f3e83b86c
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-22 15:39:55 -04:00
Diana Huang
84628e105f
Start building tests
2013-08-22 15:39:55 -04:00
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
704650fe38
Merge remote-tracking branch 'origin/master' into fix/vik/oe-state
2013-08-22 15:31:31 -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
chrisndodge
f3943c7e22
Merge pull request #779 from edx/fix/cdodge/check-xml-attribute-existence
...
ErrorDescriptors do not have xml_attributes field
2013-08-22 12:08:40 -07:00
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
Chris Dodge
46ce931d51
ErrorDescriptors do not have xml_attributes field
2013-08-22 14:50:45 -04:00
Vik Paruchuri
21e13e44af
Pep8 and pylint fixes
2013-08-22 14:29:39 -04:00
David Ormsbee
25d9c2f385
Merge design first pass at mode choice page
2013-08-22 14:17:57 -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
chrisndodge
1e9621cf4f
Merge pull request #763 from edx/fix/cdodge/strip-transient-draft-serialization-attributes
...
fix some gaps which would allow the temporary xml attributes 'parent_seq...
2013-08-22 11:00:55 -07:00
David Ormsbee
0dd5819683
basic flow from enroll mode selection to verify screen
2013-08-22 13:56:23 -04:00
Vik Paruchuri
a6cc30d1fe
Fix tests, address review feedback
2013-08-22 13:51:27 -04:00
