From fdd045b108e42cd8659d16eae4bbe16a21ca027f Mon Sep 17 00:00:00 2001 From: Matt Drayer Date: Mon, 25 Apr 2016 17:09:11 -0400 Subject: [PATCH] mattdrayer: Add microsite settings overrides --- openedx/core/djangoapps/commerce/utils.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openedx/core/djangoapps/commerce/utils.py b/openedx/core/djangoapps/commerce/utils.py index 676793a5e1..929f186c95 100644 --- a/openedx/core/djangoapps/commerce/utils.py +++ b/openedx/core/djangoapps/commerce/utils.py @@ -3,6 +3,8 @@ from django.conf import settings from edx_rest_api_client.client import EdxRestApiClient from eventtracking import tracker +from openedx.core.djangoapps.theming import helpers + ECOMMERCE_DATE_FORMAT = "%Y-%m-%dT%H:%M:%SZ" @@ -23,14 +25,16 @@ def is_commerce_service_configured(): Return a Boolean indicating whether or not configuration is present to use the external commerce service. """ - return bool(settings.ECOMMERCE_API_URL and settings.ECOMMERCE_API_SIGNING_KEY) + ecommerce_api_url = helpers.get_value("ECOMMERCE_API_URL", settings.ECOMMERCE_API_URL) + ecommerce_api_signing_key = helpers.get_value("ECOMMERCE_API_SIGNING_KEY", settings.ECOMMERCE_API_SIGNING_KEY) + return bool(ecommerce_api_url and ecommerce_api_signing_key) def ecommerce_api_client(user): """ Returns an E-Commerce API client setup with authentication for the specified user. """ return EdxRestApiClient( - settings.ECOMMERCE_API_URL, - settings.ECOMMERCE_API_SIGNING_KEY, + helpers.get_value("ECOMMERCE_API_URL", settings.ECOMMERCE_API_URL), + helpers.get_value("ECOMMERCE_API_SIGNING_KEY", settings.ECOMMERCE_API_SIGNING_KEY), user.username, user.profile.name if hasattr(user, 'profile') else None, user.email,