Commit Graph

30 Commits

Author SHA1 Message Date
Ned Batchelder
fb595c89f3 Fix a number of incorrect translation string uses
These were found by the new pylint checker I wrote! :)
2015-02-02 22:38:27 -05:00
David Baumgold
08e90d2e99 Better i18n for credit card charge failures 2014-12-30 09:20:17 -05:00
Jesse Zoldak
6122f9c9ee Revert "Better i18n for credit card charge failures"
This reverts commit 619a5ea3eb.
2014-12-26 09:10:01 -05:00
David Baumgold
619a5ea3eb Better i18n for credit card charge failures 2014-12-24 15:17:45 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Will Daly
1ad8d4f2d4 Add verification for CyberSource2 implementation.
Clean up shopping cart processor API.
Fix UUID JSON serialization bug in CyberSource2 implementation.
Update test suite to use new CyberSource2 implementation.
Fix i18n messages in CyberSource2
Enable CyberSource2 implementation by default.
2014-08-20 10:39:48 -04:00
asadiqbal08
5734d2a883 asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS
Added username into Authors file

[Ex-12] Add user to input coupon code in the Shopping Cart

[Ex-13] Discount should be reflected in the Payment confirmation page and email

added E-commerce Tab in Instructor Dashboard

added name/email in authors file

removed the is_active column, change the colors scheme, fixed bugs

wip

wip

test github account

STORE_BILLING_INFO set to True

cybersource api update, reference number updated, merchant_data removed from params

View Course buttons on receipt

link for course added to receipt

receipt.html view course button - func update

receipt.html course link update

move new CyberSource implementation to a separate file so that we can keep the original

remove config changes

remove config changes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

remove array paid_course_ids init in views.py

removed the is_active filter=false, added styling to the inactive coupon codes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

Add column to the list of coupons in the E-Commerce tab

Add ability for microsites to specify custom CyberSource secret configuration, i.e. run under different accounts

make the new CyberSource2 also microsite aware

updating migration for student and shopping cart apps

added user signup functionality that orignated from the Microsites

added non-microsite user signup tests

fix the hard coded callback URL to localhost

add comment

Modify e-commerce instructor tab to show a total amount above the coupon listings for admin finance user

made changes as suggested by diana khuang

add the CourseAccessRoles table to the Django Admin website

shopping cart coupon checkout changes as suggested by Jason Bau

changes are made according to the suggesstions on PR#4172

changes made in the coupons file

changes in the coupons get_coupon_info view

fix merge conflict resolution error

changes in the remove_coupon view json response

changes as suggested by David Baumgold

pep8/pylint fixes

Changes as suggested by jasonBau

don't assume item in shopping cart is a PaidCourseRegistration

fix up some logging

changed the urls of the coupon views and use the post to get the values from the request
2014-07-10 09:35:32 -04:00
Ned Batchelder
2157b4d8b7 Miscellaneous fixes to strings found during i18n work. 2014-01-03 17:50:16 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Diana Huang
3b66852235 Add unicode handling to the signing and verifying logic 2013-09-19 10:07:49 -04:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
2013-09-04 10:58:30 -04:00
Diana Huang
4471079f71 Clean up validation of price selection. Add error messaging. 2013-08-28 16:43:09 -04:00
David Ormsbee
9b43871373 Verification purchase goes through to CyberSource 2013-08-22 21:14:18 -04:00
David Ormsbee
ff472e16f1 Grabbing the basic order information we need to sent to CyberSource. 2013-08-22 15:52:59 -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
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
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
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