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

ADD: dav_events: add support for confirm payments.

Browse Source
This commit is contained in:
heinzel
2019-06-28 15:47:15 +02:00
parent 5fc5195f81
commit 862d39b84c
7 changed files with 96 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dav_events/templates/dav_events/event_detail.html
View File

@@ -113,7 +113,7 @@
<div class="action-tabs top-most">
<div class="pull-right">
{% if has_permission_submit %}
<a id="btn-submit" class="btn {% if not is_submitted %}btn-success{% else %}btn-default disabled{% endif %}"
<a id="btn-submit" class="btn btn-sm {% if not is_submitted %}btn-success{% else %}btn-default disabled{% endif %}"
data-toggle="modal" data-target="#modal-submit-dialog">
{% if is_submitted %}
{% bootstrap_icon 'check' %}&thinsp;
@@ -124,7 +124,7 @@
</a>
{% endif %}
{% if has_permission_accept %}
<a id="btn-accept" class="btn {% if is_submitted and not is_accepted %}btn-success{% else %}btn-default disabled{% endif %}"
<a id="btn-accept" class="btn btn-sm {% if is_submitted and not is_accepted %}btn-success{% else %}btn-default disabled{% endif %}"
data-toggle="modal" data-target="#modal-accept-dialog">
{% if is_accepted %}
{% bootstrap_icon 'check' %}&thinsp;
@@ -135,7 +135,7 @@
</a>
{% endif %}
{% if has_permission_publish %}
<a id="btn-confirmpublication" class="btn {% if is_accepted and not is_publishing and not is_published %}btn-success{% else %}btn-default disabled{% endif %}"
<a id="btn-confirmpublication" class="btn btn-sm {% if is_accepted and not is_publishing and not is_published %}btn-success{% else %}btn-default disabled{% endif %}"
data-toggle="modal" data-target="#modal-confirmpublication-dialog">
{% if is_publishing_any %}
{% bootstrap_icon 'check' %}&thinsp;
@@ -145,7 +145,7 @@
{% trans 'Veröffentlichung bestätigen' %}
</a>
{% endif %}
<a id="btn-clone" class="btn btn-primary"
<a id="btn-clone" class="btn btn-sm btn-primary"
href="{% url 'dav_events:create' %}?copy={{ event.pk }}"
title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">
{% bootstrap_icon 'duplicate' %}&thinsp;
@@ -165,10 +165,12 @@
<a class="btn {% if has_permission_update %}btn-warning{% else %}disabled{% endif %}"
href="{% url 'dav_events:update' event.pk %}">{% trans 'Ändern' %}</a>
</li>
<li class="{% if not event.registration_required %}disabled{% endif %}">
<a class="btn {% if not event.registration_required %}disabled{% elif is_published_any %}btn-warning{% endif %}"
{% if event.registration_required %}
<li>
<a class="btn {% if is_published_any %}btn-success{% endif %}"
href="{% url 'dav_events:registrations' event.pk %}">{% trans 'Anmeldungen' %}</a>
</li>
{% endif %}
</ul>
</div>

32
dav_events/templates/dav_events/event_registrations.html
View File

@@ -141,7 +141,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<div class="pull-right">
{% render_event_status event show_void=False %}
{% render_event_status event %}
</div>
<h3 class="panel-title">{{ event }}</h3>
</div>
@@ -196,6 +196,7 @@
</div>
</div>
</div>
{% if has_permission_update_registration %}
<div class="panel-footer">
{% if event.is_deadline_expired %}
<a id="btn-kill-deadline" class="btn btn-danger"
@@ -217,6 +218,7 @@
</a>
{% endif %}
</div>
{% endif %}
</div>
</div>
</div>
@@ -241,6 +243,7 @@
<form action="" method="post" class="form-inline">
{% csrf_token %}
<input type="hidden" name="registration" value="{{ registration.id }}">
{% if has_permission_update_participants %}
<button type="submit" name="action" value="accept_registration"
class="btn btn-link no-padding" title="zur Teilnehmerliste hinzufügen">
<span class="text-success">{% bootstrap_icon 'plus-sign' %}</span>
@@ -251,6 +254,7 @@
<span class="text-danger">{% bootstrap_icon 'minus-sign' %}</span>
</button>
&nbsp;
{% endif %}
{% if registration.answered %}
<span class="text-muted">
{% endif %}
@@ -277,6 +281,7 @@
</div>
</div>
{% endif %}
{% if has_permission_update_participants %}
<div class="panel panel-info">
<div id="headingAddParticipant" class="panel-heading" role="tab">
<h5 class="panel-title">
@@ -302,6 +307,7 @@
</div>
</div>
</div>
{% endif %}
{% if participants %}
{% for form in participant_formset %}
{% with participant=form.instance %}
@@ -322,6 +328,7 @@
<form action="" method="post" class="form-inline">
{% csrf_token %}
<input type="hidden" name="id" value="{{ participant.id }}">
{% if has_permission_update_participants %}
<button name="action" value="moveup_participant"
title="{% trans 'Nach oben verschieben' %}"
class="btn btn-link no-padding {% if forloop.first %}invisible{% endif %}">
@@ -339,16 +346,29 @@
<span class="text-danger">{% bootstrap_icon 'remove-circle' %}</span>
</button>
&nbsp;
{% if event.charge and participant.paid %}
<span class="text-success" title="Geldeingang bestätigt">
{% endif %}
{% if event.charge and participant.paid and has_permission_payment %}
<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 %}
<span class="text-success" title="{% trans 'Geldeingang bestätigt' %}">
{% bootstrap_icon 'piggy-bank' %}
</span>
{% elif event.charge and has_permission_payment %}
<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 %}
<span class="text-danger" title="Geldeingang unbestätigt">
<span class="text-danger" title="{% trans 'Geldeingang unbestätigt' %}">
{% bootstrap_icon 'piggy-bank' %}
</span>
{% else %}
<span class="hidden" title="Keine Teilnehmergebühr gefordert">
<span class="hidden" title="{% trans 'Keine Teilnehmergebühr gefordert' %}">
{% bootstrap_icon 'piggy-bank' %}
</span>
{% endif %}
@@ -366,9 +386,11 @@
<input type="hidden" name="form_prefix" value="{{ form.prefix }}">
<input type="hidden" name="{{ form.prefix }}-id" value="{{ participant.id }}">
{% include './includes/participant_form.html' %}
{% if not has_permission_update_participants %}
<button type="submit" name="action" value="update_participant" class="btn btn-success">
{% bootstrap_icon 'hdd' %} {% trans 'Speichern' %}
</button>
{% endif %}
</form>
</div>
</div>