diff --git a/src/pretix/base/models/memberships.py b/src/pretix/base/models/memberships.py index 190ef73d03..14640b2cf2 100644 --- a/src/pretix/base/models/memberships.py +++ b/src/pretix/base/models/memberships.py @@ -169,6 +169,14 @@ class Membership(models.Model): def attendee_name(self): return build_name(self.attendee_name_parts, fallback_scheme=lambda: self.customer.organizer.settings.name_scheme) + @property + def expired(self): + return time_machine_now() > self.date_end + + @property + def not_yet_valid(self): + return time_machine_now() < self.date_start + def is_valid(self, ev=None, ticket_valid_from=None, valid_from_not_chosen=False): if valid_from_not_chosen: return not self.canceled and self.date_end >= time_machine_now() diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html index 251d8de427..a74730aa2d 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html @@ -24,30 +24,53 @@ {{ m.membership_type.name }} + {% if m.canceled %}{% endif %} {% if m.membership_type.transferable %} {% endif %} - {% if m.canceled %} - - {% textblob "danger" icon="times" %} - {% trans "Canceled" %} - {% endtextblob %} - - {% endif %} - {% if m.testmode %} - {% textblob "warning" %} - {% trans "TEST MODE" %} - {% endtextblob %} - {% endif %}