From 7b97204f2f1ce86d09360206b4c787e3901b8b7f Mon Sep 17 00:00:00 2001
From: Raphael Michel <michel@rami.io>
Date: Thu, 10 Nov 2022 14:48:55 +0100
Subject: [PATCH] Port b9feceba (Do not show a price if there are mandatory
 non-free addons) to voucher redemption

---
 .../templates/pretixpresale/event/voucher.html       | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pretix/presale/templates/pretixpresale/event/voucher.html b/src/pretix/presale/templates/pretixpresale/event/voucher.html
index 9481fafb57..482a104a23 100644
--- a/src/pretix/presale/templates/pretixpresale/event/voucher.html
+++ b/src/pretix/presale/templates/pretixpresale/event/voucher.html
@@ -149,7 +149,9 @@
                                                 from {{ minprice }}
                                             {% endblocktrans %}
                                         {% elif not item.min_price and not item.max_price %}
-                                            {% trans "FREE" context "price" %}
+                                            {% if not item.mandatory_priced_addons %}
+                                                <span class="text-uppercase">{% trans "free" context "price" %}</span>
+                                            {% endif %}
                                         {% else %}
                                             {{ item.min_price|money:event.currency }}
                                         {% endif %}
@@ -205,7 +207,9 @@
                                                     </div>
                                                     <p>
                                                 {% elif not var.display_price.gross %}
-                                                    {% trans "FREE" context "price" %}
+                                                    {% if not item.mandatory_priced_addons %}
+                                                        <span class="text-uppercase">{% trans "free" context "price" %}</span>
+                                                    {% endif %}
                                                 {% elif event.settings.display_net_prices %}
                                                     {{ var.display_price.net|money:event.currency }}
                                                 {% else %}
@@ -337,7 +341,9 @@
                                     </div>
                                     <p>
                                     {% elif not item.display_price.gross %}
-                                        {% trans "FREE" context "price" %}
+                                        {% if not item.mandatory_priced_addons %}
+                                            <span class="text-uppercase">{% trans "free" context "price" %}</span>
+                                        {% endif %}
                                     {% elif event.settings.display_net_prices %}
                                         {{ item.display_price.net|money:event.currency }}
                                     {% else %}