Show SOLD OUT instead of FULLY BOOKED if ticket is not free of charge even if a voucher gives 100% off (Z#23187802)

src/pretix/presale/templates/pretixpresale/event/fragment_addon_choice.html

@@ -220,7 +220,7 @@
                                         {% endif %}
                                     </div>
                                 {% else %}
-                                    {% include "pretixpresale/event/fragment_availability.html" with price=var.display_price.gross avail=var.cached_availability.0 event=event item=item var=var %}
+                                    {% include "pretixpresale/event/fragment_availability.html" with price=var.display_price.gross original_price=var.original_price.gross avail=var.cached_availability.0 event=event item=item var=var %}
                                 {% endif %}
                                 <div class="clearfix"></div>
                             </article>
@@ -366,7 +366,7 @@
                             {% endif %}
                         </div>
                     {% else %}
-                        {% include "pretixpresale/event/fragment_availability.html" with price=item.display_price.gross avail=item.cached_availability.0 event=event item=item var=0 %}
+                        {% include "pretixpresale/event/fragment_availability.html" with price=item.display_price.gross original_price=item.original_price.gross avail=item.cached_availability.0 event=event item=item var=0 %}
                     {% endif %}
                     <div class="clearfix"></div>
                 </article>

src/pretix/presale/templates/pretixpresale/event/fragment_availability.html

@@ -19,10 +19,10 @@
     </div>
 {% elif avail <= 10 %}
     <div class="col-md-2 col-sm-3 col-xs-6 availability-box gone">
-        {% if price != None and not price %}
-            <strong>{% trans "FULLY BOOKED" %}</strong>
-        {% else %}
+        {% if price or original_price %}
             <strong>{% trans "SOLD OUT" %}</strong>
+        {% else %}
+            <strong>{% trans "FULLY BOOKED" %}</strong>
         {% endif %}
         {% if allow_waitinglist and item.allow_waitinglist %}
             <br/>

src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html

@@ -238,7 +238,7 @@
                                         {% endif %}
                                     </div>
                                 {% else %}
-                                    {% include "pretixpresale/event/fragment_availability.html" with price=var.display_price.gross avail=var.cached_availability.0 event=event item=item var=var %}
+                                    {% include "pretixpresale/event/fragment_availability.html" with price=var.display_price.gross original_price=var.original_price.gross avail=var.cached_availability.0 event=event item=item var=var %}
                                 {% endif %}
                                 <div class="clearfix"></div>
                             </article>
@@ -391,7 +391,7 @@
                             {% endif %}
                         </div>
                     {% else %}
-                        {% include "pretixpresale/event/fragment_availability.html" with price=item.display_price.gross avail=item.cached_availability.0 event=event item=item var=0 %}
+                        {% include "pretixpresale/event/fragment_availability.html" with price=item.display_price.gross original_price=item.original_price.gross avail=item.cached_availability.0 event=event item=item var=0 %}
                     {% endif %}
                     <div class="clearfix"></div>
                 </article>

src/pretix/presale/templates/pretixpresale/event/voucher.html

@@ -255,7 +255,7 @@
                                                     {% endif %}
                                                 </div>
                                             {% else %}
-                                                {% include "pretixpresale/event/fragment_availability.html" with price=var.display_price.gross avail=var.cached_availability.0 item=item %}
+                                                {% include "pretixpresale/event/fragment_availability.html" with price=var.display_price.gross original_price=var.original_price.gross avail=var.cached_availability.0 item=item %}
                                             {% endif %}
                                             <div class="clearfix"></div>
                                         </article>
@@ -411,7 +411,7 @@
                                         {% endif %}
                                     </div>
                                 {% else %}
-                                    {% include "pretixpresale/event/fragment_availability.html" with price=item.display_price.gross avail=item.cached_availability.0 item=item %}
+                                    {% include "pretixpresale/event/fragment_availability.html" with price=item.display_price.gross original_price=item.original_price.gross avail=item.cached_availability.0 item=item %}
                                 {% endif %}
                                 <div class="clearfix"></div>
                             </article>