Julian Arni
b6795b4e88
Add jquery-file-upload
2013-08-25 22:40:09 -04:00
caesar2164
a902201f06
Merge pull request #720 from edx/akshay/order-commentables
...
Bug fix -- subcategories in forums topic list should now be sorted alphabetically
2013-08-23 13:01:06 -07:00
Giulio Gratta
44f4e7b10a
refatoring tests and added to changelog
2013-08-23 12:59:14 -07:00
Giulio Gratta
4e77098859
added course level feature flag for forum alpha sorting as well as tests
2013-08-23 12:59:13 -07:00
Giulio Gratta
e0471007d8
removed sort in HTML and instead added conditional to use subcategory titles as sort_key
2013-08-23 12:59:13 -07:00
Akshay Jagadeesh
8cac4ebae2
Working on sorting dropdown commentables
2013-08-23 12:59:13 -07:00
Peter Fogg
5cb1b2594f
Merge pull request #787 from edx/peter-fogg/static-page-delete
...
Add delete confirmation to static pages.
2013-08-23 11:52:37 -07:00
Peter Fogg
07d9106c09
Merge pull request #769 from edx/peter-fogg/studio-error-descriptor
...
Allow Studio to display error modules.
2013-08-23 11:51:57 -07:00
Will Daly
d89279f6b3
Merge pull request #773 from edx/lapentab/fix_network_tests
...
Remove network calls in tests
2013-08-23 09:07:31 -07:00
Will Daly
42ac76ce0c
Merge branch 'master' into lapentab/fix_network_tests
...
Conflicts:
lms/djangoapps/courseware/tests/tests.py
2013-08-23 11:48:38 -04:00
Jonah Stanley
bda814fb8c
Merge pull request #785 from edx/jonahstanley/fix-image-upload
...
Changed error message on failure and made test more robust
2013-08-23 08:48:00 -07:00
Will Daly
c680dfdd40
Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests
...
Will/use mixed modulestore in tests
2013-08-23 08:38:09 -07:00
JonahStanley
473cc3624b
Changed error message on failure and made test more robust
...
Better error message
2013-08-23 11:33:52 -04:00
chrisndodge
9899b1a484
Merge pull request #783 from edx/fix/cdodge/add-contentstore-teardown
...
teardown the content database after tests
2013-08-22 15:10:35 -07:00
Chris Dodge
7edfd185b7
teardown the content database after tests
2013-08-22 17:35:38 -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
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
