Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
concrexit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
70
Issues
70
List
Boards
Labels
Service Desk
Milestones
Merge Requests
10
Merge Requests
10
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
thalia
concrexit
Commits
a8e7167f
Commit
a8e7167f
authored
Jun 05, 2019
by
Luko van der Maas
1
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/pizza-api' into 'master'
Fix pizza api serializers and viewsets See merge request
!1278
parents
b33e9c0f
ca6bba41
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
website/pizzas/api/serializers.py
website/pizzas/api/serializers.py
+4
-2
website/pizzas/api/viewsets.py
website/pizzas/api/viewsets.py
+2
-1
No files found.
website/pizzas/api/serializers.py
View file @
a8e7167f
...
...
@@ -37,7 +37,8 @@ class OrderSerializer(serializers.ModelSerializer):
read_only_fields
=
(
'pk'
,
'payment'
,
'name'
,
'member'
)
payment
=
PaymentTypeField
(
source
=
'payment.type'
,
choices
=
Payment
.
PAYMENT_TYPE
)
choices
=
Payment
.
PAYMENT_TYPE
,
read_only
=
True
)
class
AdminOrderSerializer
(
serializers
.
ModelSerializer
):
...
...
@@ -64,5 +65,6 @@ class AdminOrderSerializer(serializers.ModelSerializer):
).
get
(
'type'
,
instance
.
payment
.
type
)
!=
instance
.
payment
.
type
:
instance
.
payment
.
type
=
validated_data
[
'payment'
][
'type'
]
instance
.
payment
.
save
()
del
validated_data
[
'payment'
]
if
'payment'
in
validated_data
:
del
validated_data
[
'payment'
]
return
super
().
update
(
instance
,
validated_data
)
website/pizzas/api/viewsets.py
View file @
a8e7167f
...
...
@@ -8,6 +8,7 @@ from rest_framework.mixins import ListModelMixin
from
rest_framework.response
import
Response
from
rest_framework.viewsets
import
GenericViewSet
,
ModelViewSet
from
payments.models
import
Payment
from
pizzas.api
import
serializers
from
pizzas.models
import
Product
,
PizzaEvent
,
Order
from
pizzas.services
import
can_change_order
...
...
@@ -54,7 +55,7 @@ class OrderViewset(ModelViewSet):
return
Order
.
objects
.
none
()
return
Order
.
objects
.
filter
(
member
=
self
.
request
.
member
,
pa
id
=
False
,
pa
yment__type
=
Payment
.
NONE
,
pizza_event
=
event
)
return
Order
.
objects
.
filter
(
member
=
self
.
request
.
member
,
pizza_event
=
event
)
...
...
Luko van der Maas
@lukomaas
mentioned in commit
104213bb
·
Jun 05, 2019
mentioned in commit
104213bb
mentioned in commit 104213bb7e8068aa6921ca9d246633de6cc6dbc5
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