Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,833 Commits 1 Branch 0 Tags
ecdf774e75dbb0f0fe84494de18dfdf946c14552
Commit Graph

14265 Commits

Author SHA1 Message Date
Diana Huang
e7a3847e48 More validation to the free-form price text box and allow for decimal places 2013-08-28 17:43:10 -04:00
Diana Huang
6c647d7630 Return the correct data to the backend. 2013-08-28 17:06:52 -04:00
Diana Huang
4471079f71 Clean up validation of price selection. Add error messaging. 2013-08-28 16:43:09 -04:00
David Ormsbee
7af4accc50 Preserve purchase amount choice and redisplay on final verification page. 2013-08-28 15:06:58 -04:00
David Ormsbee
48484ef9e0 move suggested price listing to common include template 2013-08-28 11:28:44 -04:00
Calen Pennington
7d79f4fe37 Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi 
[DEVPAIN-7]
 2013-08-28 10:56:07 -04:00
Diana Huang
4fbf23b66a Merge pull request #810 from edx/diana/email-receipt 
Email Receipts and Billing Information
 2013-08-27 14:48:06 -07:00
Diana Huang
1b5fde9dae Send email on purchase success. 2013-08-27 17:24:01 -04:00
Jay Zoldak
c8949b99d1 Disable pylint violation E0611 when importing assert_* methods from nose.tools 
Cleaned up files with muliline imports

Cleaned up files that do not use these imports

Misread comment
 2013-08-27 16:21:33 -04:00
Diana Huang
d7225f026a Only store certain bits of information behind a flag. 2013-08-27 15:19:58 -04:00
Calen Pennington
4b1fa6b316 Merge pull request #690 from cpennington/one-time-startup 
One time startup centralization
 2013-08-27 12:19:42 -07:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts 
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
 2013-08-27 12:12:20 -04:00
David Ormsbee
dd50ec4e82 Merge design and dev JS/UI for verify student 2013-08-26 15:32:40 -04:00
Felix Sun
6e64e994f6 Fixed a test broken when the mixed modulestore was introduced. 2013-08-26 09:46:29 -04:00
Felix Sun
74ed2dafb3 Improved docstrings. 2013-08-26 09:40:06 -04:00
Felix Sun
d9517ea13e Fixed tests for removing hash access to hints. Fixed instructor view for same. 2013-08-26 09:40:04 -04:00
Felix Sun
4ee8111cf4 Fixed monkey-patching persistent state bug. 2013-08-26 09:40:03 -04:00
Felix Sun
6b40c5cf13 Changed hint voting ui to show all hints on one page. 
Fixed broken tests for hint manager.
 2013-08-26 09:40:03 -04:00
Felix Sun
199b632513 Crowdsourced hinter now supports formula responses. Tests still broken. 2013-08-26 09:40:03 -04: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
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
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
David Ormsbee
3c79e81c9d default to a min price if we loose track of how much they wanted to pay 2013-08-23 11:37:34 -04:00
David Ormsbee
cbb259eb1f Allow amounts specified to actually work for purchasing certificates 2013-08-23 11:07:06 -04:00
David Ormsbee
2cdddef924 Remove useless critical log, remove unnecessary course_id escaping. 2013-08-23 01:27:08 -04:00
David Ormsbee
25874c29b0 add face capture button 2013-08-22 22:33:05 -04:00
David Ormsbee
9b43871373 Verification purchase goes through to CyberSource 2013-08-22 21:14:18 -04:00
David Ormsbee
52d33c0dee Merge branch 'master' into ormsbee/verifyuser_func 2013-08-22 17:33:20 -04: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
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
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