DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

Support for reduced registration fee

Browse Source
This commit is contained in:
heinzel
2020-12-09 17:45:15 +01:00
parent 3f3bb2512b
commit baabbba7fb
14 changed files with 171 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dav_event_office/templates/dav_event_office/event_detail.html
View File

@@ -161,6 +161,12 @@
<span title="{{ registration.get_info }}">
{% bootstrap_icon 'info-sign' %}
</span>
{% if registration.apply_reduced_fee %}
&nbsp;
<span class="text-info">
<strong>%</strong>{% bootstrap_icon 'piggy-bank' %} (reduzierte Gebühr)
</span>
{% endif %}
</form>
{% empty %}
{% trans 'Keine Anmeldungen vorhanden' %}
@@ -223,31 +229,29 @@
{% endif %}
{% if event.charge and participant.paid and has_permission_payment %}
&nbsp;
<button name="action" value="revoke_payment"
title="{% trans 'Geldeingang wurde bestätigt' %} - {% trans 'Bestätigung des Geldeingangs zurückziehen' %}"
class="btn btn-link no-padding">
<span class="text-success">{% bootstrap_icon 'piggy-bank' %}</span>
</button>
<span class="text-success"><strong>{% if participant.apply_reduced_fee %}%{% else %}&emsp;{% endif %}</strong></span><button
name="action" value="revoke_payment"
title="{% trans 'Geldeingang wurde bestätigt' %} - {% trans 'Bestätigung des Geldeingangs zurückziehen' %}"
class="btn btn-link no-padding"><span class="text-success">{% bootstrap_icon 'piggy-bank' %}</span></button>
{% elif event.charge and participant.paid %}
&nbsp;
<span class="text-success" title="{% trans 'Geldeingang bestätigt' %}">
{% bootstrap_icon 'piggy-bank' %}
<strong>{% if participant.apply_reduced_fee %}%{% else %}&emsp;{% endif %}</strong>{% bootstrap_icon 'piggy-bank' %}
</span>
{% elif event.charge and has_permission_payment %}
&nbsp;
<button name="action" value="confirm_payment"
title="{% trans 'Geldeingang bestätigen' %}"
class="btn btn-link no-padding">
<span class="text-danger">{% bootstrap_icon 'piggy-bank' %}</span>
</button>
<span class="text-danger"><strong>{% if participant.apply_reduced_fee %}%{% elif participant.created_at|date:'U' < '1608764400' %}? {% else %}&emsp;{% endif %}</strong></span><button
name="action" value="confirm_payment"
title="{% trans 'Geldeingang bestätigen' %}"
class="btn btn-link no-padding"><span class="text-danger">{% bootstrap_icon 'piggy-bank' %}</span></button>
{% elif event.charge %}
&nbsp;
<span class="text-danger" title="{% trans 'Geldeingang unbestätigt' %}">
{% bootstrap_icon 'piggy-bank' %}
<strong>{% if participant.apply_reduced_fee %}%{% elif participant.created_at|date:'U' < '1608764400' %}? {% else %}&emsp;{% endif %}</strong>{% bootstrap_icon 'piggy-bank' %}
</span>
{% else %}
<span class="hidden" title="{% trans 'Keine Teilnehmergebühr gefordert' %}">
{% bootstrap_icon 'piggy-bank' %}
<strong>&emsp;</strong>{% bootstrap_icon 'piggy-bank' %}
</span>
{% endif %}
</form>
@@ -377,12 +381,12 @@
{% if event.charge and participant.paid %}
&nbsp;
<span class="text-success" title="{% trans 'Geldeingang bestätigt' %}">
{% bootstrap_icon 'piggy-bank' %}
<strong>{% if participant.apply_reduced_fee %}%{% else %}&emsp;{% endif %}</strong>{% bootstrap_icon 'piggy-bank' %}
</span>
{% elif event.charge %}
&nbsp;
<span class="text-danger" title="{% trans 'Geldeingang unbestätigt' %}">
{% bootstrap_icon 'piggy-bank' %}
<strong>{% if participant.apply_reduced_fee %}%{% else %}&emsp;{% endif %}</strong>{% bootstrap_icon 'piggy-bank' %}
</span>
{% endif %}
</span>

8
dav_event_office/templates/dav_event_office/includes/participant_form.html
View File

