Commit Graph

372 Commits

Author SHA1 Message Date
Giulio Gratta
560ce55896 Add cosmetic price field to studio & logic
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
2015-02-03 09:40:00 -08:00
Ben Patterson
b71c20c031 Revert "Add Cosmetic Display Price field to studio & logic to show it" 2015-02-03 09:41:54 -05:00
Giulio Gratta
c18ee8cc09 Add cosmetic price field to studio & logic
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
2015-01-27 15:15:43 -08:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
jsa
0049c97d8f use bulk_ops on course_about 2015-01-15 10:37:25 -05:00
Andy Armstrong
561c57dbe9 Extend preview to support cohorted courseware
TNL-651
2015-01-15 10:33:44 -05:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release
Release
2014-12-19 13:23:22 -05:00
Chris Dodge
483cccb657 also apply sorting rules overrides to the /courses view 2014-12-15 14:11:58 -05:00
Muhammad Shoaib
914ecac9ac added the course price in the course about page 2014-12-15 12:53:37 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides
[PLAT-217]
2014-12-13 08:26:28 -05:00
Andy Armstrong
4d75c18098 Fix Mako templates to use latest request context
Fixed the edX middleware to lazily create request
context for Mako templates, so that it is based on
any changes made to the request object.

Verified that with this fix the "Instructor" tab is
correctly hidden when a staff member is viewing
the course as a student.
2014-12-09 23:38:31 -05:00
Renzo Lucioni
1d1baa5009 Improved support for multiple organization names
Updates copy used in the checkbox label, constructs strings within the view instead of passing through a separate context variable, and alleviates unipain
2014-12-08 14:10:09 -05:00
Renzo Lucioni
f5767a961c Prep marketing iframe and relevant courseware view for email opt-in
Feature flagged. Puts a checkbox in the iframe. The iframe uses an organization_full_name parameter forwarded from Drupal by the courseware views and POSTs an email_opt_in parameter to the student views, preserving it on 403.
2014-12-01 10:30:16 -05:00
Akiva Leffert
b009e4a5ca Merge pull request #5979 from edx/aleffert/sync-course-status
Add an endpoint for syncing a user's course status metadata
2014-11-25 10:15:51 -05:00
stv
dff5772cda Fix PEP8: E121 continuation line indentation
is not a multiple of four
2014-11-24 20:44:43 -05:00
Akiva Leffert
f4dc90b348 Add an endpoint for syncing a user's course status metadata
JIRA: MA-75
2014-11-24 17:55:51 -05:00
David Ormsbee
43d8c7a712 Merge branch 'release'
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
2014-11-13 10:11:12 -05:00
Chris Dodge
a93faad78b try importing the exact references we need rather than deferencing it from the djangoapp module 2014-11-11 21:49:13 -05:00
zubair-arbi
b7d526b907 avoid annonymous user from redirecting to survey form
WL-150
2014-11-11 14:22:26 +05:00
Chris Dodge
58b4982d2d harden down access to the shoppingcart if the ENABLE_PAID_COURSE_REGISTRATION flag is not set (either via the main Django configuration settings) or through microsite overrides 2014-11-10 15:09:48 -05:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
Chris Dodge
3c36f7cbad Add new course_module field which describes what the catalog visibility should be (both, about, none) 2014-11-09 10:36:00 -05:00
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -04:00
Usman Khalid
ca65b68636 Added commit_on_success_with_read_committed decorator to courseware.views.index.
TNL-367
2014-10-27 20:44:14 +05:00
asadiqbal08
4f7c494922 EX-71 New shopping Cart UI Single person purchase
Ex-74 Registration Code redemption

fix the translation issues

added a check if a user is already registered in a course. Changed the messages

added course depth=0 and removed pep8 violations

Ex-72-added additional billing information

Added a new CSV file in the instructor dashboard sales tab to download all the order sales separated from the invoice sales

fix path to image

updated the failed unit tests and add some minor tweaks in the Shoppingcart.scss

Ex-78 New UI In receipt page

EX-73 Purchasers can buy a course on behalf of a different student

WL-78 updated the receipt page UI.

Wl-72 updated Billing Information UI and removed the Order Address fields

WL-71 Remove Purchase Type Buttons from UI

WL-71 Updated minor UI issues and updated test cases

WL-78 updated the enrollment links in the receipt page

made changes in Order generated sales csv in Instructor Dashboard.
 The total_registration_codes and total_used_codes
  were not correctly stored in the csv file.

1) The total_registration_codes were not filtered with
 course_id.
2) The total_used_codes that a user had redeemed
 were not correctly included in the CSV.

added a fix in the courseware view to let the users visit the courseware if they have enrolled in the course by clicking on the enrollment link

rebase and resolved conflicts with master

