From 43649002cb0333a3ccb46dd19c798ce6c0ec32aa 2016-09-03 06:18:27
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: 2016-09-03 06:18:27
Subject: [PATCH] Makes ProductCondition work if you have both valid and cancelled instances of a product. Fixes #68
---

diff --git a/registrasion/controllers/conditions.py b/registrasion/controllers/conditions.py
index 51078016ef16cac2de8ac751e7d86fda21f22e57..72e592a2e88592ae075d10490b62b085fca1435f 100644
--- a/registrasion/controllers/conditions.py
+++ b/registrasion/controllers/conditions.py
@@ -172,11 +172,20 @@ class ProductConditionController(IsMetByFilter, ConditionController):
 
         in_user_carts = Q(enabling_products__productitem__cart__user=user)
         released = commerce.Cart.STATUS_RELEASED
+        paid = commerce.Cart.STATUS_PAID
+        active = commerce.Cart.STATUS_ACTIVE
         in_released_carts = Q(
             enabling_products__productitem__cart__status=released
         )
+        not_in_paid_or_active_carts = ~(
+            Q(enabling_products__productitem__cart__status=paid) |
+            Q(enabling_products__productitem__cart__status=active)
+        )
+
         queryset = queryset.filter(in_user_carts)
-        queryset = queryset.exclude(in_released_carts)
+        queryset = queryset.exclude(
+            in_released_carts & not_in_paid_or_active_carts
+        )
 
         return queryset
 
diff --git a/registrasion/tests/test_flag.py b/registrasion/tests/test_flag.py
index 4952c8a71d40ac6334611b2d7a6cb96dde2944cd..3d8914a1586b5657273d9e8e5fc51eca65190272 100644
--- a/registrasion/tests/test_flag.py
+++ b/registrasion/tests/test_flag.py
@@ -352,7 +352,7 @@ class FlagTestCases(RegistrationCartTestCase):
         items = commerce.ProductItem.objects.filter(cart=cart.cart)
         self.assertTrue([i for i in items if i.product == self.PROD_1])
 
-    def test_oops(self):
+    def test_product_stays_enabled_even_if_some_are_cancelled(self):
         ''' Flags should be enabled, even if *some* enabling products are cnx.
         Tests issue #68.
         '''
@@ -377,3 +377,8 @@ class FlagTestCases(RegistrationCartTestCase):
         # Even though cart1 has been cancelled, we have the item in cart2.
         # So we should be able to add PROD_1, which depends on PROD_2
         cart2.add_to_cart(self.PROD_1, 1)
+
+        cart2.set_quantity(self.PROD_2, 0)
+
+        with self.assertRaises(ValidationError):
+            cart2.add_to_cart(self.PROD_1, 1)