Commit Graph

35 Commits

Author SHA1 Message Date
Julia Hansbrough
fe5e2b3527 Refunding CertificateItem now marks parent Order refunded as well 2013-11-25 18:55:58 +00:00
Julia Hansbrough
05996a71df Added expiration_datetime field to CourseModes
Added an expiration_datetime field to CourseModes, intended to eventually replace expiration_date.

Included relevant schema and data migration file.

LMS-1454
2013-11-08 15:30:37 +00:00
Julia Hansbrough
c375666d88 Added new copy, small CR fixes
* Changed text for "Are you sure you want to refund"...
* Addressed a CR comment adding clarity to student view code
* Converted UTC to pytz.utc
2013-11-04 18:38:46 +00:00
Julia Hansbrough
81661385fb More response to Dave's PR 2013-11-04 18:38:45 +00:00
Julia Hansbrough
7ab8142e82 Response to Dave & Diana's CR 2013-11-04 18:38:44 +00:00
Julia Hansbrough
fcab46b138 Refactored to use signals; full test coverage 2013-11-04 18:38:42 +00:00
Julia Hansbrough
63940141c8 End-to-end refunding with tests 2013-11-04 18:37:55 +00:00
Julia Hansbrough
045e69f3c5 Can check verified-ness and expiration date 2013-11-04 18:37:54 +00:00
Jason Bau
ec8871206a use context processor instead of middleware 2013-10-16 12:16:10 -07:00
Jason Bau
6e543c1470 pep8 + pylint 2013-10-15 17:30:26 -07:00
Jason Bau
4c664240e1 Move logic that decides whether to show shoppingcart to middleware
Middleware is a better place for this, rather than navigation.html
template
2013-10-15 17:11:48 -07:00
Jason Bau
667a1eadb5 Stanford paid course registration
With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
2013-09-26 18:25:00 -07:00
Diana Huang
67af3d5ced Don't try to purchase the same order twice 2013-09-18 10:25:10 -04:00
David Ormsbee
ec3db3efde Make Certificate tests subclass ModuleStoreTestCase to fix missing course 2013-09-09 13:54:27 -04:00
David Ormsbee
af8475ad31 Make sure CourseFactory creates desired courses before shopping cart tests run. 2013-09-09 13:09:17 -04:00
Diana Huang
6538e9899d Fix some of the shopping cart tests. 2013-09-06 11:47:35 -04:00
Diana Huang
a1373f4830 Update content of the order confirmation e-mail. 2013-09-04 15:17:08 -04:00
Diana Huang
03a4af7add Fix failing tests. 2013-09-04 11:21:31 -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
Jay Zoldak
7bc997d0fb Change CSS after rebase. 2013-09-03 10:46:33 -04:00
Will Daly
e0372b00ef Implemented fake payment page. 2013-09-03 10:46:33 -04:00
Diana Huang
c9593f2094 Allow for the creation of a specialized receipt when
there is only one item in the order
2013-08-30 15:35:05 -04:00
Diana Huang
1b5fde9dae Send email on purchase success. 2013-08-27 17:24:01 -04:00
Diana Huang
d7225f026a Only store certain bits of information behind a flag. 2013-08-27 15:19:58 -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
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
Jason Bau
dad67cb90a change error HTTP response codes to 400 where appropriate 2013-08-22 10:43:10 -07:00
Diana Huang
a0948668f4 Remove unnecessary verified certificate view. 2013-08-22 11:01:09 -04:00
Diana Huang
bd576e1e23 Pep8 fixes 2013-08-22 10:34:16 -04:00
Jason Bau
b674aabbe7 remove DEBUG flag from cart addition urls--causing test failure 2013-08-21 19:17:31 -07:00
Jason Bau
5b25940cde shopping cart view tests. coverage full except for debug line 2013-08-21 18:56:03 -07:00
Jason Bau
a5ee2add05 started view tests 2013-08-21 14:54:00 -07:00