diff --git a/lms/djangoapps/commerce/tests/test_utils.py b/lms/djangoapps/commerce/tests/test_utils.py index f052890010..ed9f9a3eaf 100644 --- a/lms/djangoapps/commerce/tests/test_utils.py +++ b/lms/djangoapps/commerce/tests/test_utils.py @@ -161,13 +161,13 @@ class EcommerceServiceTests(TestCase): """ Verify the checkout page URL is properly constructed and returned. """ url = EcommerceService().get_checkout_page_url( *skus, - enterprise_customer_catalog_uuid=enterprise_catalog_uuid + catalog=enterprise_catalog_uuid ) config = CommerceConfiguration.current() query = {'sku': skus} if enterprise_catalog_uuid: - query.update({'enterprise_customer_catalog_uuid': enterprise_catalog_uuid}) + query.update({'catalog': enterprise_catalog_uuid}) expected_url = '{root}{basket_url}?{skus}'.format( basket_url=config.basket_checkout_page, diff --git a/lms/djangoapps/commerce/utils.py b/lms/djangoapps/commerce/utils.py index 22074269de..57c1e4b7b5 100644 --- a/lms/djangoapps/commerce/utils.py +++ b/lms/djangoapps/commerce/utils.py @@ -111,10 +111,10 @@ class EcommerceService(object): http://localhost:8002/basket/add/?sku=5H3HG5&sku=57FHHD&bundle=3bdf1dd1-49be-4a15-9145-38901f578c5a """ program_uuid = kwargs.get('program_uuid') - enterprise_catalog_uuid = kwargs.get('enterprise_customer_catalog_uuid') + enterprise_catalog_uuid = kwargs.get('catalog') query_params = {'sku': skus} if enterprise_catalog_uuid: - query_params.update({'enterprise_customer_catalog_uuid': enterprise_catalog_uuid}) + query_params.update({'catalog': enterprise_catalog_uuid}) url = '{checkout_page_path}?{query_params}'.format( checkout_page_path=self.get_absolute_ecommerce_url(self.config.basket_checkout_page), diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py index 1490aa1740..c55dd919d1 100644 --- a/lms/djangoapps/verify_student/views.py +++ b/lms/djangoapps/verify_student/views.py @@ -520,7 +520,7 @@ class PayAndVerifyView(View): if ecommerce_service.is_enabled(user): url = ecommerce_service.get_checkout_page_url( sku, - enterprise_customer_catalog_uuid=self.request.GET.get('enterprise_customer_catalog_uuid') + catalog=self.request.GET.get('catalog') ) # Redirect if necessary, otherwise implicitly return None diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 84ce77768b..73f55bffb8 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -116,7 +116,7 @@ edx-django-oauth2-provider==1.2.5 edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-drf-extensions==1.5.2 -edx-enterprise==0.70.3 +edx-enterprise==0.70.4 edx-i18n-tools==0.4.5 edx-milestones==0.1.13 edx-oauth2-provider==1.2.2 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 417d3d80ab..f7b0851010 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -136,7 +136,7 @@ edx-django-oauth2-provider==1.2.5 edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-drf-extensions==1.5.2 -edx-enterprise==0.70.3 +edx-enterprise==0.70.4 edx-i18n-tools==0.4.5 edx-lint==0.5.5 edx-milestones==0.1.13 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 3a39550a39..d372cad6c5 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -131,7 +131,7 @@ edx-django-oauth2-provider==1.2.5 edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-drf-extensions==1.5.2 -edx-enterprise==0.70.3 +edx-enterprise==0.70.4 edx-i18n-tools==0.4.5 edx-lint==0.5.5 edx-milestones==0.1.13