Chris Dodge
7edfd185b7
teardown the content database after tests
2013-08-22 17:35:38 -04:00
David Ormsbee
52d33c0dee
Merge branch 'master' into ormsbee/verifyuser_func
2013-08-22 17:33:20 -04:00
Peter Fogg
75b76b37ef
Add delete confirmation to static pages.
...
We used to use a regular JS `confirm`; this makes the UI consistent
with the rest of Studio.
2013-08-22 16:41:07 -04:00
Diana Huang
7cd385bb67
Merge pull request #736 from edx/diana/verified-certs-payment
...
Payment/Shopping Cart Backend
2013-08-22 13:11:12 -07:00
Will Daly
1cb52df16b
Removed unnecessary TestCase
2013-08-22 16:10:24 -04:00
Diana Huang
b761976167
Remove unnecessary verified certificate view.
2013-08-22 15:58:13 -04:00
Diana Huang
569727e608
Pep8 fixes
2013-08-22 15:58:07 -04:00
David Ormsbee
ff472e16f1
Grabbing the basic order information we need to sent to CyberSource.
2013-08-22 15:52:59 -04:00
Peter Fogg
2466a5f557
Allow Studio to display error modules.
2013-08-22 15:48:49 -04:00
Jason Bau
d7e311f5d2
remove DEBUG flag from cart addition urls--causing test failure
2013-08-22 15:39:57 -04:00
Jason Bau
1202b77d7d
shopping cart view tests. coverage full except for debug line
2013-08-22 15:39:57 -04:00
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