@@ -28,6 +28,14 @@
{% bootstrap_field form.phone_number %}
</div>
</div>
<div class="row">
<div class="col-sm-3">
{% bootstrap_field form.year_of_birth %}
</div>
<div class="col-sm-9">
{% bootstrap_field form.apply_reduced_fee %}
</div>
</div>
<div class="row">
<div class="col-sm-3">
{% bootstrap_field form.dav_number %}

30
dav_event_office/templates/dav_event_office/participant_list.html
View File

@@ -24,7 +24,7 @@
<th>{% trans 'Nachname' %}</th>
<th>{% trans 'Vorname' %}</th>
<th>{% trans 'Mitgliedsnummer' %}</th>
<th>{% trans 'Teilnehmergebühr' %}</th>
<th>{% trans 'Teilnahmegebühr' %}</th>
</tr>
<tr>
<th><input type="text" placeholder="{% trans 'Filter' %}" /></th>
@@ -32,7 +32,7 @@
<th><input type="text" placeholder="{% trans 'Filter' %}" /></th>
<th><input type="text" placeholder="{% trans 'Filter' %}" /></th>
<th><input type="text" placeholder="{% trans 'Filter' %}" /></th>
<th><input type="text" placeholder="{% trans 'Filter' %} ({% trans 'Grün' %}/{% trans 'Rot' %})" /></th>
<th><input type="text" placeholder="{% trans 'Filter' %} ({% trans 'Grün' %}/{% trans 'Rot' %}/{% trans 'Grau' %}/%)" /></th>
</tr>
</thead>
<tbody>
@@ -62,7 +62,7 @@
{% endif %}
</td>
<td data-order="{{ participant.paid }} {{ event.charge|floatformat:'-2' }}"
data-search="{% if participant.paid %}{% trans 'Grün' %}{% else %}{% trans 'Rot' %}{% endif %} {{ event.charge|floatformat:'-2' }}">
data-search="{% if not event.charge %}{% trans 'Grau' %}{% elif participant.paid %}{% trans 'Grün' %}{% else %}{% trans 'Rot' %}{% endif %} {% if participant.apply_reduced_fee %}%{% endif %} {{ event.charge|floatformat:'-2' }}">
<div class="pull-right">
<a title="{{ participant.email_address}}" href="mailto:{{ participant.email_address}}">{% bootstrap_icon 'envelope' %}</a>
<span class="text-info" title="{{ participant.get_info }}
@@ -72,24 +72,22 @@
{% csrf_token %}
<input type="hidden" name="id" value="{{ participant.id }}">
{% if event.charge and participant.paid %}
<button name="action" value="revoke_payment"
title="{% trans 'Geldeingang wurde bestätigt' %} - {% trans 'Bestätigung des Geldeingangs zurückziehen' %}"
class="btn btn-link no-padding">
<span class="text-success">{% bootstrap_icon 'piggy-bank' %}</span>
</button>
<span class="text-success"><strong>{% if participant.apply_reduced_fee %}%{% else %}&emsp;{% endif %}</strong></span><button
name="action" value="revoke_payment"
title="{% trans 'Geldeingang wurde bestätigt' %} - {% trans 'Bestätigung des Geldeingangs zurückziehen' %}"
class="btn btn-link no-padding"><span class="text-success">{% bootstrap_icon 'piggy-bank' %}</span></button>
&nbsp;
({{ event.charge|floatformat:'-2' }} €)
({{ event.charge|floatformat:'-2' }}{% if participant.apply_reduced_fee %} / 2{% endif %} €)
{% elif event.charge %}
<button name="action" value="confirm_payment"
title="{% trans 'Geldeingang bestätigen' %}"
class="btn btn-link no-padding">
<span class="text-danger">{% bootstrap_icon 'piggy-bank' %}</span>
</button>
<span class="text-danger"><strong>{% if participant.apply_reduced_fee %}%{% elif participant.created_at|date:'U' < '1608764400' %}? {% else %}&emsp;{% endif %}</strong></span><button
name="action" value="confirm_payment"
title="{% trans 'Geldeingang bestätigen' %}"
class="btn btn-link no-padding"><span class="text-danger">{% bootstrap_icon 'piggy-bank' %}</span></button>
&nbsp;
({{ event.charge|floatformat:'-2' }} €)
({{ event.charge|floatformat:'-2' }}{% if participant.apply_reduced_fee %} / 2{% endif %} €)
{% else %}
<span class="text-muted" title="{% trans 'Keine Teilnehmergebühr gefordert' %}">
{% bootstrap_icon 'piggy-bank' %}
<strong>&emsp;</strong>{% bootstrap_icon 'piggy-bank' %}
</span>
{% endif %}
</form>