Commit Graph

635 Commits

Author SHA1 Message Date
Calen Pennington
2bb1aafaaf Merge pull request #6752 from cpennington/modulestore-test-case-cleanup
Clean up ModuleStoreTestCase
2015-02-04 15:57:01 -05:00
Sarina Canelake
6cdaad58de Merge pull request #6730 from OmarIthawi/edraak/unicode-fixes-log-username
(WIP) Unicode fixes for log messages with username and other unicode input
2015-02-04 11:31:57 -05:00
Calen Pennington
74af3ffa05 Remove unused import 2015-02-04 09:09:15 -05:00
Calen Pennington
b353ed2ea2 Better support specifying of modulestore configuration in test cases
The existing pattern of using `override_settings(MODULESTORE=...)` prevented
us from having more than one layer of subclassing in modulestore tests.

In a structure like:

    @override_settings(MODULESTORE=store_a)
    class BaseTestCase(ModuleStoreTestCase):
        def setUp(self):
            # use store

    @override_settings(MODULESTORE=store_b)
    class ChildTestCase(BaseTestCase):
        def setUp(self):
            # use store

In this case, the store actions performed in `BaseTestCase` on behalf of
`ChildTestCase` would still use `store_a`, even though the `ChildTestCase`
had specified to use `store_b`. This is because the `override_settings`
decorator would be the innermost wrapper around the `BaseTestCase.setUp` method,
no matter what `ChildTestCase` does.

To remedy this, we move the call to `override_settings` into the
`ModuleStoreTestCase.setUp` method, and use a cleanup to remove the override.
Subclasses can just defined the `MODULESTORE` class attribute to specify which
modulestore to use _for the entire `setUp` chain_.

[PLAT-419]
2015-02-04 09:09:14 -05:00
Calen Pennington
03a05fd9d4 Always call super(..).setUp() from setUp 2015-02-04 09:09:14 -05:00
Sarina Canelake
01064fcc79 Fix logging calls to use unicode, and lazy logging 2015-02-04 10:53:33 +02:00
Omar Al-Ithawi
4e733c6e1f Unicode fixes for log messages and other things 2015-02-04 09:55:44 +02:00
Awais Qureshi
22af2b75af ECOM-890: Update invoice data model.
ECOM-891: Allow tracking of invoice transactions.

Authors: Awais Qureshi and Aamir Khan
2015-02-03 13:27:40 -05:00
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
Renzo Lucioni
a8bed5ce98 Make logistration generally available if feature flag is active
Makes logistration available at /login and /register as well as /accounts/login/ and /accounts/register/. In addition:

- Adds support for redirect URLs in third party auth for combined login/registration page
- Adds support for external auth on the combined login/registration page
- Removes old login and registration acceptance tests
- Adds deprecation warnings to old login and register views
- Moves third party auth util to student_account
- Adds exception for microsites (theming)
2015-01-30 13:28:30 -05:00
stephensanchez
5788a74291 Fix ecommerce test for text changes. 2015-01-27 18:13:36 +00:00
Chris Dodge
74f6380e9e Change coupon CSV download to only include counts for coupons redeemed all the way through purchase
updated the failed unit test case and removed the unnessary import
2015-01-23 00:21:58 +05:00
Sarina Canelake
e70a5e265c Merge pull request #6082 from openfun/edx/translate-enrollment-emails
Render enrollment emails in the student's language
2015-01-21 16:40:51 -05:00
Brandon DeRosier
24862edf1c Add gitlogs link to instructor dashboard 2015-01-20 18:55:42 -05:00
Régis Behmo
f3419bb5bb Render enrollment emails in the student's language
Enrollment, unenrollment and beta role emails should be rendered in the
student's language, and not the instructor's language.
2015-01-20 18:04:35 +01:00
Awais
b12d007138 ECOM-924 Adding redeem code url in attached email file 2015-01-20 19:20:51 +05:00
jsa
17d892c521 make block.get_parent() work.
Co-Authored-By: Christina Roberts <christina@edx.org>
Co-Authored-By: Daniel Friedman <dfriedman@edx.org>
Co-Authored-By: Don Mitchell <dmitchell@edx.org>
2015-01-15 10:33:44 -05:00
Afzal Wali
a8ebf6da7f Added the reportlab requirement to base.txt
Added receipts_pdf.py

Used Paragraph for displaying a large body of text.

added the table

Line breaks in the para text. font size adjusted.

Improved the main table (alignments) and totals (converted to a table as well)

Converted the footer into a table, and allowed for pagination.

Added pagination to item data table.

Handled wrapping of long descriptions into multiple lines.

email attachment for both invoice and receipt

added the currency from the settings

Removed magic numeric literals and added meaningful variables.

Added initial set of substitutions from configuration

add defining logo paths via configuration

Removed font dependencies. Will use the system default fonts which appear good enough to me.

Alignment adjustments as per suggestions.

Fixed the pep8 violations. Added comments to styling

added the decimal points to the price values

Cleanup. Docstrings.

i18n the text in the pdf file

fix pep8/pylint issues

Changed the amounts from string to float.

Overrode the 'pdf_receipt_display_name' property in the OrderItem subclass Donation.

used the PaidCourseRegistration instead of the parent OrderItem to avoid course_id related exceptions.

quality fixes

added  the test cases for the pdf

made the changes in the pdf suggested by griff

updated the pdf tests to assert the pdf content

used the pdfminor library

fix quality issues

made the changes suggested by Will

