Skip to content
GitLab
Menu
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
49750604
Commit
49750604
authored
Feb 13, 2019
by
Luko van der Maas
Browse files
Merge branch 'fix/payment-obj' into 'master'
Fix registration payment object migration values See merge request
!1153
parents
6db3db12
a43f5fc8
Changes
2
Show whitespace changes
Inline
Side-by-side
website/events/migrations/0034_registration_payment_obj.py
View file @
49750604
...
...
@@ -22,8 +22,9 @@ class Migration(migrations.Migration):
amount
=
reg
.
event
.
price
,
paid_by
=
reg
.
member
,
processing_date
=
reg
.
event
.
start
,
notes
=
f
'Event registration
{
reg
.
event
}
. '
f
'Registration:
{
reg
}
'
notes
=
f
'Event registration
{
reg
.
event
.
title_en
}
'
f
'
{
reg
.
event
.
start
}
. '
f
'Registration:
{
reg
.
date
}
'
)
reg
.
save
()
...
...
website/events/services.py
View file @
49750604
...
...
@@ -257,8 +257,9 @@ def update_registration_by_organiser(registration, member, data):
registration
.
payment
=
Payment
.
objects
.
create
(
amount
=
registration
.
event
.
price
,
paid_by
=
registration
.
member
,
notes
=
(
f
'Event registration
{
registration
.
event
.
title_en
}
. '
f
'Registration date:
{
registration
.
date
}
'
),
notes
=
(
f
'Event registration
{
registration
.
event
.
title_en
}
'
f
'
{
registration
.
event
.
start
}
. '
f
'Registration date:
{
registration
.
date
}
.'
),
processed_by
=
member
,
type
=
data
[
'payment'
][
'type'
]
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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