From 899994ef1e93dc80c432a360872933cae20c8ed6 Mon Sep 17 00:00:00 2001
From: luelista <weller@rami.io>
Date: Mon, 7 Apr 2025 13:51:59 +0200
Subject: [PATCH] Improve SOLD OUT / FULLY BOOKED message logic (Z#23187802)
 (#4988)

Show SOLD OUT instead of FULLY BOOKED if ticket is not free of charge even if a voucher gives 100% off
---
 .../pretixpresale/event/fragment_addon_choice.html          | 4 ++--
 .../pretixpresale/event/fragment_availability.html          | 6 +++---
 .../pretixpresale/event/fragment_product_list.html          | 4 ++--
 .../presale/templates/pretixpresale/event/voucher.html      | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_addon_choice.html b/src/pretix/presale/templates/pretixpresale/event/fragment_addon_choice.html
index 5498b63fc..63686ed41 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_addon_choice.html
+++ b/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>
diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_availability.html b/src/pretix/presale/templates/pretixpresale/event/fragment_availability.html
index bd9f326ce..176d155dc 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_availability.html
+++ b/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/>
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 a3834b9d4..0f9ce76a6 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_product_list.html
+++ b/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>
diff --git a/src/pretix/presale/templates/pretixpresale/event/voucher.html b/src/pretix/presale/templates/pretixpresale/event/voucher.html
index 556222f22..715e9e2f9 100644
--- a/src/pretix/presale/templates/pretixpresale/event/voucher.html
+++ b/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>