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 cc60c07eb1..1ac274119b 100644 --- a/src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html +++ b/src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html @@ -144,7 +144,7 @@
{% elif not var.display_price.gross %} - {% if not item.mandatory_priced_addons %} + {% if not item.mandatory_priced_addons or var.original_price %} {% trans "free" context "price" %} {% endif %} {% elif event.settings.display_net_prices %} @@ -278,7 +278,7 @@
{% elif not item.display_price.gross %} - {% if not item.mandatory_priced_addons %} + {% if not item.mandatory_priced_addons or item.original_price %} {% trans "free" context "price" %} {% endif %} {% elif event.settings.display_net_prices %} diff --git a/src/pretix/presale/templates/pretixpresale/event/voucher.html b/src/pretix/presale/templates/pretixpresale/event/voucher.html index 0377f69f5d..103df6c564 100644 --- a/src/pretix/presale/templates/pretixpresale/event/voucher.html +++ b/src/pretix/presale/templates/pretixpresale/event/voucher.html @@ -207,7 +207,7 @@
{% elif not var.display_price.gross %} - {% if not item.mandatory_priced_addons %} + {% if not item.mandatory_priced_addons or var.original_price %} {% trans "free" context "price" %} {% endif %} {% elif event.settings.display_net_prices %} @@ -341,7 +341,7 @@
{% elif not item.display_price.gross %} - {% if not item.mandatory_priced_addons %} + {% if not item.mandatory_priced_addons or item.original_price %} {% trans "free" context "price" %} {% endif %} {% elif event.settings.display_net_prices %} diff --git a/src/pretix/static/pretixpresale/js/widget/widget.js b/src/pretix/static/pretixpresale/js/widget/widget.js index b809c33404..8c046dcb52 100644 --- a/src/pretix/static/pretixpresale/js/widget/widget.js +++ b/src/pretix/static/pretixpresale/js/widget/widget.js @@ -330,7 +330,7 @@ Vue.component('pricebox', { }, priceline: function () { if (this.price.gross === "0.00") { - if (this.mandatory_priced_addons) { + if (this.mandatory_priced_addons && !this.original_price) { return "\xA0"; // nbsp, because an empty string would cause the HTML element to collapse } return strings.free;