From 99b4c5bd362104d12c9d3704907f6728878ca000 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 19 Mar 2024 10:17:26 +0100 Subject: [PATCH] Fix cart grouping function to include membership and validity (#3991) * Fix cart grouping function to include membership and validity * Update src/pretix/presale/views/__init__.py Co-authored-by: Mira --------- Co-authored-by: Mira --- src/pretix/presale/views/__init__.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/pretix/presale/views/__init__.py b/src/pretix/presale/views/__init__.py index 70543c2ec..ce29cbfdd 100644 --- a/src/pretix/presale/views/__init__.py +++ b/src/pretix/presale/views/__init__.py @@ -170,9 +170,20 @@ class CartMixin: ) if not grouping_allowed: - return (pos.pk,) + (0, ) * 6 + return (pos.pk,) else: - return (pos.addon_to_id or 0), pos.subevent_id, pos.item_id, pos.variation_id, pos.price, (pos.voucher_id or 0), (pos.seat_id or 0) + return ( + (pos.addon_to_id or 0), + pos.subevent_id, + pos.item_id, + pos.variation_id, + pos.price, + (pos.voucher_id or 0), + (pos.seat_id or 0), + pos.valid_from, + pos.valid_until, + pos.used_membership_id, + ) positions = [] for k, g in groupby(sorted(lcp, key=lambda c: c.sort_key), key=group_key):