From 0adea67662d4f1ef68d4551d1786fa337e271699 Mon Sep 17 00:00:00 2001
From: Zia Fazal <zia.fazal@arbisoft.com>
Date: Mon, 7 Sep 2015 12:23:45 +0500
Subject: [PATCH] hide shopping cart menu

Hide shopping cart menu only if request is coming from a micro site and
requested page is from courseware.
---
 .../shoppingcart/tests/test_views.py          | 29 +++++++++++++++++--
 lms/templates/navigation.html                 |  2 +-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/shoppingcart/tests/test_views.py b/lms/djangoapps/shoppingcart/tests/test_views.py
index 75793197fd..76b0b04e7b 100644
--- a/lms/djangoapps/shoppingcart/tests/test_views.py
+++ b/lms/djangoapps/shoppingcart/tests/test_views.py
@@ -1375,9 +1375,34 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin):
         self.assertEqual(resp.status_code, 200)
         self.assertIn('<a class="shopping-cart"', resp.content)
 
-    def test_shopping_cart_navigation_link_in_microsite(self):
+    def test_shopping_cart_navigation_link_not_in_microsite_and_not_on_courseware(self):
         """
-        Tests shopping cart link is not available in navigation header if request is from a microsite.
+        Tests shopping cart link is available in navigation header if request is not from a microsite
+        and requested page is not courseware too.
+        """
+        CourseEnrollment.enroll(self.user, self.course_key)
+        self.add_course_to_user_cart(self.testing_course.id)
+        resp = self.client.get(reverse('dashboard'))
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn('<a class="shopping-cart"', resp.content)
+
+    def test_shopping_cart_navigation_link_in_microsite_not_on_courseware(self):
+        """
+        Tests shopping cart link is available in navigation header if request is from a microsite but requested
+        page is not from courseware.
+        """
+        CourseEnrollment.enroll(self.user, self.course_key)
+        self.add_course_to_user_cart(self.testing_course.id)
+        with patch('microsite_configuration.microsite.is_request_in_microsite',
+                   Mock(return_value=True)):
+            resp = self.client.get(reverse('dashboard'))
+            self.assertEqual(resp.status_code, 200)
+            self.assertIn('<a class="shopping-cart"', resp.content)
+
+    def test_shopping_cart_navigation_link_in_microsite_courseware_page(self):
+        """
+        Tests shopping cart link is not available in navigation header if request is from a microsite
+        and requested page is from courseware.
         """
         CourseEnrollment.enroll(self.user, self.course_key)
         self.add_course_to_user_cart(self.testing_course.id)
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index 16ba583f66..48154a5956 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -97,7 +97,7 @@ site_status_msg = get_site_status_msg(course_id)
         </ul>
       </li>
     </ol>
-      % if should_display_shopping_cart_func() and not microsite.is_request_in_microsite(): # see shoppingcart.context_processor.user_has_cart_context_processor
+      % if should_display_shopping_cart_func() and not (course and microsite.is_request_in_microsite()): # see shoppingcart.context_processor.user_has_cart_context_processor
         <ol class="user">
           <li class="primary">
             <a class="shopping-cart" href="${reverse('shoppingcart.views.show_cart')}">