Add expiry dates and individual conditions to gift cards (#1656)

* Add expiry dates and individual conditions to gift cards

* Display refund gift cards with more details and prettier interface

* Allow to set gift card expiry and conditions when cancelling event

* Extend gift card search

* Fix #1565 -- Some gift card filters

* Improve list of gift cards

* Allow to edit gift cards

* Note on validity

src/pretix/control/templates/pretixcontrol/orders/cancel.html

@@ -36,6 +36,8 @@
             {% bootstrap_field form.auto_refund layout="control" %}
             {% bootstrap_field form.manual_refund layout="control" %}
             {% bootstrap_field form.refund_as_giftcard layout="control" %}
+            {% bootstrap_field form.gift_card_expires layout="control" %}
+            {% bootstrap_field form.gift_card_conditions layout="control" %}
             {% bootstrap_field form.keep_fee_fixed layout="control" %}
             {% bootstrap_field form.keep_fee_percentage layout="control" %}
             {% bootstrap_field form.keep_fees layout="control" %}

src/pretix/control/templates/pretixcontrol/organizers/edit.html

@@ -32,7 +32,6 @@
                 {% endif %}
                 {% bootstrap_field sform.organizer_info_text layout="control" %}
                 {% bootstrap_field sform.event_team_provisioning layout="control" %}
-                {% bootstrap_field sform.giftcard_length layout="control" %}
             </fieldset>
             <fieldset>
                 <legend>{% trans "Organizer page" %}</legend>
@@ -63,6 +62,11 @@
                 {% bootstrap_field sform.primary_font layout="control" %}
                 {% bootstrap_field sform.favicon layout="control" %}
             </fieldset>
+            <fieldset>
+                <legend>{% trans "Gift cards" %}</legend>
+                {% bootstrap_field sform.giftcard_expiry_years layout="control" %}
+                {% bootstrap_field sform.giftcard_length layout="control" %}
+            </fieldset>
             <fieldset>
                 <legend>{% trans "Event metadata" %}</legend>
                 <p>

src/pretix/control/templates/pretixcontrol/organizers/giftcard.html

@@ -10,6 +10,10 @@
         {% if card.testmode %}
             <span class="label label-warning">{% trans "TEST MODE" %}</span>
         {% endif %}
+        <a href="{% url "control:organizer.giftcard.edit" organizer=request.organizer.slug giftcard=card.id %}"
+                class="btn btn-default">
+            <i class="fa fa-edit"></i> {% trans "Edit" %}
+        </a>
     </h1>
     <div class="row">
         <div class="col-md-10 col-xs-12">
@@ -29,6 +33,12 @@
                         <dd>{{ card.value|money:card.currency }}</dd>
                         <dt>{% trans "Currency" %}</dt>
                         <dd>{{ card.currency }}</dd>
+                        <dt>{% trans "Expire date" %}</dt>
+                        <dd>{% if card.expires %}{{ card.expires|date:"SHORT_DATETIME_FORMAT" }}{% else %}–{% endif %}</dd>
+                        {% if card.conditions %}
+                            <dt>{% trans "Special terms and conditions" context "giftcard" %}</dt>
+                            <dd>{{ card.conditions }}</dd>
+                        {% endif %}
                         {% if card.issued_in %}
                             <dt>{% trans "Issued through sale" %}</dt>
                             <dd>

src/pretix/control/templates/pretixcontrol/organizers/giftcard_create.html

@@ -10,6 +10,8 @@
         {% bootstrap_field form.value layout="control" %}
         {% bootstrap_field form.currency layout="control" %}
         {% bootstrap_field form.testmode layout="control" %}
+        {% bootstrap_field form.expires layout="control" %}
+        {% bootstrap_field form.conditions layout="control" %}
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}

src/pretix/control/templates/pretixcontrol/organizers/giftcard_edit.html

