Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENT-1052 Rename enterprise customer catalog uuid in queryparam to catalog

Browse Source
This commit is contained in:
zubair-arbi
2018-07-03 12:37:40 +05:00
parent 6a4924f9d4
commit 66937b2cdf
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/djangoapps/commerce/tests/test_utils.py
View File

@@ -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,

4
lms/djangoapps/commerce/utils.py
View File

@@ -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),

2
lms/djangoapps/verify_student/views.py
View File

@@ -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

2
requirements/edx/base.txt
View File

@@ -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

2
requirements/edx/development.txt
View File

@@ -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

2
requirements/edx/testing.txt
View File

@@ -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