added the text file that says "pdf file not available. please contact support"
 in case pdf fails to attach in the email
2015-01-15 12:24:30 +05:00
stephensanchez
b188430679 Enable redeem codes.
Update the redeem code schema

Updating the redeem code schema.

Adding migration file.

Adding course mode support when redeeming a code.

Conflicts:
	lms/djangoapps/shoppingcart/views.py

Add sales admin privileges for redeem code generation.

Making sure redeem code URLs work for verified courses.

pep8 violations

Code Review and Test Cleanup changes

Added tests, fixed tests.

Updating the boolean checks in ecommerce template
2015-01-13 15:21:24 +00:00
Muhammad Shoaib
10f8d8c097 WL-135 added the migration for the expiration_date field in the coupons model
added the functionality of adding the expiration date, and also handled in the shopping cart when the user try to add the expired coupon code in the shopping cart

added expiration date in the coupons list in the ecommerce page

added the unit tests and jasmine tests

fix the quality issues and rebased with master

regenerated the migration file with a different number

i18n and verified te course mode

changes suggested by  stephan
2015-01-09 19:14:48 +08:00
Christine Lytwynec
3127ac2b6c mock html_to_text for tests 2015-01-05 16:19:36 -05:00
Muhammad Shoaib
5a437b396e WL-168 When redeeming a Registration Code in the shopping cart, the user should be redirect to the Registration Code Redemption page
improvements suggested by william
2014-12-31 17:45:31 +05:00
Chris Dodge
6198b90051 only display the count for coupon redemptions that actually went through to purchase completion 2014-12-22 10:38:34 -05:00
Sarina Canelake
ccb5bfbc9a Merge pull request #6244 from wwj718/patch-1
variable name error
2014-12-19 17:41:00 -05:00
Adam
526bc9637b Merge pull request #6231 from edx/adam/fix-unenroll-enroll-inst-dash
fix enrollment issue in instructor dash (ECOM-776)
2014-12-19 11:53:53 -05:00
Don Mitchell
4360a78142 Studio render XBlockAside views
PLAT-280
2014-12-17 15:44:49 -05:00
Don Mitchell
de5e88561f Make XmlModuleStore handle asides
PLAT-221
2014-12-17 13:51:10 -05:00
wwj718
3caf14e3de variable name error
The variable name --- `dist` error
`dist` = {}  will cover `dist = grades.answer_distributions(course.id)`
2014-12-15 10:46:03 +08:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides
[PLAT-217]
2014-12-13 08:26:28 -05:00
Calen Pennington
980f30c17f Move lms.lib.xblock into lms.djangoapps.lms_xblock in preparation add database backed configuration to it 2014-12-12 21:45:21 -05:00
Adam Palay
c1dd64c07a fix enrollment issue in instructor dash (ECOM-776) 2014-12-12 12:14:17 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
Daniel Friedman
3d91f43030 Support cohorting students via a CSV File.
TNL-735
2014-12-10 09:23:04 -05:00
Sarina Canelake
a1c8f8c468 Style cleanups: legacy instructor dashboard 2014-12-09 13:57:21 -05:00
Sarina Canelake
bfa8349ec4 Clean up Datadump section on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
5aeb412bbe Remove deprecated cohorts management on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
762b0d9b6b Clean up Manage Groups section on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
e3179c37cd Clean up Email section of legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
d4a06794d0 Clean up Forum Admin section of legacy dashboard 2014-12-09 13:57:19 -05:00
Sarina Canelake
5d7f820d93 Clean up Admin section of legacy dashboard 2014-12-09 13:57:19 -05:00
Sarina Canelake
d8904d9091 Clean up Grade Downloads section of legacy dash 2014-12-09 13:57:19 -05:00
Sarina Canelake
a15110f01c Remove Grade Adjustment code from legacy dash 2014-12-09 13:57:19 -05:00
Sarina Canelake
0a5af2a385 Rename legacy dash template 2014-12-09 13:57:19 -05:00
Andy Armstrong
2b0f959bd7 Merge pull request #5942 from edx/cohorted-courseware
Cohorted courseware
2014-12-08 14:38:30 -05:00
Jason Zhu
7391f359dd Support unicode ANALYTICS_DASHBOARD_NAME
I open this pull to support unicode ANALYTICS_DASHBOARD_NAME
2014-12-08 23:10:27 +08:00
Will Daly
8580620b52 Revert "If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page."
This reverts commit f40447b3c8.

Conflicts:
	lms/urls.py

Revert "Add support for external auth on the combined login/registration page"

This reverts commit 988753395f.

Conflicts:
	lms/templates/courseware/mktg_course_about.html
	lms/urls.py
2014-12-05 10:41:42 -05:00
Andy Armstrong
356b2335e9 Add base support for cohorted group configurations
TNL-649
2014-12-05 09:52:26 -05:00
chrisndodge
f7f9bec6ea Merge pull request #5774 from edx/cdodge/shopping-cart-touchups
Cdodge/shopping cart touchups
2014-12-04 14:02:19 -05:00
Will Daly
988753395f Add support for external auth on the combined login/registration page
Add support for redirect URLs in third party auth for combined login/registration page

Remove old login/registration acceptance tests

Add deprecation warnings to old login and register views

Move third party auth util to student_account

Add exception for microsites
2014-12-04 09:34:51 -05:00
Muhammad Shoaib
cd30164b5f Improvements and bug fixes for shopping cart: WL-117, WL-114, WL-116, WL-115, WK-122 2014-12-04 01:11:49 -05:00