Commit Graph

16880 Commits

Author SHA1 Message Date
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
Jason Bau
a4f5f4e42f about page changes, refactor processor reply handling 2013-08-21 13:14:21 -04:00
Jason Bau
0b8f41443f Lots more verification of CyberSource reply + receipt generation 2013-08-21 13:14:21 -04:00
Jason Bau
cf9d42772f factor out cybersource processor from cart 2013-08-21 13:14:21 -04:00
Jason Bau
ab1452cb1a add Order model fields for receipt generation 2013-08-21 13:14:21 -04:00
Jason Bau
1f6bdca6dd add Validation function for cybersource receipt POST 2013-08-21 13:14:21 -04:00
Jason Bau
ed4e7f54c7 Move shopping cart from session into model/db 2013-08-21 13:14:21 -04:00
Jason Bau
1a3953ca89 add parameterization of cybersource creds 2013-08-21 13:14:21 -04:00
Jason Bau
9e56028091 added shopping cart list template, embedded form 2013-08-21 13:14:20 -04:00
Jason Bau
b7d73933b7 initial commit of shopping cart and cybersource integration 2013-08-21 13:14:20 -04:00
Diana Huang
deb55380d5 Merge pull request #760 from edx/diana/move-course-modes-to-common
Move course modes to common and enable in Studio admin
2013-08-21 10:12:26 -07:00
Kevin Chugh
2f4665375f Merge pull request #745 from edx/dave/block_forums_for_unenrolled
Make it so that students who are not enrolled cannot see the forum
2013-08-21 09:13:10 -07:00
Your Name
25d98778cc Merge branch 'master' into dave/block_forums_for_unenrolled 2013-08-21 12:00:06 -04:00
Your Name
541aa08471 update forum access to include check for valid date range 2013-08-21 11:59:39 -04:00
Your Name
a36e3b1957 CourseEnrollment no longer needed in forum/views 2013-08-21 11:06:30 -04:00
Diana Huang
70e1c70e4f Move course modes to common and enable in Studio 2013-08-21 09:59:15 -04:00
Your Name
b317d45ffb add missing imports 2013-08-21 09:49:09 -04:00
Kevin Chugh
08aafc58ea refactor to add access control to already_existing access control routines in access.py 2013-08-20 19:43:46 -04:00
Kevin Chugh
a2bbb65dcf refactor to add access control to already_existing access control routines in access.py 2013-08-20 19:42:03 -04:00
jkarni
e79f8c437a Merge pull request #665 from edx/feature/msteele/remove-log_event
Remove js log_event (keep compatibility)
2013-08-20 14:09:59 -07:00
Miles Steele
cb7a3ad8eb switch from log_event to Logger.log
keep log_event for compatibility
2013-08-20 16:52:18 -04:00
Peter Baratta
5692867b14 Merge pull request #750 from edx/peterb/numerical/add-docs
Add docs for changes in #726
2013-08-20 13:22:43 -07:00
Peter Fogg
9065023132 Merge pull request #749 from edx/peter-fogg/fix-rename-fail-grade
Fix failing grade label being editable but not saved.
2013-08-20 12:53:27 -07:00
Carlos Andrés Rocha
a35a2fd389 Merge branch 'release' 2013-08-20 14:55:20 -04:00
Peter Baratta
ab2570a7bd Add docs for changes in #726 2013-08-20 14:04:38 -04:00
Peter Fogg
533e0da101 Add acceptance test for noneditable failing grade range. 2013-08-20 13:34:41 -04:00
Peter Fogg
38165efd18 Fix failing grade label being editable but not saved. 2013-08-20 12:42:36 -04:00
jkarni
6c5d3e66c9 Merge pull request #731 from edx/jkarni/feature/docchanges
Incorporate Anant's suggestions
2013-08-20 07:00:05 -07:00
Peter Baratta
8211600bde Merge pull request #726 from edx/peterb/numerical/evaluate-staff
Use calc's evaluator for staff answers in `Numercial` type
2013-08-20 06:53:27 -07:00
Brian Talbot
f14e93029e Merge pull request #748 from edx/talbs/lms-fix-resetbutton
Sync up Reset Action Button Styling for Capa xmodules
2013-08-20 06:43:40 -07:00
Brian Talbot
fb7fe13061 adds in the .reset type of action to the x module capa styling 2013-08-20 09:21:04 -04:00
Christina Roberts
1a8b2fa0eb Merge pull request #735 from edx/fix/cdodge/pylint-violations
address some pylint violations in the mixedmodulestore build report
2013-08-20 05:42:55 -07:00
Christina Roberts
05712da6e9 Merge pull request #744 from edx/dhm/pep_pylint_cleanups
Add doc strings and fix spaces
2013-08-20 05:28:21 -07:00