From c401e54831ea93cce984c3ae7dafe702f3718873 Mon Sep 17 00:00:00 2001 From: Mira Weller Date: Fri, 11 Oct 2024 13:47:00 +0200 Subject: [PATCH] improve formatting for subevents --- src/pretix/base/services/cross_selling.py | 3 ++- .../templates/pretixpresale/event/fragment_product_list.html | 3 +++ src/pretix/static/pretixpresale/scss/_checkout.scss | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pretix/base/services/cross_selling.py b/src/pretix/base/services/cross_selling.py index a5a575dc8..95ec3d26f 100644 --- a/src/pretix/base/services/cross_selling.py +++ b/src/pretix/base/services/cross_selling.py @@ -40,7 +40,8 @@ class DummyCategory: def __init__(self, category: ItemCategory, subevent): self.id = category.id - self.name = f"{category.name} ({subevent})" + self.name = str(category.name) + self.subevent_name = str(subevent) self.description = category.description diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html b/src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html index 21d633025..750d8c678 100644 --- a/src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html +++ b/src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html @@ -9,6 +9,9 @@ {% if category %}

{{ category.name }} + {% if category.subevent_name %} + {{ category.subevent_name }} + {% endif %} {% if category.category_has_discount %} diff --git a/src/pretix/static/pretixpresale/scss/_checkout.scss b/src/pretix/static/pretixpresale/scss/_checkout.scss index bb27207c0..b0cd8a0fa 100644 --- a/src/pretix/static/pretixpresale/scss/_checkout.scss +++ b/src/pretix/static/pretixpresale/scss/_checkout.scss @@ -110,6 +110,9 @@ .cross-selling .panel-body > *:first-child > h3:first-child { margin-top: 0; } +.cross-selling .panel-body h3 small { + padding-left: 20px; +} .panel-confirm {