diff --git a/counter/models.py b/counter/models.py index ae9b2e49..94f80d2c 100644 --- a/counter/models.py +++ b/counter/models.py @@ -683,8 +683,10 @@ class Counter(models.Model): Prices will be annotated """ - products = self.products.select_related("product_type").prefetch_related( - "buying_groups" + products = ( + self.products.filter(archived=False) + .select_related("product_type") + .prefetch_related("buying_groups") ) # Only include age appropriate products diff --git a/counter/tests/test_counter.py b/counter/tests/test_counter.py index d90f9510..453727a1 100644 --- a/counter/tests/test_counter.py +++ b/counter/tests/test_counter.py @@ -583,6 +583,16 @@ class TestCounterClick(TestFullClickBase): - self.beer.selling_price ) + def test_no_fetch_archived_product(self): + counter = baker.make(Counter) + customer = baker.make(Customer) + product_recipe.make(archived=True, counters=[counter]) + unarchived_products = product_recipe.make( + archived=False, counters=[counter], _quantity=3 + ) + customer_products = counter.get_products_for(customer) + assert unarchived_products == customer_products + class TestCounterStats(TestCase): @classmethod