Exclude non-public Products from Offers detail and Range detail view (#4053)

* Non-public Products are shown in Offers

src/oscar/apps/offer/abstract_models.py

@@ -451,8 +451,7 @@ class AbstractConditionalOffer(models.Model):
             return Product.objects.none()
 
         queryset = self.condition.range.all_products()
-        return queryset.filter(is_discountable=True).exclude(
-            structure=Product.CHILD)
+        return queryset.filter(is_discountable=True).browsable()
 
     @cached_property
     def combined_offers(self):
@@ -970,8 +969,8 @@ class AbstractRange(models.Model):
         Product = self.included_products.model
 
         if self.includes_all_products:
-            # Filter out blacklisted products
-            return Product.objects.all().exclude(
+            # Filter out blacklisted
+            return Product.objects.exclude(
                 id__in=self.excluded_products.values("id")
             )
 
@@ -998,7 +997,6 @@ class AbstractRange(models.Model):
                 ~Q(excludes=self),
                 ~Q(parent__excludes=self)
             )
-
         return selected_products.distinct()
 
     @property

src/oscar/apps/offer/views.py

@@ -68,7 +68,7 @@ class RangeDetailView(ListView):
         Return a queryset of all :py:class:`Product <oscar.apps.catalogue.abstract_models.AbstractProduct>`
         instances related to the :py:class:`Range <oscar.apps.offer.abstract_models.AbstractRange>`.
         """  # noqa
-        products = self.range.all_products()
+        products = self.range.all_products().browsable()
         return products.order_by('rangeproduct__display_order')
 
     def get_context_data(self, **kwargs):

tests/integration/offer/test_offer.py

@@ -0,0 +1,21 @@
+from django.test import TestCase
+
+from oscar.apps.offer.views import RangeDetailView
+from oscar.test.factories import create_product
+from oscar.test.factories.offer import ConditionalOfferFactory
+
+
+class TestOffer(TestCase):
+
+    def setUp(self):
+        self.offer = ConditionalOfferFactory()
+        self.non_public_product = create_product(is_public=False)
+        self.offer.condition.range.add_product(self.non_public_product)
+
+    def test_non_public_product_not_in_offer(self):
+        self.assertFalse(self.non_public_product in self.offer.products())
+
+    def test_non_public_product_not_in_range_detail_view(self):
+        view = RangeDetailView()
+        view.range = self.offer.condition.range
+        self.assertFalse(self.non_public_product in view.get_queryset())