Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
1f5fa651
Verified
Commit
1f5fa651
authored
Sep 22, 2017
by
Sébastiaan Versteeg
Browse files
Fix payment status export and AJAX change
parent
0cd00dd9
Changes
5
Hide whitespace changes
Inline
Side-by-side
website/events/admin_views.py
View file @
1f5fa651
...
...
@@ -37,14 +37,17 @@ def change_registration(request, event_id, action=None):
try
:
id
=
request
.
POST
.
get
(
"id"
,
-
1
)
checked
=
json
.
loads
(
request
.
POST
.
get
(
"checked"
))
obj
=
Registration
.
objects
.
get
(
event
=
event_id
,
pk
=
id
)
if
checked
is
not
None
:
if
action
==
'present'
:
if
action
==
'present'
:
checked
=
json
.
loads
(
request
.
POST
.
get
(
"checked"
))
if
checked
is
not
None
:
obj
.
present
=
checked
elif
action
==
'paid'
:
obj
.
paid
=
checked
obj
.
save
()
obj
.
save
()
elif
action
==
'payment'
:
value
=
request
.
POST
.
get
(
"value"
)
if
value
is
not
None
:
obj
.
payment
=
value
obj
.
save
()
except
Registration
.
DoesNotExist
:
data
[
'success'
]
=
False
...
...
@@ -101,10 +104,10 @@ def export(request, event_id):
'date cancelled'
:
cancelled
,
}
if
event
.
price
>
0
:
if
registration
.
payment
==
'cash_payment'
:
if
registration
.
payment
==
Registration
.
PAYMENT_CASH
:
data
[
'paid'
]
=
_
(
'Cash'
)
elif
registration
.
payment
==
'pin_payment'
:
data
[
'paid'
]
=
_
(
'
Pin
'
)
elif
registration
.
payment
==
Registration
.
PAYMENT_CARD
:
data
[
'paid'
]
=
_
(
'
Card
'
)
else
:
data
[
'paid'
]
=
_
(
'No'
)
...
...
@@ -161,6 +164,6 @@ def all_present(request, event_id):
.
order_by
(
'date'
)[:
event
.
max_participants
])
event
.
registration_set
.
filter
(
pk__in
=
registrations_query
).
update
(
present
=
True
,
payment
=
'cash_payment'
)
present
=
True
,
payment
=
Registration
.
PAYMENT_CASH
)
return
HttpResponseRedirect
(
'/events/admin/{}'
.
format
(
event_id
))
website/events/locale/nl/LC_MESSAGES/django.mo
View file @
1f5fa651
No preview for this file type
website/events/locale/nl/LC_MESSAGES/django.po
View file @
1f5fa651
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-
17 18:07
+0200\n"
"PO-Revision-Date: 2017-09-
17 18:07
+0200\n"
"POT-Creation-Date: 2017-09-
22 14:54
+0200\n"
"PO-Revision-Date: 2017-09-
22 14:54
+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -42,39 +42,39 @@ msgstr "Publiceer geselecteerde evenementen"
msgid "Unpublish selected events"
msgstr "Publicatie van geselecteerde evenementen ongedaan maken"
#: admin_views.py:7
6
#: admin_views.py:7
9
msgctxt "registration status"
msgid "registered"
msgstr "aangemeld"
#: admin_views.py:8
2
admin_views.py:12
2
#: admin_views.py:8
5
admin_views.py:12
5
msgctxt "registration status"
msgid "late cancellation"
msgstr "te laat afgemeld"
#: admin_views.py:8
4
#: admin_views.py:8
7
msgctxt "registration status"
msgid "cancelled"
msgstr "afgemeld"
#: admin_views.py:
88
#: admin_views.py:
91
msgctxt "registration status"
msgid "waiting"
msgstr "wachtend"
#: admin_views.py:9
3
#: admin_views.py:9
6
msgid "Yes"
msgstr "Ja"
#: admin_views.py:10
5
#: admin_views.py:10
8
msgid "Cash"
msgstr "Contant"
#: admin_views.py:10
7
msgid "
Pin
"
#: admin_views.py:1
1
0
msgid "
Card
"
msgstr "Pin"
#: admin_views.py:1
09
#: admin_views.py:1
12
msgid "No"
msgstr "Nee"
...
...
@@ -114,39 +114,39 @@ msgstr "Workshop"
msgid "Other"
msgstr "Overig"
#: models.py:
33
templates/events/event.html:1
40
#: models.py:
26
templates/events/event.html:1
36
msgid "No registration required"
msgstr "Geen aanmelding vereist"
#: models.py:3
7
templates/events/admin/details.html:68
#: models.py:3
0
templates/events/admin/details.html:68
msgid "title"
msgstr "titel"
#: models.py:
4
3 models.py:38
8
#: models.py:3
6
models.py:38
4
msgid "description"
msgstr "beschrijving"
#: models.py:
46
#: models.py:
39
msgid "start time"
msgstr "starttijd"
#: models.py:4
8
#: models.py:4
1
msgid "end time"
msgstr "eindtijd"
#: models.py:
53
templates/events/admin/details.html:72
#: models.py:
46
templates/events/admin/details.html:72
msgid "organiser"
msgstr "organisator"
#: models.py:5
9
#: models.py:5
2
msgid "category"
msgstr "categorie"
#: models.py:
64
#: models.py:
57
msgid "registration start"
msgstr "start aanmelden"
#: models.py:6
7
models.py:
7
6
#: models.py:6
0
models.py:6
9
msgid ""
"If you set a registration period registration will be required. If you don't "
"set one, registration won't be required."
...
...
@@ -154,24 +154,24 @@ msgstr ""
"Als je een aanmeldperiode instelt is aanmelden vereist, als je dat niet doet "
"is aanmelden niet vereist."
#: models.py:
73
#: models.py:
66
msgid "registration end"
msgstr "einde aanmelden"
#: models.py:
82
#: models.py:
75
msgid "cancel deadline"
msgstr "afmelddeadline"
#: models.py:8
9
templates/events/admin/details.html:76
#: models.py:8
2
templates/events/admin/details.html:76
#: templates/events/event.html:38
msgid "location"
msgstr "locatie"
#: models.py:
94
#: models.py:
87
msgid "location for minimap"
msgstr "locatie voor minimap"
#: models.py:9
6
#: models.py:
8
9
msgid ""
"Location of Huygens: Heyendaalseweg 135, Nijmegen. Location of Mercator 1: "
"Toernooiveld 212, Nijmegen. Not shown as text!!"
...
...
@@ -179,156 +179,156 @@ msgstr ""
"Locatie van ’t Huygens: Heyendaalseweg 135, Nijmegen. Locatie van Mercator "
"1: Toernooiveld 212, Nijmegen. Dit veld wordt niet getoond als tekst!!"
#: models.py:
102
templates/events/admin/details.html:78
#: models.py:
95
templates/events/admin/details.html:78
#: templates/events/event.html:43
msgid "price"
msgstr "prijs"
#: models.py:1
1
0
#: models.py:10
3
msgid "fine"
msgstr "boete"
#: models.py:1
16
#: models.py:1
09
msgid "Fine if participant does not show up (at least €5)."
msgstr "Boete als deelnemer niet komt opdagen (minimaal €5)."
#: models.py:1
2
1
#: models.py:11
4
msgid "maximum number of participants"
msgstr "maximum aantal deelnemers"
#: models.py:12
8
#: models.py:12
1
msgid "message when there is no registration"
msgstr "bericht dat getoond wordt wanneer aanmelden niet nodig is"
#: models.py:1
3
2
#: models.py:12
5
msgid "Default:"
msgstr "Standaard:"
#: models.py:1
36
#: models.py:1
29
msgid "published"
msgstr "gepubliceerd"
#: models.py:1
93
#: models.py:1
85
msgid "Can't have an event travel back in time"
msgstr "Een evenement kan niet terugreizen in de tijd"
#: models.py:19
7
#: models.py:1
8
9
msgid "The fine for this event is too low (must be at least €5)."
msgstr "De boete voor dit evenement is te laag (minimaal €5)."
#: models.py:
204
#: models.py:
196
msgid "Doesn't make sense to have this if you require registrations."
msgstr "Het is niet logisch om dit te hebben als je aanmelden vereist."
#: models.py:20
9
#: models.py:20
1
msgid "If registration is required, you need a start of registration"
msgstr ""
"Als aanmelden vereist is, dan heb je een starttijd voor de aanmeldperiode "
"nodig"
#: models.py:2
14
#: models.py:2
06
msgid "If registration is required, you need an end of registration"
msgstr ""
"Als aanmelden vereist is, dan heb je een eindtijd voor de aanmeldperiode "
"nodig"
#: models.py:21
9
#: models.py:21
1
msgid "If registration is required, you need a deadline for the cancellation"
msgstr ""
"Als aanmelden vereist is, dan heb je een eindtijd voor de aanmeldperiode "
"nodig"
#: models.py:2
24
#: models.py:2
16
msgid "The cancel deadline should be before the start of the event."
msgstr "De afmelddeadline moet voor de start van het evenement liggen."
#: models.py:22
8
#: models.py:22
0
msgid "Registration start should be before registration end"
msgstr "De starttijd voor de aanmeldperiode moet voor de eindtijd liggen"
#: models.py:25
5
#: models.py:25
1
msgid "No payment"
msgstr "Niet betaald"
#: models.py:25
6
#: models.py:25
2
msgid "Paid with cash"
msgstr "Contact betaald"
#: models.py:25
7
#: models.py:25
3
msgid "Paid with card"
msgstr "Pin betaald"
#: models.py:2
70
templates/events/admin/registrations_table.html:6
#: models.py:2
66
templates/events/admin/registrations_table.html:6
msgid "name"
msgstr "naam"
#: models.py:2
72
#: models.py:2
68
msgid "Use this for non-members"
msgstr "Gebruikt dit voor niet-leden"
#: models.py:27
7
#: models.py:27
3
msgid "registration date"
msgstr "aanmelddatum"
#: models.py:27
9
#: models.py:27
5
msgid "cancellation date"
msgstr "afmelddatum"
#: models.py:28
4
templates/events/admin/registrations_table.html:11
#: models.py:28
0
templates/events/admin/registrations_table.html:11
msgid "present"
msgstr "aanwezig"
#: models.py:2
91
#: models.py:2
87
msgid "payment"
msgstr "betaling"
#: models.py:34
4
models.py:34
5
#: models.py:34
0
models.py:34
1
msgid "Either specify a member or a name"
msgstr "Geef een lid of een naam op"
#: models.py:36
8
#: models.py:36
4
msgid "Checkbox"
msgstr "Checkbox"
#: models.py:36
9
#: models.py:36
5
msgid "Text"
msgstr "Text"
#: models.py:3
70
#: models.py:3
66
msgid "Integer"
msgstr "Integer"
#: models.py:37
5
#: models.py:37
1
msgid "field type"
msgstr "veldtype"
#: models.py:38
2
#: models.py:3
7
8
msgid "field name"
msgstr "veldnaam"
#: models.py:39
4
#: models.py:39
0
msgid "required"
msgstr "verplicht"
#: models.py:44
6
#: models.py:44
2
msgid "last changed"
msgstr "laatst aangepast"
#: services.py:
9
1
#: services.py:
8
1
msgid ""
"You cannot re-register anymore since you've cancelled after the deadline."
msgstr ""
"Je kunt je niet opnieuw aanmelden omdat je je hebt afgemeld na de deadline."
#: services.py:
10
1
#: services.py:
9
1
msgid "You were already registered."
msgstr "Je bent al aangemeld."
#: services.py:
10
3
#: services.py:
9
3
msgid "You may not register."
msgstr "Je mag je niet aanmelden."
#: services.py:1
23
services.py:1
4
3 services.py:1
71
#: services.py:1
17
services.py:13
1
services.py:1
82
msgid "You are not registered for this event."
msgstr "Je bent niet aangemeld voor dit evenement."
...
...
@@ -601,16 +601,16 @@ msgstr "Login"
msgid "You have to log in before you can register for this event."
msgstr "Je moet inloggen voordat je jezelf kunt aanmelden."
#: templates/events/event.html:13
3
#: templates/events/event.html:13
9
#, python-format
msgid "Registration will open %(datetime)s"
msgstr "Aanmelden opent %(datetime)s"
#: templates/events/event.html:1
35
#: templates/events/event.html:1
41
msgid "Registration is not possible anymore."
msgstr "Aanmelden is niet meer mogelijk."
#: templates/events/event.html:14
5
#: templates/events/event.html:14
4
#, python-format
msgid ""
"Cancellation isn't possible anymore without having to pay the full costs of €"
...
...
@@ -619,16 +619,16 @@ msgstr ""
"Afmelden is niet meer mogelijk zonder de volledige kosten van €%(costs)s te "
"betalen. Let op: je kunt je hierna niet meer aanmelden."
#: templates/events/event.html:1
60
#: templates/events/event.html:1
58
msgctxt "pizzas"
msgid "Order"
msgstr "Bestellen"
#: templates/events/event.html:17
8
#: templates/events/event.html:17
6
msgid "Registrations"
msgstr "Aanmeldingen"
#: templates/events/event.html:21
2
#: templates/events/event.html:21
0
msgid "cohort"
msgstr "cohort"
...
...
@@ -674,5 +674,8 @@ msgstr "Je afmelding was succesvol."
msgid "Registration successfully saved."
msgstr "Je afmelding is succesvol opgeslagen."
#~ msgid "Pin"
#~ msgstr "Pin"
#~ msgid "You may not register"
#~ msgstr "Je mag niet je aanmelden"
website/events/models.py
View file @
1f5fa651
...
...
@@ -243,10 +243,14 @@ class Event(models.Model, metaclass=ModelTranslateMeta):
class
Registration
(
models
.
Model
):
"""Event registrations"""
PAYMENT_CARD
=
'card_payment'
PAYMENT_CASH
=
'cash_payment'
PAYMENT_NONE
=
'no_payment'
PAYMENT_TYPES
=
(
(
'no_payment'
,
_
(
'No payment'
)),
(
'cash_payment'
,
_
(
'Paid with cash'
)),
(
'card_payment'
,
_
(
'Paid with card'
)))
(
PAYMENT_NONE
,
_
(
'No payment'
)),
(
PAYMENT_CASH
,
_
(
'Paid with cash'
)),
(
PAYMENT_CARD
,
_
(
'Paid with card'
)))
event
=
models
.
ForeignKey
(
Event
,
models
.
CASCADE
)
...
...
website/events/templates/events/admin/registrations_table.html
View file @
1f5fa651
...
...
@@ -41,9 +41,9 @@
{% endif %}
{% endfor %}
<td><input
type=
"checkbox"
{{
registration.present
|
yesno:
'
checked=
"checked"
,'
}}
data-id=
"{{ registration.id }}"
class=
"present-check"
/></td>
<td><input
type=
"radio"
name=
"payment-{{ registration.id }}"
{%
if
registration.payment =
=
'
no_payment
'
%}
checked=
"checked"
{%
endif
%}
data-value=
"
no_payment
"
data-id=
"{{ registration.id }}"
class=
"payment-radio"
/></td>
<td><input
type=
"radio"
name=
"payment-{{ registration.id }}"
{%
if
registration.payment =
=
'
cash_payment
'
%}
checked=
"checked"
{%
endif
%}
data-value=
"
cash_payment
"
data-id=
"{{ registration.id }}"
class=
"payment-radio"
/></td>
<td><input
type=
"radio"
name=
"payment-{{ registration.id }}"
{%
if
registration.payment =
=
'
card_payment
'
%}
checked=
"checked"
{%
endif
%}
data-value=
"
card_payment
"
data-id=
"{{ registration.id }}"
class=
"payment-radio"
/></td>
<td><input
type=
"radio"
name=
"payment-{{ registration.id }}"
{%
if
registration.payment =
=
registration.PAYMENT_NONE
%}
checked=
"checked"
{%
endif
%}
data-value=
"
{{ registration.PAYMENT_NONE }}
"
data-id=
"{{ registration.id }}"
class=
"payment-radio"
/></td>
<td><input
type=
"radio"
name=
"payment-{{ registration.id }}"
{%
if
registration.payment =
=
registration.PAYMENT_CASH
%}
checked=
"checked"
{%
endif
%}
data-value=
"
{{ registration.PAYMENT_CASH }}
"
data-id=
"{{ registration.id }}"
class=
"payment-radio"
/></td>
<td><input
type=
"radio"
name=
"payment-{{ registration.id }}"
{%
if
registration.payment =
=
registration.PAYMENT_CARD
%}
checked=
"checked"
{%
endif
%}
data-value=
"
{{ registration.PAYMENT_CARD }}
"
data-id=
"{{ registration.id }}"
class=
"payment-radio"
/></td>
{% if registration.date_cancelled is not None %}
<td>
{{ registration.is_late_cancellation|yesno }}
</td>
{% endif %}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment