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
5fb3d4f4
Commit
5fb3d4f4
authored
Mar 04, 2020
by
Gijs Hendriksen
Browse files
Fix crash when pizza event admin orders pizza
parent
7255f425
Changes
1
Hide whitespace changes
Inline
Side-by-side
website/pizzas/api/serializers.py
View file @
5fb3d4f4
...
...
@@ -46,7 +46,9 @@ class AdminOrderSerializer(serializers.ModelSerializer):
model
=
Order
fields
=
(
"pk"
,
"payment"
,
"product"
,
"name"
,
"member"
,
"display_name"
)
payment
=
PaymentTypeField
(
source
=
"payment.type"
,
choices
=
Payment
.
PAYMENT_TYPE
)
payment
=
PaymentTypeField
(
source
=
"payment.type"
,
choices
=
Payment
.
PAYMENT_TYPE
,
required
=
False
)
display_name
=
serializers
.
SerializerMethodField
(
"_display_name"
)
def
_display_name
(
self
,
instance
):
...
...
@@ -66,6 +68,18 @@ class AdminOrderSerializer(serializers.ModelSerializer):
attrs
[
"member"
]
=
self
.
context
[
"request"
].
member
return
super
().
validate
(
attrs
)
def
create
(
self
,
validated_data
:
Any
)
->
Any
:
if
"payment"
in
validated_data
:
payment_type
=
validated_data
[
"payment"
].
get
(
"type"
,
Payment
.
NONE
)
del
validated_data
[
"payment"
]
else
:
payment_type
=
Payment
.
NONE
instance
=
super
().
create
(
validated_data
)
instance
.
payment
.
type
=
payment_type
instance
.
payment
.
save
()
return
instance
def
update
(
self
,
instance
:
Model
,
validated_data
:
Any
)
->
Any
:
if
(
validated_data
.
get
(
"payment"
,
{}).
get
(
"type"
,
instance
.
payment
.
type
)
...
...
Sébastiaan Versteeg
@sversteeg
mentioned in commit
aea794cd
·
Mar 04, 2020
mentioned in commit
aea794cd
mentioned in commit aea794cdc25ee2973ff5eebbca64eaff5950de14
Toggle commit list
Write
Preview
Markdown
is supported
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