@@ -0,0 +1,24 @@
+{% extends "pretixcontrol/organizers/base.html" %}
+{% load i18n %}
+{% load bootstrap3 %}
+{% block inner %}
+    <h1>
+        {% blocktrans trimmed with card=card.secret %}
+            Gift card: {{ card }}
+        {% endblocktrans %}
+        {% if card.testmode %}
+            <span class="label label-warning">{% trans "TEST MODE" %}</span>
+        {% endif %}
+    </h1>
+    <form class="form-horizontal" action="" method="post">
+        {% csrf_token %}
+        {% bootstrap_form_errors form %}
+        {% bootstrap_field form.expires layout="control" %}
+        {% bootstrap_field form.conditions layout="control" %}
+        <div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
+{% endblock %}

src/pretix/control/templates/pretixcontrol/organizers/giftcards.html

@@ -1,5 +1,6 @@
 {% extends "pretixcontrol/organizers/base.html" %}
 {% load i18n %}
+{% load urlreplace %}
 {% load bootstrap3 %}
 {% load money %}
 {% block inner %}
@@ -21,9 +22,15 @@
         </div>
     {% else %}
         <form class="row filter-form" action="" method="get">
-            <div class="col-md-10 col-sm-6 col-xs-12">
+            <div class="col-md-4 col-sm-6 col-xs-12">
                 {% bootstrap_field filter_form.query layout='inline' %}
             </div>
+            <div class="col-md-3 col-sm-6 col-xs-6">
+                {% bootstrap_field filter_form.testmode layout='inline' %}
+            </div>
+            <div class="col-md-3 col-sm-6 col-xs-6">
+                {% bootstrap_field filter_form.state layout='inline' %}
+            </div>
             <div class="col-md-2 col-sm-6 col-xs-12">
                 <button class="btn btn-primary btn-block" type="submit">
                     <span class="fa fa-filter"></span>
@@ -41,9 +48,18 @@
             <table class="table table-condensed table-hover">
                 <thead>
                 <tr>
-                    <th>{% trans "Gift card code" %}</th>
-                    <th>{% trans "Creation date" %}</th>
-                    <th class="text-right">{% trans "Current value" %}</th>
+                    <th>{% trans "Gift card code" %}
+                        <a href="?{% url_replace request 'ordering' '-code' %}"><i class="fa fa-caret-down"></i></a>
+                        <a href="?{% url_replace request 'ordering' 'code' %}"><i class="fa fa-caret-up"></i></a></th>
+                    <th>{% trans "Creation date" %}
+                        <a href="?{% url_replace request 'ordering' '-issuance' %}"><i class="fa fa-caret-down"></i></a>
+                        <a href="?{% url_replace request 'ordering' 'issuance' %}"><i class="fa fa-caret-up"></i></a></th>
+                    <th>{% trans "Expiry date" %}
+                        <a href="?{% url_replace request 'ordering' '-expires' %}"><i class="fa fa-caret-down"></i></a>
+                        <a href="?{% url_replace request 'ordering' 'expires' %}"><i class="fa fa-caret-up"></i></a></th>
+                    <th class="text-right">{% trans "Current value" %}
+                        <a href="?{% url_replace request 'ordering' '-value' %}"><i class="fa fa-caret-down"></i></a>
+                        <a href="?{% url_replace request 'ordering' 'value' %}"><i class="fa fa-caret-up"></i></a></th>
                     <th></th>
                 </tr>
                 </thead>
@@ -56,8 +72,12 @@
                             {% if g.testmode %}
                                 <span class="label label-warning">{% trans "TEST MODE" %}</span>
                             {% endif %}
+                            {% if g.expired %}
+                                <span class="label label-danger">{% trans "Expired" %}</span>
+                            {% endif %}
                         </td>
                         <td>{{ g.issuance|date:"SHORT_DATETIME_FORMAT" }}</td>
+                        <td>{% if g.expires %}{{ g.expires|date:"SHORT_DATETIME_FORMAT" }}{% endif %}</td>
                         <td class="text-right">
                             {{ g.cached_value|money:g.currency }}
                         </td>