From 8d66e1e7329d00182f9021a1f4c7b3e4685e930d Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 4 Dec 2025 11:48:40 +0100 Subject: [PATCH] Cart extension: Fix bundled product being removed from cart when sold out (#5690) Instead, the entire bundle must be removed as it may not be sold individually. --- src/pretix/base/services/cart.py | 5 +++++ src/tests/presale/test_cart.py | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/pretix/base/services/cart.py b/src/pretix/base/services/cart.py index 66c7c47bd3..1fe05491d5 100644 --- a/src/pretix/base/services/cart.py +++ b/src/pretix/base/services/cart.py @@ -1361,6 +1361,11 @@ class CartManager: deleted_positions.add(op.position.pk) addons.delete() op.position.delete() + if op.position.is_bundled: + deleted_positions |= {a.pk for a in op.position.addon_to.addons.all()} + deleted_positions.add(op.position.addon_to.pk) + op.position.addon_to.addons.all().delete() + op.position.addon_to.delete() else: raise AssertionError("ExtendOperation cannot affect more than one item") elif isinstance(op, self.VoucherOperation): diff --git a/src/tests/presale/test_cart.py b/src/tests/presale/test_cart.py index 219a46ed92..b424227c9c 100644 --- a/src/tests/presale/test_cart.py +++ b/src/tests/presale/test_cart.py @@ -1428,6 +1428,29 @@ class CartTest(CartTestMixin, TestCase): self.assertEqual(cp2.expires, now() + self.cart_reservation_time) self.assertEqual(cp2.max_extend, now() + 11 * self.cart_reservation_time) + def test_expired_cart_extend_fails_partially_on_bundled(self): + start_time = datetime.datetime(2024, 1, 1, 10, 00, 00, tzinfo=datetime.timezone.utc) + max_extend = start_time + 11 * self.cart_reservation_time + self.quota_shirts.size = 0 + self.quota_shirts.save() + with scopes_disabled(): + cp1 = CartPosition.objects.create( + event=self.event, cart_id=self.session_key, item=self.ticket, + price=23, expires=max_extend, max_extend=max_extend + ) + cp2 = CartPosition.objects.create( + event=self.event, cart_id=self.session_key, item=self.shirt, variation=self.shirt_blue, + price=23, expires=max_extend, max_extend=max_extend, addon_to=cp1, is_bundled=True, + ) + with freezegun.freeze_time(max_extend + timedelta(hours=1)): + response = self.client.post('/%s/%s/cart/extend' % (self.orga.slug, self.event.slug), { + }, follow=True) + doc = BeautifulSoup(response.rendered_content, "lxml") + self.assertIn('no longer available', doc.select('.alert-danger')[0].text) + with scopes_disabled(): + self.assertFalse(CartPosition.objects.filter(id=cp1.id).exists()) + self.assertFalse(CartPosition.objects.filter(id=cp2.id).exists()) + def test_subevent_renew_expired_successfully(self): self.event.has_subevents = True self.event.save()