WL-97 Bulk Registration Email Confirmation
Below is the commit summary.
- Make email text bold as per requirement.
- Improve email template quality and reorder points.
- Add text in billing details page : "if no additional billing details are populated the payment confirmation will be sent to the user making the purchase"
- Update text on receipt page "You have successfully purchase 3 course registration codes"

WL-100 fixed the bug on the edit/add coupon and set course price.
Ajax requests were duplicating in each callback. fixed this issue by creating the manual ajax request rather than the Lean Modal Ajax requests

allow for better White Label branding in shopping cart purchase emails

fix up typos and text

fix goof

fix

fix

incorporated model changes as suggested by Jason.

updated order sales csv

updated test cases for CourseRegCodeItem model and csv for the order generated sales

updated the migrations history

fixed the lms acceptance tests

Be sure to check for multiple types

address PR feedback

PR feedback

PR feedback

pep8 fix
2014-10-19 21:50:29 -04:00
John Eskew
18822bdb4e Wrap course info and dashboard in bulk ops wrapper to reduce Mongo calls. 2014-10-06 16:53:11 -04:00
Don Mitchell
0ed4ee32eb Use bulk operations on get_course_by_id and courseware 2014-10-06 16:53:10 -04:00
John Eskew
c4dc7376ad Add bulk_operations() wrapper around course progress view. 2014-10-06 16:53:10 -04:00
zubair-arbi
40f270c945 add couse key verification decorator in common for use in both studio and lms
PLAT-88
2014-09-29 13:26:43 +05:00
Stephen Sanchez
3fd3bd4e43 Crude solution to allowing new styles on White Label about pages. 2014-09-25 20:31:18 +00:00
Waheed Ahmed
3c8eacd440 Disabled student view if course is not yet released for students.
LMS-6617
2014-09-22 12:50:46 +05:00
Adam Palay
1b06edb6ff display banner on course info page if user is not enrolled (TNL-286)
write failing tests for info page banner
2014-09-18 11:35:18 -04:00
Adam Palay
e569e090c2 redirect users from about page to info page when there is a marketing site (TNL-286) 2014-09-18 11:35:17 -04:00
Waheed Ahmed
5fd1ade766 Fixed 404 on courseware when users last visited subsection becomes unpublished.
LMS-6492
2014-09-11 18:35:58 +05:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic
Updating EX-60 logic
2014-09-02 13:03:24 -04:00
Waheed Ahmed
2e88e33847 Refactor verify course id decorator and fixed tests. 2014-08-29 16:05:33 +05:00
Don Mitchell
24cdd7a481 Assume any non-xml modulestore is r/w
LMS-11235
2014-08-21 12:11:27 -04:00
Waheed Ahmed
e26efea26f Fixed 500 error on views with incomplete course id in url.
LMS-11217
2014-08-20 18:30:58 +05:00
Will Daly
88ebac4faf Use English for the marketing site buttons in an edx-controlled domain 2014-08-14 16:00:44 -04:00
Julia Hansbrough
b9a285f1e7 Merge pull request #4756 from edx/flowerhack/prof-ed-reg-button
Redirect to show_reqs for prof ed
2014-08-08 17:03:29 -04:00
Julia Hansbrough
91e90b3673 Update redirect and wording for prof ed
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
2014-08-08 21:02:16 +00:00
Nimisha Asthagiri
d2b59cb6e0 get_items API: have qualifiers be a separate parameter instead of assuming kwargs. 2014-08-08 12:38:42 -04:00
Usman Khalid
9599c31aa0 Catch InvalidKeyError in static_tab view.
LMS-11189
2014-08-07 15:41:07 +05:00
Jason Bau
e1fcac93c5 fix shib reg from course about page 2014-07-17 10:51:32 -04:00
Sarina Canelake
666f563ee6 Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional
Make text on register button on About page conditional.
2014-07-15 16:37:00 -04:00
David Adams
aa1b623904 Make text on register button on About page conditional.
Added a new advanced setting; invitation_only

 If invitation_only display "Enrollment in this course is by invitation only"
 Otherwise, if outside of enrollment period display "Enrollment is Closed"

 This issue is logged at LMS-2670

 Also fixed in this PR is issue LMS-2717; even though the Register button was greyed out,
 clicking it sent one to the registration page.
2014-07-15 12:51:12 -07:00
Calen Pennington
4ded4be700 Fix calls to get_module to not pass course ids as positions 2014-07-15 09:22:04 -04:00
Piotr Mitros
4eb234e79f Merge pull request #4174 from edx/pmitros/chromeless-xblocks
XBlocks can disable navigation chrome.

This allows for full-screen XBlocks (such as code IDEs), as well as allowing us to somewhat hackishly build top-level XBlocks. This is the first step on the path to non-hackish top-level XBlocks.
2014-06-23 11:56:05 -04:00
cahrens
73e7ced6f9 Introduce constants for studio_view, student_view, and author_view. 2014-06-20 11:41:23 -04:00