Commit Graph

508 Commits

Author SHA1 Message Date
Adam Palay
cc48800d54 add logging for orders when 'purchase' is called on them multiple times ECOM-630 2014-11-10 12:40:38 -05:00
Chris Dodge
3d955523d1 allow for overrides on ENABLE_PAID_COURSE_REIGSTRATIONS via mircosites 2014-11-09 21:05:45 -05:00
Adam
893cb9c21a Merge pull request #5873 from edx/release
Release
2014-11-06 16:53:05 -05:00
Diana Huang
e932820ae1 Add a created field to OrderItem. 2014-11-06 11:29:31 -05:00
Adam Palay
31b200cdcb add logging for cybersource errors; fix minor unicode bug 2014-11-06 10:25:42 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
stephensanchez
61436ea195 Merge branch 'release' 2014-10-23 19:41:31 +00:00
Oleg Marshev
21056b950e Use DATE_TIME format for course start or end time in student dashboard. 2014-10-22 16:23:32 +03:00
Muhammad Shoaib
b0802aafc8 css fix of remove icon and Fixed a bug where the discount coupon applied ‘disappeared’
when changing the quantity between enrollment vs reg code cart types.
2014-10-22 09:12:32 -04:00
Chris Dodge
cb6f96603b only multi-seat emails is html 2014-10-22 00:37:46 -04:00
Chris Dodge
19ab2b93b4 Fix unicode problem and also make display links a bit shorter
wip

remove unused kwarg
2014-10-21 13:35:25 -04: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
Will Daly
2d50cad0a1 Update donation text in email and receipt page 2014-10-08 06:15:11 -04:00
Will Daly
f8365a2d3b Add donation end-point
Make donations configurable

Added donation button to dashboard

Generalize merchant defined data for payment processor
2014-10-07 14:22:55 -04:00
Will Daly
26bcfe5869 Create Donation order item
Add tax-deductible messaging to the confirmation email and receipt pages.
Update receipt page to make the course URL optional
2014-10-03 14:35:21 -04:00
Don Mitchell
dc9654283e Fix unit tests for generated
course ids.
2014-09-29 11:25:56 -04:00
Don Mitchell
4ca5012f3c Use split to test views 2014-09-29 11:25:55 -04:00
Chris Dodge
60de9ba20a be sure to constrain the select to the course_id that is being delete
wip
2014-09-22 21:46:11 -04:00
chrisndodge
7593ad3a01 Merge pull request #5050 from edx/muhhshoaib/Ex-74-registration-code-redemption
Ex-74 Registration Code redemption
2014-09-16 11:58:42 -04:00
chrisndodge
9d683ed171 Merge pull request #5245 from edx/asadiqbal08/Fix_production_issue
EX-81 / Ex-84 changes
2014-09-16 11:17:40 -04:00
asadiqbal08
47cd0f3e62 EX-81 / Ex-84 changes 2014-09-16 18:43:48 +05:00
Muhammad Shoaib
739d2f0906 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
2014-09-16 07:48:21 +00:00
chrisndodge
0bb4ddef32 Merge pull request #5209 from edx/cdodge/allow-to-pass-override-cancel-URL
pass along an extra parameter to CyberSource to sepcify a callback URL i...
2014-09-15 09:34:29 -04:00
Chris Dodge
68cdf3a59d pass along an extra parameter to CyberSource to sepcify a callback URL if the user clicks cancel
typo
2014-09-11 15:38:28 -04:00
Will Daly
a9389747df Merge pull request #5155 from edx/will/fix-cybersource-unicode-error
Fix a unicode error in CyberSource2
2014-09-10 11:17:53 -04:00
Will Daly
5759a3fd29 Fix a unicode error in CyberSource2 2014-09-10 11:07:01 -04:00
Will Daly
b6474304db Merge pull request #5122 from edx/will/ecom-218
Change shopping cart status once sent to Cybersource (ECOM-218)
2014-09-10 11:03:28 -04:00
Will Daly
2388e7b8cb Fix a unicode error in CyberSource2 2014-09-10 10:47:38 -04:00
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -04:00
Will Daly
a9c73d2490 Set order status to "paying" before redirecting to the external payment processor. 2014-09-08 10:51:51 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic
Updating EX-60 logic
2014-09-02 13:03:24 -04:00
Jason Bau
63cfcd3de4 change PaidCourseRegistration.contained_in_order
now handles cases where the order has both a PaidCourseRegistration
and a CertificateItem
2014-08-28 11:27:07 -07:00
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx.
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
2014-08-25 15:33:43 +00: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
Diana Huang
9aa095dd21 Adapt flow for new 'professional' mode.
ECOM-41
2014-08-12 18:44:46 +00:00
asadiqbal08
33bdf935f0 Retrieving active coupon codes from model 2014-08-05 10:01:31 -04:00
asadiqbal08
dc46170f36 registration code checkout flow
Redirecting to dashboard after free user enrollment.
2014-08-05 10:00:12 -04:00
Muhammad Shoaib
878eaa9f77 added django admin pages for Coupon Table
added the suggested changes by cdonge
2014-08-05 10:00:12 -04:00
Muhammad Shoaib
08ff030521 updated the course registration models 2014-08-05 10:00:11 -04:00
Sarina Canelake
91196573e6 Fix small i18n typos 2014-07-22 09:38:32 -04:00
Chris Dodge
4928fad415 add ability to inspect a cart for the existence of a particular type of item, e.g. PaidCourseRegistration. Only show the 'Shopping Cart' button if there's a PaidCourseRegistration in it. 2014-07-17 00:43:00 -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
Julia Hansbrough
d9dd45662e Enables LMS to handle deprecated URLs
LMS-2651
2014-07-09 21:51:37 +00:00
Sarina Canelake
2aea261d48 Merge branch 'release'
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
2014-06-10 16:59:23 -04:00
Don Mitchell
2c6437a279 Fix performance regression
Remove course_from_id
don't fetch whole course when the root will do
don't fetch even the root if the id will do
check for definition.data == null
2014-06-09 15:10:47 -04:00
Jay Zoldak
ac17e809ee Fix some translation tags 2014-06-03 15:50:11 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library
[LMS-2757]
2014-05-29 17:03:35 -04:00
Calen Pennington
94c8d86a42 Fix failing tests from merge with master 2014-05-12 11:34:39 -04:00
Calen Pennington
c72b0bb293 Resolve merge conflicts relative to master 2014-05-09 15:31:20 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
2014-05-09 15:29:32 -04:00