diff --git a/membershipworks/models.py b/membershipworks/models.py index 0c969ab..7c18cb4 100644 --- a/membershipworks/models.py +++ b/membershipworks/models.py @@ -592,10 +592,10 @@ class EventTicketTypeManager(models.Manager["EventTicketType"]): ), is_members_ticket=(Q(restrict_to__isnull=False)), materials=Case( - When(Q(event__materials_fee_included_in_price__isnull=True), None), When( ( Q(event__materials_fee_included_in_price=True) + | Q(event__materials_fee=0) & Q(event__materials_fee__isnull=False) ), ExpressionWrapper( @@ -603,6 +603,7 @@ class EventTicketTypeManager(models.Manager["EventTicketType"]): output_field=models.DecimalField(), ), ), + When(Q(event__materials_fee_included_in_price__isnull=True), None), default=0, output_field=models.DecimalField(), ),