From 94f2ad932501e3cab5bfa3e1f71583870207cbfa Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Thu, 29 Nov 2018 10:13:43 +0100
Subject: [PATCH] Highlight items that are unavailable by time

---
 src/pretix/base/models/items.py               | 14 +++++++----
 .../templates/pretixcontrol/items/index.html  | 23 +++++++++++++++----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/pretix/base/models/items.py b/src/pretix/base/models/items.py
index 3e01777e5..638621775 100644
--- a/src/pretix/base/models/items.py
+++ b/src/pretix/base/models/items.py
@@ -364,17 +364,21 @@ class Item(LoggedModel):
                               rate=Decimal('0.00'), name='')
         return self.tax_rule.tax(price, base_price_is=base_price_is)
 
+    def is_available_by_time(self, now_dt: datetime=None) -> bool:
+        now_dt = now_dt or now()
+        if self.available_from and self.available_from > now_dt:
+            return False
+        if self.available_until and self.available_until < now_dt:
+            return False
+        return True
+
     def is_available(self, now_dt: datetime=None) -> bool:
         """
         Returns whether this item is available according to its ``active`` flag
         and its ``available_from`` and ``available_until`` fields
         """
         now_dt = now_dt or now()
-        if not self.active:
-            return False
-        if self.available_from and self.available_from > now_dt:
-            return False
-        if self.available_until and self.available_until < now_dt:
+        if not self.active or not self.is_available_by_time(now_dt):
             return False
         return True
 
diff --git a/src/pretix/control/templates/pretixcontrol/items/index.html b/src/pretix/control/templates/pretixcontrol/items/index.html
index 8df1ac1ec..adec0e9ee 100644
--- a/src/pretix/control/templates/pretixcontrol/items/index.html
+++ b/src/pretix/control/templates/pretixcontrol/items/index.html
@@ -54,8 +54,16 @@
                             </td>
                             <td>
                                 {% if i.available_from or i.available_until %}
-                                    <span class="fa fa-clock-o fa-fw text-muted" data-toggle="tooltip" title="{% trans "Only available in a limited timeframe" %}">
-                                    </span>
+                                    {% if not i.is_available_by_time %}
+                                        <span class="label label-danger" data-toggle="tooltip"
+                                                title="{% trans "Currently unavailable since a limited timeframe for this product has been set" %}">
+                                            <span class="fa fa-clock-o fa-fw" data-toggle="tooltip">
+                                            </span>
+                                        </span>
+                                    {% else %}
+                                        <span class="fa fa-clock-o fa-fw text-muted" data-toggle="tooltip" title="{% trans "Only available in a limited timeframe" %}">
+                                        </span>
+                                    {% endif %}
                                 {% endif %}
                             </td>
                             <td>
@@ -69,10 +77,15 @@
                                 {% endif %}
                             </td>
                             <td>
-                                {% if i.hide_without_voucher %}
-                                    <span class="fa fa-ticket fa-fw text-muted" data-toggle="tooltip" title="{% trans "Only visible with a voucher" %}"></span>
+                                {% if i.category.is_addon %}
+                                    <span class="fa fa-puzzle-piece fa-fw text-muted" data-toggle="tooltip"
+                                            title="{% trans "Only available as an add-on product" %}"></span>
+                                {% elif i.hide_without_voucher %}
+                                    <span class="fa fa-tags fa-fw text-muted" data-toggle="tooltip"
+                                            title="{% trans "Only visible with a voucher" %}"></span>
                                 {% elif i.require_voucher %}
-                                    <span class="fa fa-ticket fa-fw text-muted" data-toggle="tooltip" title="{% trans "Can only bought using a voucher" %}"></span>
+                                    <span class="fa fa-tags fa-fw text-muted" data-toggle="tooltip"
+                                            title="{% trans "Can only bought using a voucher" %}"></span>
                                 {% endif %}
                             </td>
                             <td>{% if i.category %}{{ i.category.name }}{% endif %}</td>