Commit Graph

36 Commits

Author SHA1 Message Date
John Eskew
80d70f6ecb Run all touched files through isort. 2017-11-09 09:25:19 -05:00
John Eskew
6672f64188 Add commerce AppConfig and use to register signals. Move imports.
Add explicit 'lms.djangoapps' prefix to all commerce imports, as another
commerce Django app exists at openedx.core.djangoapps.commerce
2017-11-09 09:24:37 -05:00
Andy Armstrong
79acb5c5be Reorder LMS imports using isort 2017-06-11 21:48:06 -04:00
asadiqbal
2ee58ebe92 SOL-1868: Receipt page should show the "Go To Dashboard" button in case of non-verified courses 2016-08-05 19:16:07 +05:00
Jesse Zoldak
0e5fb68e3d Revert "asadiqbal08/SOL-1868 "Go To Dashboard" button should be visible on receipt page" 2016-08-05 09:13:43 -04:00
asadiqbal
839832b4f2 SOL-1868: Receipt page should show the "Go To Dashboard" button in case of non-verified courses 2016-08-04 20:08:41 +05:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
2016-07-27 13:55:14 +05:00
Ahsan Ulhaq
d31b7cbd68 Complete Order History area for students
ECOM-2361
2016-06-08 21:45:07 +05:00
Tasawer
f05d03802e Revert "Update Receipt page"
This reverts commit 8d2c27fd04.
2016-06-03 15:03:00 +05:00
Tasawer
8d2c27fd04 Update Receipt page
ECOM-4559
2016-06-03 15:01:53 +05:00
Matt Drayer
a9b7e4c63d mattdrayer/course-mode-bulk-sku: Add new CourseMode field
* mattdrayer: Add bulk checkout link to course views
* asadiqbal08: MAYN-225 replace the "Verify Now" button by the "Go to Dashboard" button in case of themed sites.
* mattdrayer: Add bulk_sku check in courseware.views
2016-05-11 10:57:24 -04:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
Tasawer
06a91979e1 Added checkout error page.
ECOM-2516
2015-11-05 07:26:13 +00:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
2015-07-17 17:42:03 -04:00
aamir-khan
d5dda6470e ECOM-1816: added the provider detail on the receipt page. 2015-07-16 18:25:03 +05:00
Renzo Lucioni
d4a5ad4818 Mark basket creation and order retrieval endpoints as v0
These endpoints are currently for internal use only, but should be versioned nonetheless; Drupal will begin using the basket creation endpoint soon. No functionality has been changed. XCOM-494.
2015-07-15 16:22:29 -04:00
Renzo Lucioni
609e6ca277 Mark basket creation and order retrieval endpoints as v0
These endpoints are currently for internal use only, but should be versioned nonetheless; Drupal will begin using the basket creation endpoint soon. No functionality has been changed. XCOM-494.
2015-07-13 16:27:58 -04:00
AlasdairSwan
51deec380e ECOM-1661 removed nav links for logged out states
Add context for navigation states
added find course to dashboard sidebar and included check for context that Will adds in PR
removed nav_course_search context due to design change so replaced with nav_hidden
Removed rwd_header.js and all references as no longer being used.

Wrapped Find Courses in dashboard sidebar in if statement
2015-07-13 15:33:00 -04:00
Renzo Lucioni
3db2b5ff88 Commerce baskets API supports cross-domain session and OAuth2 authentication
Required in order to support requests from Drupal and mobile clients. XCOM-493.
2015-07-10 15:42:49 -04:00
Renzo Lucioni
d330831871 Improve logging of ecommerce interactions
Adds standardized audit logging for checkout and enrollment change requests. XCOM-427.
2015-06-30 17:34:16 -04:00
Nickersoft
e184c78c0a XCOM-416: Embargo restrictions are now enforced during logistration 2015-06-23 14:17:43 -04:00
Renzo Lucioni
d61cee95a8 Merge pull request #8500 from edx/renzo/commerce-cleanup
Avoid POSTing unnecessary payment processor parameter
2015-06-12 11:09:59 -04:00
Renzo Lucioni
2db79556bd Avoid POSTing unnecessary payment processor parameter 2015-06-11 18:24:25 -04:00
jsa
e1dfdc0811 Receipt page now also handles Cybersource payment failures.
XCOM-398
2015-06-11 13:42:58 -04:00
Clinton Blackburn
dbfd77e661 Disabled CSRF Validation for checkout cancel page
CyberSource will POST to this view if the user cancels payment. CSRF validation cannot be enabled when this happens.

ECOM-1689
2015-06-03 17:14:21 -04:00
Clinton Blackburn
1a1fe56b29 Added Oscar-Compatible Receipt Page 2015-05-02 00:18:05 -04:00
jsa
efde11d552 Use ecommerce api v2.
XCOM-213 XCOM-214
2015-04-27 16:57:17 -04:00
Clinton Blackburn
0f84749d4f Added Payment Cancellation Page
This commit creates a new page intended only for use when the user cancels payment. The previous implementation relied on the CyberSource callback page, which is not useful for orders placed with the E-Commerce Service.
2015-04-21 16:43:15 -04:00
jsa
46b63164a0 Implement profile_image upload and remove endpoints
TNL-1537

Co-Authored-By: Andy Armstrong <andya@edx.org>
Co-Authored-By: cahrens <christina@edx.org>
2015-04-17 17:23:12 -04:00
Stephen Sanchez
c01602f094 Change implementation of improved logging based on new API. 2015-03-23 16:21:05 +00:00
Clinton Blackburn
306a267de7 Updated create_order endpoint to use E-Commerce API for order creation and enrollment
This functionality is activated by adding a SKU to a non-honor course mode. When the feature is activated, verified orders will be created by the E-Commerce Service instead of LMS. After payment, the E-Commerce Service will also create the enrollment.
2015-03-20 14:53:23 -04:00
Clinton Blackburn
2e2fb47d59 Bypassing E-Commerce API if user is enrolled in course
If a user is already enrolled in a course, the API is bypassed and a 409 status is returned.
2015-03-18 23:21:18 -04:00
Brian Wilson
243e2660b0 Merge release to master for 20150317 release. 2015-03-18 18:48:56 -04:00
Clinton Blackburn
783fb23fe2 Fixed CourseMode Filtering Bug
Commerce code has now been updated to exclude CourseMode objects with SKU set to empty string (in addition to null).
2015-03-18 11:14:36 -04:00
Clinton Blackburn
acb141a990 Corrected data sent to E-Commerce API
Data is now properly encoded as JSON.
2015-03-13 02:36:22 -04:00
Clinton Blackburn
eaa7a22058 Added commerce/purchase endpoint
This new endpoint is intended to replace enrollment API call used on the login+registration page. Instead of directly enrolling students, the view will contact the external e-commerce API (Oscar) to create a new order. Oscar will be responsible for completing the order and enrolling the student.

This behavior will only apply to course modes with associated SKUs. All other course mode enrollments will be processed directly by LMS.
2015-03-13 00:25:13 -04:00