diff --git a/ecommerce/hubspot_api.py b/ecommerce/hubspot_api.py
new file mode 100644
index 000000000..41a223d13
--- /dev/null
+++ b/ecommerce/hubspot_api.py
@@ -0,0 +1,135 @@
+"""
+Hubspot Ecommerce Bridge API sync utilities
+
+https://developers.hubspot.com/docs/methods/ecomm-bridge/ecomm-bridge-overview
+"""
+import time
+from urllib.parse import urljoin, urlencode
+import requests
+from django.conf import settings
+
+
+HUBSPOT_API_BASE_URL = "https://api.hubapi.com"
+
+
+def send_hubspot_request(
+ endpoint, api_url, method, body=None, query_params=None, **kwargs
+):
+ """
+ Send a request to Hubspot using the given params, body and api key specified in settings
+
+ Args:
+ endpoint (String): Specific endpoint to hit. Can be the empty string
+ api_url (String): The url path to append endpoint to
+ method (String): GET, POST, or PUT
+ body (serializable data): Data to be JSON serialized and sent with a PUT or POST request
+ query_params (Dict): Params to be added to the query string
+ kwargs: keyword arguments to add to the request method
+ Returns:
+ HTML response to the constructed url
+ """
+
+ base_url = urljoin(f"{HUBSPOT_API_BASE_URL}/", api_url)
+ if endpoint:
+ base_url = urljoin(f"{base_url}/", endpoint)
+ if query_params is None:
+ query_params = {}
+ if "hapikey" not in query_params:
+ query_params["hapikey"] = settings.HUBSPOT_API_KEY
+ params = urlencode(query_params)
+ url = f"{base_url}?{params}"
+ if method == "GET":
+ return requests.get(url=url, **kwargs)
+ if method == "PUT":
+ return requests.put(url=url, json=body, **kwargs)
+ if method == "POST":
+ return requests.post(url=url, json=body, **kwargs)
+
+
+def make_sync_message(object_id, properties):
+ """
+ Create data for sync message
+ Args:
+ object_id (ObjectID): Internal ID to match with Hubspot object
+ properties (dict): dict of properties to be synced
+ Returns:
+ dict to be serialized as body in sync-message
+ """
+ for key in properties.keys():
+ if properties[key] is None:
+ properties[key] = ""
+ return {
+ "integratorObjectId": str(object_id),
+ "action": "UPSERT",
+ "changeOccurredTimestamp": int(time.time() * 1000),
+ "propertyNameToValues": dict(properties),
+ }
+
+
+def get_sync_errors(limit=200, offset=0):
+ """
+ Get errors that have occurred during sync
+ Args:
+ limit (Int): The number of errors to be returned
+ offset (Int): The index of the first error to be returned
+ Returns:
+ HTML response including error data
+ """
+ response = send_hubspot_request(
+ "sync-errors",
+ "/extensions/ecomm/v1",
+ "GET",
+ query_params={"limit": limit, "offset": offset},
+ )
+ response.raise_for_status()
+ return response
+
+
+def make_contact_sync_message(user_id):
+ """
+ Create the body of a sync message for a contact. This will flatten the contained LegalAddress and Profile
+ serialized data into one larger serializable dict
+ Args:
+ user_id (ObjectID): ID of user to sync contact with
+ Returns:
+ dict containing serializable sync-message data
+ """
+ from users.models import User
+ from users.serializers import UserSerializer
+
+ user = User.objects.get(id=user_id)
+ properties = UserSerializer(user).data
+ properties.update(properties.pop("legal_address") or {})
+ properties.update(properties.pop("profile") or {})
+ properties["street_address"] = "\n".join(properties.pop("street_address"))
+ return make_sync_message(user.id, properties)
+
+
+def make_deal_sync_message(order_id):
+ """
+ Create the body of a sync message for a deal.
+ Args:
+ Returns:
+ dict containing serializable sync-message data
+ """
+ return make_sync_message(order_id, {})
+
+
+def make_line_item_sync_message(line_id):
+ """
+ Create the body of a sync message for a line item.
+ Args:
+ Returns:
+ dict containing serializable sync-message data
+ """
+ return make_sync_message(line_id, {})
+
+
+def make_product_sync_message(product_id):
+ """
+ Create the body of a sync message for a product.
+ Args:
+ Returns:
+ dict containing serializable sync-message data
+ """
+ return make_sync_message(product_id, {})
diff --git a/ecommerce/hubspot_api_test.py b/ecommerce/hubspot_api_test.py
new file mode 100644
index 000000000..afa736094
--- /dev/null
+++ b/ecommerce/hubspot_api_test.py
@@ -0,0 +1,102 @@
+"""
+Hubspot API tests
+"""
+# pylint: disable=redefined-outer-name
+from urllib.parse import urlencode
+
+import pytest
+from faker import Faker
+from django.conf import settings
+
+from ecommerce.hubspot_api import (
+ send_hubspot_request,
+ HUBSPOT_API_BASE_URL,
+ make_sync_message,
+ make_contact_sync_message,
+)
+from users.serializers import UserSerializer
+
+fake = Faker()
+
+
+@pytest.mark.parametrize("request_method", ["GET", "PUT", "POST"])
+@pytest.mark.parametrize(
+ "endpoint,api_url,expected_url",
+ [
+ [
+ "sync-errors",
+ "/extensions/ecomm/v1",
+ f"{HUBSPOT_API_BASE_URL}/extensions/ecomm/v1/sync-errors",
+ ],
+ [
+ "",
+ "/extensions/ecomm/v1/installs",
+ f"{HUBSPOT_API_BASE_URL}/extensions/ecomm/v1/installs",
+ ],
+ [
+ "CONTACT",
+ "/extensions/ecomm/v1/sync-messages",
+ f"{HUBSPOT_API_BASE_URL}/extensions/ecomm/v1/sync-messages/CONTACT",
+ ],
+ ],
+)
+def test_send_hubspot_request(mocker, request_method, endpoint, api_url, expected_url):
+ """Test sending hubspot request with method = GET"""
+ value = fake.pyint()
+ query_params = {"param": value}
+
+ # Include hapikey when generating url to match request call against
+ full_query_params = {"param": value, "hapikey": settings.HUBSPOT_API_KEY}
+ mock_request = mocker.patch(
+ f"ecommerce.hubspot_api.requests.{request_method.lower()}"
+ )
+ url_params = urlencode(full_query_params)
+ url = f"{expected_url}?{url_params}"
+ if request_method == "GET":
+ send_hubspot_request(
+ endpoint, api_url, request_method, query_params=query_params
+ )
+ mock_request.assert_called_once_with(url=url)
+ else:
+ body = fake.pydict()
+ send_hubspot_request(
+ endpoint, api_url, request_method, query_params=query_params, body=body
+ )
+ mock_request.assert_called_once_with(url=url, json=body)
+
+
+def test_make_sync_message():
+ """Test make_sync_message produces a properly formatted sync-message"""
+ object_id = fake.pyint()
+ value = fake.word()
+ properties = {"prop": value, "blank": None}
+ sync_message = make_sync_message(object_id, properties)
+ time = sync_message["changeOccurredTimestamp"]
+ assert sync_message == (
+ {
+ "integratorObjectId": str(object_id),
+ "action": "UPSERT",
+ "changeOccurredTimestamp": time,
+ "propertyNameToValues": {"prop": value, "blank": ""},
+ }
+ )
+
+
+def test_make_contact_sync_message(user):
+ """Test make_contact_sync_message serializes a user and returns a properly formatted sync message"""
+ contact_sync_message = make_contact_sync_message(user.id)
+
+ serialized_user = UserSerializer(user).data
+ serialized_user.update(serialized_user.pop("legal_address") or {})
+ serialized_user.update(serialized_user.pop("profile") or {})
+ serialized_user["street_address"] = "\n".join(serialized_user.pop("street_address"))
+
+ time = contact_sync_message["changeOccurredTimestamp"]
+ assert contact_sync_message == (
+ {
+ "integratorObjectId": str(user.id),
+ "action": "UPSERT",
+ "changeOccurredTimestamp": time,
+ "propertyNameToValues": serialized_user,
+ }
+ )
diff --git a/ecommerce/management/commands/configure_hubspot_bridge.py b/ecommerce/management/commands/configure_hubspot_bridge.py
new file mode 100644
index 000000000..00464f687
--- /dev/null
+++ b/ecommerce/management/commands/configure_hubspot_bridge.py
@@ -0,0 +1,245 @@
+"""
+Management command to configure the Hubspot ecommerce bridge which handles syncing Contacts, Deals, Products,
+and Line Items
+"""
+import json
+from django.core.management import BaseCommand
+
+from ecommerce.hubspot_api import send_hubspot_request
+
+# Hubspot ecommerce settings define which hubspot properties are mapped with which
+# local properties when objects are synced.
+# See https://developers.hubspot.com/docs/methods/ecomm-bridge/ecomm-bridge-overview for more details
+HUBSPOT_ECOMMERCE_SETTINGS = {
+ "enabled": True,
+ "productSyncSettings": {
+ "properties": [
+ {
+ "propertyName": "created_on",
+ "targetHubspotProperty": "createdate",
+ "dataType": "DATETIME",
+ },
+ {
+ "propertyName": "title",
+ "targetHubspotProperty": "name",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "price",
+ "targetHubspotProperty": "price",
+ "dataType": "NUMBER",
+ },
+ {
+ "propertyName": "description",
+ "targetHubspotProperty": "description",
+ "dataType": "STRING",
+ },
+ ]
+ },
+ "contactSyncSettings": {
+ "properties": [
+ {
+ "propertyName": "email",
+ "targetHubspotProperty": "email",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "name",
+ "targetHubspotProperty": "name",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "first_name",
+ "targetHubspotProperty": "firstname",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "last_name",
+ "targetHubspotProperty": "lastname",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "street_address",
+ "targetHubspotProperty": "address",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "city",
+ "targetHubspotProperty": "city",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "country",
+ "targetHubspotProperty": "country",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "state_or_territory",
+ "targetHubspotProperty": "state",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "postal_code",
+ "targetHubspotProperty": "zip",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "birth_year",
+ "targetHubspotProperty": "birth_year",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "gender",
+ "targetHubspotProperty": "gender",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "company",
+ "targetHubspotProperty": "company",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "company_size",
+ "targetHubspotProperty": "company_size",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "industry",
+ "targetHubspotProperty": "industry",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "job_title",
+ "targetHubspotProperty": "jobtitle",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "job_function",
+ "targetHubspotProperty": "job_function",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "years_experience",
+ "targetHubspotProperty": "years_experience",
+ "dataType": "STRING",
+ },
+ {
+ "propertyName": "leadership_level",
+ "targetHubspotProperty": "leadership_level",
+ "dataType": "STRING",
+ },
+ ]
+ },
+ "dealSyncSettings": {
+ "properties": [
+ {
+ "propertyName": "status",
+ "targetHubspotProperty": "dealstage",
+ "dataType": "STRING",
+ }
+ ]
+ },
+ "lineItemSyncSettings": {"properties": []},
+}
+
+HUBSPOT_INSTALL_PATH = "/extensions/ecomm/v1/installs"
+HUBSPOT_SETTINGS_PATH = "/extensions/ecomm/v1/settings"
+
+
+def install_hubspot_ecommerce_bridge():
+ """Install the Hubspot ecommerce bridge for the api key specified in settings"""
+ response = send_hubspot_request("", HUBSPOT_INSTALL_PATH, "POST")
+ response.raise_for_status()
+ return response
+
+
+def uninstall_hubspot_ecommerce_bridge():
+ """Install the Hubspot ecommerce bridge for the api key specified in settings"""
+ response = send_hubspot_request("uninstall", HUBSPOT_INSTALL_PATH, "POST")
+ response.raise_for_status()
+ return response
+
+
+def get_hubspot_installation_status():
+ """Get the Hubspot ecommerce bridge installation status for the api key specified in settings"""
+ response = send_hubspot_request("status", HUBSPOT_INSTALL_PATH, "GET")
+ response.raise_for_status()
+ return response
+
+
+def configure_hubspot_settings():
+ """Configure the current Hubspot ecommerce bridge settings for the api key specified in settings"""
+ response = send_hubspot_request(
+ "", HUBSPOT_SETTINGS_PATH, "PUT", body=HUBSPOT_ECOMMERCE_SETTINGS
+ )
+ response.raise_for_status()
+ return response
+
+
+def get_hubspot_settings():
+ """Get the current Hubspot ecommerce bridge settings for the api key specified in settings"""
+ response = send_hubspot_request("", HUBSPOT_SETTINGS_PATH, "GET")
+ response.raise_for_status()
+ return response
+
+
+class Command(BaseCommand):
+ """
+ Command to configure the Hubspot ecommerce bridge which will handle syncing Hubspot Products, Deals, Line Items,
+ and Contacts with the MITxPro Products, Orders, and Users
+ """
+
+ help = (
+ "Install the Hubspot Ecommerce Bridge if it is not already installed and configure the settings based on "
+ "the given file. Make sure a HUBSPOT_API_KEY is set in settings and HUBSPOT_ECOMMERCE_SETTINGS are "
+ "configured in ecommerce/management/commands/configure_hubspot_bridge.py"
+ )
+
+ def add_arguments(self, parser):
+ """
+ Definition of arguments this command accepts
+ """
+ parser.add_argument(
+ "--uninstall", action="store_true", help="Uninstall the Ecommerce Bridge"
+ )
+
+ parser.add_argument(
+ "--status",
+ action="store_true",
+ help="Get the current status of the Ecommerce Bridge installation",
+ )
+
+ def handle(self, *args, **options):
+ print(
+ f"Checking Hubspot Ecommerce Bridge installation for given Hubspot API Key..."
+ )
+ installation_status = json.loads(get_hubspot_installation_status().text)
+ if options["status"]:
+ print(f"Install completed: {installation_status['installCompleted']}")
+ print(
+ f"Ecommerce Settings enabled: {installation_status['ecommSettingsEnabled']}"
+ )
+ if options["uninstall"]:
+ if installation_status["installCompleted"]:
+ print("Uninstalling Ecommerce Bridge...")
+ uninstall_hubspot_ecommerce_bridge()
+ print("Uninstall successful")
+ return
+ else:
+ print("Ecommerce Bridge is not installed")
+ return
+ if not installation_status["installCompleted"]:
+ print(f"Installation not found. Installing now...")
+ install_hubspot_ecommerce_bridge()
+ print("Install successful")
+ else:
+ print(f"Installation found")
+ if options["status"]:
+ print("Getting settings...")
+ ecommerce_bridge_settings = json.loads(get_hubspot_settings().text)
+ print("Found settings:")
+ print(ecommerce_bridge_settings)
+ else:
+ print(f"Configuring settings...")
+ configure_hubspot_settings()
+ print(f"Settings configured")
diff --git a/ecommerce/tasks.py b/ecommerce/tasks.py
new file mode 100644
index 000000000..9e784af28
--- /dev/null
+++ b/ecommerce/tasks.py
@@ -0,0 +1,46 @@
+"""
+Ecommerce tasks
+"""
+from ecommerce.hubspot_api import (
+ send_hubspot_request,
+ make_contact_sync_message,
+ make_product_sync_message,
+ make_deal_sync_message,
+ make_line_item_sync_message,
+)
+from mitxpro.celery import app
+
+
+HUBSPOT_SYNC_URL = "/extensions/ecomm/v1/sync-messages"
+
+
+@app.task
+def sync_contact_with_hubspot(user_id):
+ """Send a sync-message to sync a user with a hubspot contact"""
+ body = [make_contact_sync_message(user_id)]
+ response = send_hubspot_request("CONTACT", HUBSPOT_SYNC_URL, "PUT", body=body)
+ response.raise_for_status()
+
+
+@app.task
+def sync_product_with_hubspot(product_id):
+ """Send a sync-message to sync a product with a hubspot product"""
+ body = [make_product_sync_message(product_id)]
+ response = send_hubspot_request("PRODUCT", HUBSPOT_SYNC_URL, "PUT", body=body)
+ response.raise_for_status()
+
+
+@app.task
+def sync_deal_with_hubspot(order_id):
+ """Send a sync-message to sync an order with a hubspot deal"""
+ body = [make_deal_sync_message(order_id)]
+ response = send_hubspot_request("DEAL", HUBSPOT_SYNC_URL, "PUT", body=body)
+ response.raise_for_status()
+
+
+@app.task
+def sync_line_item_with_hubspot(line_id):
+ """Send a sync-message to sync a line with a hubspot line item"""
+ body = [make_line_item_sync_message(line_id)]
+ response = send_hubspot_request("LINE_ITEM", HUBSPOT_SYNC_URL, "PUT", body=body)
+ response.raise_for_status()
diff --git a/ecommerce/tasks_test.py b/ecommerce/tasks_test.py
new file mode 100644
index 000000000..ce45c9126
--- /dev/null
+++ b/ecommerce/tasks_test.py
@@ -0,0 +1,81 @@
+"""
+Tests for ecommerce tasks
+"""
+# pylint: disable=redefined-outer-name
+from unittest.mock import ANY
+
+import pytest
+
+from faker import Faker
+
+from ecommerce.factories import ProductFactory, OrderFactory, LineFactory
+from ecommerce.hubspot_api import (
+ make_contact_sync_message,
+ make_product_sync_message,
+ make_deal_sync_message,
+ make_line_item_sync_message,
+)
+from ecommerce.tasks import (
+ sync_contact_with_hubspot,
+ HUBSPOT_SYNC_URL,
+ sync_product_with_hubspot,
+ sync_deal_with_hubspot,
+ sync_line_item_with_hubspot,
+)
+from users.factories import UserFactory
+
+fake = Faker()
+
+
+@pytest.fixture
+def mock_hubspot_request(mocker):
+ """Mock the send hubspot request method"""
+ yield mocker.patch("ecommerce.tasks.send_hubspot_request")
+
+
+@pytest.mark.django_db
+def test_sync_contact_with_hubspot(mock_hubspot_request):
+ """Test that send_hubspot_request is called properly for a CONTACT sync"""
+ user = UserFactory.create()
+ sync_contact_with_hubspot(user.id)
+ body = [make_contact_sync_message(user.id)]
+ body[0]["changeOccurredTimestamp"] = ANY
+ mock_hubspot_request.assert_called_once_with(
+ "CONTACT", HUBSPOT_SYNC_URL, "PUT", body=body
+ )
+
+
+@pytest.mark.django_db
+def test_sync_product_with_hubspot(mock_hubspot_request):
+ """Test that send_hubspot_request is called properly for a PRODUCT sync"""
+ product = ProductFactory.create()
+ sync_product_with_hubspot(product.id)
+ body = [make_product_sync_message(product.id)]
+ body[0]["changeOccurredTimestamp"] = ANY
+ mock_hubspot_request.assert_called_once_with(
+ "PRODUCT", HUBSPOT_SYNC_URL, "PUT", body=body
+ )
+
+
+@pytest.mark.django_db
+def test_sync_deal_with_hubspot(mock_hubspot_request):
+ """Test that send_hubspot_request is called properly for a DEAL sync"""
+ order = OrderFactory.create()
+ sync_deal_with_hubspot(order.id)
+ body = [make_deal_sync_message(order.id)]
+ body[0]["changeOccurredTimestamp"] = ANY
+ mock_hubspot_request.assert_called_once_with(
+ "DEAL", HUBSPOT_SYNC_URL, "PUT", body=body
+ )
+
+
+@pytest.mark.django_db
+def test_sync_line_item_with_hubspot(mock_hubspot_request):
+ """Test that send_hubspot_request is called properly for a LINE_ITEM sync"""
+ line = LineFactory.create()
+ sync_line_item_with_hubspot(line.id)
+ body = [make_line_item_sync_message(line.id)]
+ body[0]["changeOccurredTimestamp"] = ANY
+ mock_hubspot_request.assert_called_once_with(
+ "LINE_ITEM", HUBSPOT_SYNC_URL, "PUT", body=body
+ )
diff --git a/fixtures/common.py b/fixtures/common.py
index 7776f6fc1..092ac58d9 100644
--- a/fixtures/common.py
+++ b/fixtures/common.py
@@ -2,6 +2,7 @@
# pylint: disable=unused-argument, redefined-outer-name
import pytest
+import responses
from django.test.client import Client
from rest_framework.test import APIClient
@@ -32,7 +33,14 @@ def user_drf_client(user):
@pytest.fixture
def admin_drf_client(admin_user):
- """ DRF API test client with admin user """
+ """DRF API test client with admin user """
client = APIClient()
client.force_authenticate(user=admin_user)
return client
+
+
+@pytest.fixture
+def mocked_responses():
+ """Mocked responses for requests library"""
+ with responses.RequestsMock() as rsps:
+ yield rsps
diff --git a/fixtures/cybersource.py b/fixtures/cybersource.py
new file mode 100644
index 000000000..f0daae5c1
--- /dev/null
+++ b/fixtures/cybersource.py
@@ -0,0 +1,35 @@
+"""Fxitures for CyberSource tests"""
+# pylint: disable=redefined-outer-name
+
+from nacl.public import PrivateKey
+import pytest
+
+from compliance.test_utils import (
+ get_cybersource_test_settings,
+ mock_cybersource_wsdl,
+ mock_cybersource_wsdl_operation,
+)
+
+
+@pytest.fixture
+def cybersource_private_key():
+ """Creates a new NaCl private key"""
+ return PrivateKey.generate()
+
+
+@pytest.fixture
+def cybersource_settings(settings, cybersource_private_key):
+ """Configured CyberSource settings"""
+ for attr_name, value in get_cybersource_test_settings(
+ cybersource_private_key
+ ).items():
+ setattr(settings, attr_name, value)
+ return settings
+
+
+@pytest.fixture(params=[])
+def cybersource_mock_client_responses(request, mocked_responses, cybersource_settings):
+ """Mock out the components of a valid WSDL API"""
+ mock_cybersource_wsdl(mocked_responses, cybersource_settings)
+ mock_cybersource_wsdl_operation(mocked_responses, request.param)
+ return mocked_responses
diff --git a/mitxpro/settings.py b/mitxpro/settings.py
index 7ad959abc..41255f72b 100644
--- a/mitxpro/settings.py
+++ b/mitxpro/settings.py
@@ -11,7 +11,7 @@
from mitxpro.envs import get_any, get_bool, get_int, get_string
-VERSION = "0.5.0"
+VERSION = "0.5.1"
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -83,6 +83,7 @@
"mail",
"users",
"cms",
+ "compliance",
"courseware",
# must be after "users" to pick up custom user model
"compat",
@@ -242,10 +243,14 @@
"authentication.pipeline.user.get_username",
# Create a user if one doesn't exist, and require a password and name
"authentication.pipeline.user.create_user_via_email",
+ # verify the user against export compliance
+ "authentication.pipeline.compliance.verify_exports_compliance",
# Create a profile
"authentication.pipeline.user.create_profile",
# Create the record that associates the social account with the user.
"social_core.pipeline.social_auth.associate_user",
+ # activate the user
+ "authentication.pipeline.user.activate_user",
# Populate the extra_data field in the social record with the values
# specified by settings (and the default ones like access_token, etc).
"social_core.pipeline.social_auth.load_extra_data",
@@ -289,14 +294,17 @@
EMAIL_HOST_USER = get_string("MITXPRO_EMAIL_USER", "")
EMAIL_HOST_PASSWORD = get_string("MITXPRO_EMAIL_PASSWORD", "")
EMAIL_USE_TLS = get_bool("MITXPRO_EMAIL_TLS", False)
-EMAIL_SUPPORT = get_string("MITXPRO_SUPPORT_EMAIL", "support@example.com")
+EMAIL_SUPPORT = get_string(
+ "MITXPRO_SUPPORT_EMAIL",
+ get_string("MAILGUN_RECIPIENT_OVERRIDE", "support@localhost"),
+)
DEFAULT_FROM_EMAIL = get_string("MITXPRO_FROM_EMAIL", "webmaster@localhost")
MAILGUN_SENDER_DOMAIN = get_string("MAILGUN_SENDER_DOMAIN", None)
MAILGUN_KEY = get_string("MAILGUN_KEY", None)
MAILGUN_BATCH_CHUNK_SIZE = get_int("MAILGUN_BATCH_CHUNK_SIZE", 1000)
MAILGUN_RECIPIENT_OVERRIDE = get_string("MAILGUN_RECIPIENT_OVERRIDE", None)
-MAILGUN_FROM_EMAIL = get_string("MAILGUN_FROM_EMAIL", "no-reply@example.com")
+MAILGUN_FROM_EMAIL = get_string("MAILGUN_FROM_EMAIL", "no-reply@localhost")
NOTIFICATION_EMAIL_BACKEND = get_string(
"MITXPRO_NOTIFICATION_EMAIL_BACKEND", "anymail.backends.mailgun.EmailBackend"
@@ -549,6 +557,21 @@ def get_all_config_keys():
)
CYBERSOURCE_PROFILE_ID = get_string("CYBERSOURCE_PROFILE_ID", None)
CYBERSOURCE_REFERENCE_PREFIX = get_string("CYBERSOURCE_REFERENCE_PREFIX", None)
+CYBERSOURCE_WSDL_URL = get_string("CYBERSOURCE_WSDL_URL", None)
+CYBERSOURCE_MERCHANT_ID = get_string("CYBERSOURCE_MERCHANT_ID", None)
+CYBERSOURCE_TRANSACTION_KEY = get_string("CYBERSOURCE_TRANSACTION_KEY", None)
+CYBERSOURCE_INQUIRY_LOG_NACL_ENCRYPTION_KEY = get_string(
+ "CYBERSOURCE_INQUIRY_LOG_NACL_ENCRYPTION_KEY", None
+)
+CYBERSOURCE_EXPORT_SERVICE_ADDRESS_OPERATOR = get_string(
+ "CYBERSOURCE_EXPORT_SERVICE_ADDRESS_OPERATOR", "AND"
+)
+CYBERSOURCE_EXPORT_SERVICE_ADDRESS_WEIGHT = get_string(
+ "CYBERSOURCE_EXPORT_SERVICE_ADDRESS_WEIGHT", "high"
+)
+CYBERSOURCE_EXPORT_SERVICE_NAME_WEIGHT = get_string(
+ "CYBERSOURCE_EXPORT_SERVICE_NAME_WEIGHT", "high"
+)
# Voucher keys for PDF parsing
VOUCHER_DOMESTIC_DATE_KEY = get_string("VOUCHER_DOMESTIC_DATE_KEY", None)
@@ -577,3 +600,5 @@ def get_all_config_keys():
VOUCHER_INTERNATIONAL_COURSE_NUMBER_KEY = get_string(
"VOUCHER_INTERNATIONAL_COURSE_NUMBER_KEY", None
)
+
+HUBSPOT_API_KEY = get_string("HUBSPOT_API_KEY", None)
diff --git a/mitxpro/templates/base.html b/mitxpro/templates/base.html
index 94c52b9fe..9125dc398 100644
--- a/mitxpro/templates/base.html
+++ b/mitxpro/templates/base.html
@@ -1,4 +1,6 @@
{% load static hijack_tags raven render_bundle %}
+{% load wagtailcore_tags render_notification %}
+
@@ -25,6 +27,7 @@
{% include "partials/gtm_body.html" %}
{% hijack_notification %}
+ {% latest_notification %}
{% block headercontent %}
{% endblock %}
{% block content %}
@@ -40,6 +43,7 @@
+
{% endblock %}
diff --git a/mitxpro/templates/partials/notifications.html b/mitxpro/templates/partials/notifications.html
new file mode 100644
index 000000000..87df3ab8c
--- /dev/null
+++ b/mitxpro/templates/partials/notifications.html
@@ -0,0 +1,8 @@
+
+ {% if notification %}
+
+
+ {{ notification|safe }}
+
+ {% endif %}
+
diff --git a/mitxpro/templatetags/render_notification.py b/mitxpro/templatetags/render_notification.py
new file mode 100644
index 000000000..0d69d4111
--- /dev/null
+++ b/mitxpro/templatetags/render_notification.py
@@ -0,0 +1,16 @@
+"""Templatetags for rendering site notification"""
+
+from django import template
+from cms.models import SiteNotification
+
+register = template.Library()
+
+
+@register.inclusion_tag("../templates/partials/notifications.html", takes_context=True)
+def latest_notification(context):
+ """ Return request context and latest notification."""
+
+ return {
+ "notification": SiteNotification.objects.order_by("-id").first(),
+ "request": context["request"],
+ }
diff --git a/mitxpro/views.py b/mitxpro/views.py
index cb7b3684d..90d2ff58d 100644
--- a/mitxpro/views.py
+++ b/mitxpro/views.py
@@ -27,6 +27,7 @@ def get_js_settings_context(request):
"release_version": settings.VERSION,
"recaptchaKey": settings.RECAPTCHA_SITE_KEY,
"sentry_dsn": sentry.get_public_dsn(),
+ "support_email": settings.EMAIL_SUPPORT,
}
return {"js_settings_json": json.dumps(js_settings)}
diff --git a/mitxpro/views_test.py b/mitxpro/views_test.py
index dfc0d4ccc..732a122a1 100644
--- a/mitxpro/views_test.py
+++ b/mitxpro/views_test.py
@@ -29,6 +29,7 @@ def test_webpack_url(mocker, settings, client):
settings.GA_TRACKING_ID = "fake"
settings.ENVIRONMENT = "test"
settings.VERSION = "4.5.6"
+ settings.EMAIL_SUPPORT = "support@text.com"
settings.USE_WEBPACK_DEV_SERVER = False
settings.RECAPTCHA_SITE_KEY = "fake_key"
get_bundle = mocker.patch("mitxpro.templatetags.render_bundle._get_bundle")
@@ -45,6 +46,7 @@ def test_webpack_url(mocker, settings, client):
"sentry_dsn": None,
"release_version": settings.VERSION,
"recaptchaKey": settings.RECAPTCHA_SITE_KEY,
+ "support_email": settings.EMAIL_SUPPORT,
}
diff --git a/pytest.ini b/pytest.ini
index cc348544f..3129cf494 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -19,3 +19,9 @@ env =
OPENEDX_API_BASE_URL=http://localhost:18000
OPENEDX_API_CLIENT_ID=fake_client_id
OPENEDX_API_CLIENT_SECRET=fake_client_secret
+ CYBERSOURCE_WSDL_URL=
+ CYBERSOURCE_MERCHANT_ID=
+ CYBERSOURCE_TRANSACTION_KEY=
+ CYBERSOURCE_INQUIRY_LOG_NACL_ENCRYPTION_KEY=
+ MITXPRO_EMAIL_BACKEND=django.core.mail.backends.locmem.EmailBackend
+ MITXPRO_NOTIFICATION_EMAIL_BACKEND=django.core.mail.backends.locmem.EmailBackend
diff --git a/requirements.in b/requirements.in
index 949d05f30..e95eecce6 100644
--- a/requirements.in
+++ b/requirements.in
@@ -21,6 +21,7 @@ pdftotext==2.1.1
Pillow
psycopg2==2.7.3.2
pycountry==18.12.8
+PyNaCl==1.3.0
raven
redis==3.2.1
requests
@@ -28,3 +29,4 @@ social-auth-app-django==3.1.0
ulid-py
uwsgi
wagtail==2.4
+zeep==3.3.1
diff --git a/requirements.txt b/requirements.txt
index 0513de4bc..bc3531ec0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,19 +2,23 @@
# This file is autogenerated by pip-compile
# To update, run:
#
-# pip-compile
+# pip-compile
#
amqp==2.4.2 # via kombu
+appdirs==1.4.3 # via zeep
+attrs==19.1.0 # via zeep
backcall==0.1.0 # via ipython
beautifulsoup4==4.6.0
billiard==3.5.0.5 # via celery
boto3==1.9.115
botocore==1.12.134 # via boto3, s3transfer
+cached-property==1.5.1 # via zeep
celery==4.2.0
certifi==2019.3.9 # via requests
+cffi==1.12.3 # via pynacl
chardet==3.0.4 # via requests
decorator==4.4.0 # via ipython, traitlets
-defusedxml==0.6.0 # via python3-openid, social-auth-core
+defusedxml==0.6.0 # via python3-openid, social-auth-core, zeep
dj-database-url==0.4.2
django-anymail[mailgun]==3.0
django-compat==1.0.15 # via django-hijack, django-hijack-admin
@@ -40,9 +44,11 @@ html5lib==0.999999999
idna==2.8 # via requests
ipython-genutils==0.2.0 # via traitlets
ipython==7.4.0
+isodate==0.6.0 # via zeep
jedi==0.13.3 # via ipython
jmespath==0.9.4 # via boto3, botocore
kombu==4.5.0 # via celery, django-server-status
+lxml==4.3.3 # via zeep
newrelic==4.18.0.118
oauthlib==3.0.1 # via django-oauth-toolkit, requests-oauthlib, social-auth-core
parso==0.4.0 # via jedi
@@ -54,17 +60,20 @@ prompt-toolkit==2.0.9 # via ipython
psycopg2==2.7.3.2
ptyprocess==0.6.0 # via pexpect
pycountry==18.12.8
+pycparser==2.19 # via cffi
pygments==2.3.1 # via ipython
pyjwt==1.7.1 # via social-auth-core
+pynacl==1.3.0
python-dateutil==2.5.3 # via botocore, edx-api-client
python3-openid==3.1.0 # via social-auth-core
-pytz==2019.1 # via celery, django, django-modelcluster, wagtail
+pytz==2019.1 # via celery, django, django-modelcluster, wagtail, zeep
raven==6.10.0
redis==3.2.1
requests-oauthlib==1.2.0 # via social-auth-core
+requests-toolbelt==0.9.1 # via zeep
requests==2.21.0
s3transfer==0.2.0 # via boto3
-six==1.12.0 # via django-anymail, django-compat, django-server-status, edx-api-client, html5lib, prompt-toolkit, python-dateutil, social-auth-app-django, social-auth-core, traitlets, wagtail
+six==1.12.0 # via django-anymail, django-compat, django-server-status, edx-api-client, html5lib, isodate, prompt-toolkit, pynacl, python-dateutil, social-auth-app-django, social-auth-core, traitlets, wagtail, zeep
social-auth-app-django==3.1.0
social-auth-core==3.1.0 # via social-auth-app-django
traitlets==4.3.2 # via ipython
@@ -77,3 +86,4 @@ wagtail==2.4
wcwidth==0.1.7 # via prompt-toolkit
webencodings==0.5.1 # via html5lib
willow==1.1 # via wagtail
+zeep==3.3.1
diff --git a/static/js/containers/pages/CheckoutPage.js b/static/js/containers/pages/CheckoutPage.js
index cbd3aceaf..37188a57b 100644
--- a/static/js/containers/pages/CheckoutPage.js
+++ b/static/js/containers/pages/CheckoutPage.js
@@ -1,9 +1,10 @@
// @flow
import React from "react"
-import * as R from "ramda"
+import { curry } from "ramda"
import { connect } from "react-redux"
-import { connectRequest, mutateAsync } from "redux-query"
+import { mutateAsync, requestAsync } from "redux-query"
import { compose } from "redux"
+import queryString from "query-string"
import queries from "../../lib/queries"
import {
@@ -12,9 +13,10 @@ import {
formatPrice,
formatRunTitle
} from "../../lib/ecommerce"
-import { createCyberSourceForm } from "../../lib/form"
+import { createCyberSourceForm, formatErrors } from "../../lib/form"
import type { Response } from "redux-query"
+import type { Location } from "react-router"
import type {
BasketResponse,
BasketPayload,
@@ -50,6 +52,8 @@ export const calcSelectedRunIds = (item: BasketItem): { [number]: number } => {
type Props = {
basket: ?BasketResponse,
checkout: () => Promise
>,
+ fetchBasket: () => Promise<*>,
+ location: Location,
updateBasket: (payload: BasketPayload) => Promise<*>
}
type State = {
@@ -64,12 +68,44 @@ export class CheckoutPage extends React.Component {
errors: null
}
+ componentDidMount = async () => {
+ const {
+ fetchBasket,
+ location: { search }
+ } = this.props
+ const params = queryString.parse(search)
+ const productId = parseInt(params.product)
+ if (!productId) {
+ await fetchBasket()
+ return
+ }
+
+ try {
+ await this.updateBasket({ items: [{ id: productId }] })
+
+ const couponCode = params.code
+ if (couponCode) {
+ await this.updateBasket({ coupons: [{ code: couponCode }] })
+ }
+ } catch (_) {
+ // prevent complaints about unresolved promises
+ }
+ }
+
handleErrors = async (responsePromise: Promise<*>) => {
const response = await responsePromise
if (response.body.errors) {
this.setState({ errors: response.body.errors })
throw new Error("Received error from request")
}
+
+ // clear state so the state from the basket is used
+ this.setState({
+ couponCode: null,
+ selectedRuns: null,
+ errors: null
+ })
+
return response
}
@@ -117,7 +153,7 @@ export class CheckoutPage extends React.Component {
})
}
- updateSelectedRun = R.curry((courseId: number, event: any) => {
+ updateSelectedRun = curry((courseId: number, event: any) => {
const { selectedRuns } = this.state
const runId = parseInt(event.target.value)
this.setState({
@@ -128,13 +164,34 @@ export class CheckoutPage extends React.Component {
})
})
- submitCoupon = async (e: Event) => {
- const { updateBasket } = this.props
+ getCouponCode = (): string => {
+ const { basket } = this.props
const { couponCode } = this.state
+ if (couponCode !== null) {
+ return couponCode
+ }
+ if (!basket) {
+ return ""
+ }
+
+ const item = basket.items[0]
+ if (!item) {
+ return ""
+ }
+
+ const coupon = basket.coupons.find(coupon =>
+ coupon.targets.includes(item.id)
+ )
+ return (coupon && coupon.code) || ""
+ }
+
+ submitCoupon = async (e: Event) => {
+ const couponCode = this.getCouponCode()
+
e.preventDefault()
- const response = await updateBasket({
+ await this.updateBasket({
coupons: couponCode
? [
{
@@ -143,8 +200,6 @@ export class CheckoutPage extends React.Component {
]
: []
})
- const errors = response.status !== 200 ? response.body.errors : null
- this.setState({ errors })
}
// $FlowFixMe
@@ -200,15 +255,16 @@ export class CheckoutPage extends React.Component {
render() {
const { basket } = this.props
- const { couponCode, errors } = this.state
+ const { errors } = this.state
- if (!basket) {
- return null
- }
-
- const item = basket.items[0]
- if (!item) {
- return No item in basket
+ const item = basket && basket.items[0]
+ if (!basket || !item) {
+ return (
+
+ No item in basket
+ {formatErrors(errors)}
+
+ )
}
const coupon = basket.coupons.find(coupon =>
@@ -244,11 +300,7 @@ export class CheckoutPage extends React.Component {
{
Apply
+ {% if courseware_object.thumbnail_image %}
+ {% image courseware_object.thumbnail_image fill-480x275 as course_image %}
+ 
+ 
{% endif%}
diff --git a/courses/templates/partials/learning-techniques.html b/courses/templates/partials/learning-techniques.html
index 285c6cc89..d8a9c6468 100644
--- a/courses/templates/partials/learning-techniques.html
+++ b/courses/templates/partials/learning-techniques.html
@@ -1,8 +1,8 @@
{% load wagtailimages_tags %}