Commit Graph

508 Commits

Author SHA1 Message Date
Calen Pennington
60cecc4e12 Fix syntax error 2014-05-09 09:23:52 -04:00
Calen Pennington
cd746bf8e5 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit adds the non-courseware lms/djangoapps and lms/lib.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-08 12:09:23 -04:00
Usman Khalid
e33e9ff2d9 Parameter from_email to send_mail() should be string and not string in list.
LMS-2518
2014-05-02 20:35:20 +05:00
Gabe Mulley
36269bd5a8 Integrate event-tracking in to the LMS
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
2014-05-01 14:04:35 -04:00
William Desloge
01e01555be Fix missing call to translate in shoppingcart model 2014-04-16 12:08:45 +02:00
Bertrand Marron
01c5cd5dc4 Fix unicode issue in shopping cart
Fails when course name contains non-ascii characters.
2014-03-06 11:46:53 +01:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Ned Batchelder
1bd213beba Remove unused imports. 2014-02-10 14:07:50 -05:00
Julia Hansbrough
891465d1b0 Fixed 500ing CSV reports 2014-02-04 16:38:08 +00:00
Don Mitchell
3885e6cf78 Merge branch 'release'
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
2014-01-16 12:51:22 -05:00
Julia Hansbrough
f3f0e8a514 Merge pull request #1888 from edx/flowerhack/feature/certificate-revenue-reporting
Verified Certificate Reports
2014-01-15 06:18:17 -08:00
Julia Hansbrough
1664452a14 Final iteration 2014-01-15 13:06:50 +00:00
Julia Hansbrough
ea0ae11171 Response to CR 1-14 2014-01-15 00:27:14 +00:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
2014-01-14 14:36:01 -05:00
Julia Hansbrough
a776476098 Response to CR 1-13 2014-01-13 16:39:47 +00:00
Julia Hansbrough
f2b0394211 CR response 2014-01-13 15:57:14 +00:00
Julia Hansbrough
95affba643 More response to CR 2014-01-06 15:53:28 +00:00
Julia Hansbrough
99e8596fea Response to CR 2014-01-06 15:53:28 +00:00
Julia Hansbrough
893acc57b6 Template changes 2014-01-06 15:53:28 +00:00
Julia Hansbrough
edd0b5436e Response to CR 2014-01-06 15:53:28 +00:00
Julia Hansbrough
68174dc33d Initial view 2014-01-06 15:53:28 +00:00
Julia Hansbrough
e3114a54b9 Migrations 2014-01-06 15:53:27 +00:00
Julia Hansbrough
cf5745ce59 Refactored tests 2014-01-06 15:53:27 +00:00
Julia Hansbrough
fa87793e9b Fixed UniversityRevenueShare model 2014-01-06 15:53:27 +00:00
Julia Hansbrough
1981ee5078 Fixed CertificateStatusReportModel 2014-01-06 15:53:27 +00:00
Julia Hansbrough
d3277c99b4 Initial PR for verified cert reporting
Refactored from code in Stanford's itemized revenue reports into a new Report class used for all revenue-related reporting.

Models for all cert types complete; test coverage for half of cert types complete.

If this architecture is deemed solid, the next steps are to add a reasonable UI folks will use to select reports to download, allow them to restrict based on dates/universities, and of course complete test coverage.
2014-01-06 15:53:27 +00:00
Ned Batchelder
2157b4d8b7 Miscellaneous fixes to strings found during i18n work. 2014-01-03 17:50:16 -05:00
Julia Hansbrough
2f9380c296 response to cr 2013-12-10 18:51:45 +00:00
Julia Hansbrough
5b5fa7c202 response to cr 2013-12-10 18:45:34 +00:00
Julia Hansbrough
3b9cd02bea response to cr 2013-12-06 22:57:06 +00:00
Julia Hansbrough
83f42f5691 Response to CR 2013-12-05 19:14:45 +00:00
Julia Hansbrough
f880bcb652 Response to CR 2013-12-05 19:14:45 +00:00
Julia Hansbrough
cc187a3183 Added refund datetime info to Orders, OrderItems
Finance would like to have info about the date any given refund is requested.

This commit adds a refund_requested_time field to OrderItem and a refund_time to Order.

When a user *requests* a refund, the refund_requested_time field on OrderItem is updated; when a user actually *receives* their refund, the refund_time on Order is updated.

Note that only the refund_requested_teim field is actually used right now; later on, when we're able to actually automate the process of actually giving users refunds, we will start usings Order's refund_time field.
2013-12-05 19:10:27 +00:00
Julia Hansbrough
e8196d9761 Events for entering verified flow & buying 2013-12-05 19:10:27 +00:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Julia Hansbrough
30cd57f539 New migrations file 2013-11-27 15:16:25 +00:00
Julia Hansbrough
280e3c3856 Merge conflicts 2013-11-27 14:43:16 +00:00
vagrant
006b8f8298 Removed old migration 2013-11-27 14:38:59 +00:00
Jason Bau
f94565d699 Merge pull request #1685 from edx/jbau/shopping-cart/report
CSV Reporting of Shopping Cart Purchases, with tests
2013-11-26 11:45:59 -08:00
Julia Hansbrough
b822df4ee2 Added refund datetime info to Orders, OrderItems
Finance would like to have info about the date any given refund is requested.

This commit adds a refund_requested_time field to OrderItem and a refund_time to Order.

When a user *requests* a refund, the refund_requested_time field on OrderItem is updated; when a user actually *receives* their refund, the refund_time on Order is updated.

Note that only the refund_requested_teim field is actually used right now; later on, when we're able to actually automate the process of actually giving users refunds, we will start usings Order's refund_time field.
2013-11-25 21:57:46 +00:00
Julia Hansbrough
fe5e2b3527 Refunding CertificateItem now marks parent Order refunded as well 2013-11-25 18:55:58 +00:00
Julia Hansbrough
dac5d2ac0e Merge pull request #1634 from edx/flowerhack/feature/refactor-to-track-enrollment
Flowerhack/feature/refactor to track enrollment
2013-11-19 06:27:22 -08:00
Jason Bau
c8a98051dd CSV Reporting of Shopping Cart Purchases, with tests
squashing to one commit to make cherry-picking by feature possible
2013-11-18 14:45:41 -08:00
Julia Hansbrough
b075143d62 Small fix 2013-11-15 20:44:29 +00:00
Julia Hansbrough
f950ea106d response to CR 2013-11-15 15:38:21 +00:00
Julia Hansbrough
e73489ec31 Response to CR 2013-11-14 22:34:18 +00:00
Julia Hansbrough
8042332cda purchased_callback now uses the change_mode method 2013-11-08 20:33:52 +00:00
Julia Hansbrough
73af5d017e Changed create_enrollment to create_or_update_enrollment 2013-11-08 19:01:51 +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