From 3eb5783f5130234ad13e6c2c6660a8d353967f9c Mon Sep 17 00:00:00 2001 From: Nimisha Asthagiri Date: Wed, 29 May 2019 02:09:34 -0400 Subject: [PATCH] Remove microsites from shoppingcart DEPR-27 --- lms/djangoapps/shoppingcart/api.py | 3 -- .../shoppingcart/processors/helpers.py | 8 ----- .../shoppingcart/tests/test_views.py | 34 +++---------------- 3 files changed, 4 insertions(+), 41 deletions(-) diff --git a/lms/djangoapps/shoppingcart/api.py b/lms/djangoapps/shoppingcart/api.py index f466bd615997..665e9164072f 100644 --- a/lms/djangoapps/shoppingcart/api.py +++ b/lms/djangoapps/shoppingcart/api.py @@ -23,9 +23,6 @@ def order_history(user, **kwargs): for order_item in purchased_order_items: # Avoid repeated entries for the same order id. if order_item.order.id not in [item['order_id'] for item in order_history_list]: - # If we are in a Microsite, then include the orders having courses attributed (by ORG) to that Microsite. - # Conversely, if we are not in a Microsite, then include the orders having courses - # not attributed (by ORG) to any Microsite. order_item_course_id = getattr(order_item, 'course_id', None) if order_item_course_id: if (course_org_filter and order_item_course_id.org in course_org_filter) or \ diff --git a/lms/djangoapps/shoppingcart/processors/helpers.py b/lms/djangoapps/shoppingcart/processors/helpers.py index d0dbc87e77fb..aeb2ce1f53f0 100644 --- a/lms/djangoapps/shoppingcart/processors/helpers.py +++ b/lms/djangoapps/shoppingcart/processors/helpers.py @@ -23,12 +23,4 @@ def get_processor_config(): config = settings.CC_PROCESSOR.get( settings.CC_PROCESSOR_NAME, {} ) - - # Check whether configuration override exists, - # If so, find the configuration-specific cybersource config in the configurations. - # sub-key of the normal processor configuration. - config_key = configuration_helpers.get_value('cybersource_config_key') - if config_key: - config = config['microsites'][config_key] - return config diff --git a/lms/djangoapps/shoppingcart/tests/test_views.py b/lms/djangoapps/shoppingcart/tests/test_views.py index bb65a0da86c2..0a5cd7bf99f7 100644 --- a/lms/djangoapps/shoppingcart/tests/test_views.py +++ b/lms/djangoapps/shoppingcart/tests/test_views.py @@ -1449,9 +1449,9 @@ def test_upgrade_postpay_callback_emits_ga_event(self): } ) - def test_shopping_cart_navigation_link_not_in_microsite(self): + def test_shopping_cart_navigation_link(self): """ - Tests shopping cart link is available in navigation header if request is not from a microsite. + Tests shopping cart link is available in navigation header. """ CourseEnrollment.enroll(self.user, self.course_key) self.add_course_to_user_cart(self.testing_course.id) @@ -1459,9 +1459,9 @@ def test_shopping_cart_navigation_link_not_in_microsite(self): self.assertEqual(resp.status_code, 200) self.assertIn('