Commit Graph

112 Commits

Author SHA1 Message Date
a.gorbunov
786dbfc739 check by content_type 2020-02-05 12:47:23 +00:00
Anton Gorbunov
b778661564 Merge branch 'develop' into 'feature/bind-award-for-establishment'
# Conflicts:
#   apps/establishment/views/back.py
2020-02-05 12:44:28 +00:00
a.gorbunov
a3a66a88e6 allow bind or remove award for establishment 2020-02-05 12:31:02 +00:00
Kuroshini
96a88e2478 notification messages fix 2020-02-05 15:06:44 +03:00
Kuroshini
c9cf2672b6 establishment team role revoked email 2020-02-05 14:18:46 +03:00
Kuroshini
eb8ee67f06 dismiss from team members method 2020-02-04 19:40:30 +03:00
Kuroshini
a302e1181c team members list 2020-02-04 18:47:28 +03:00
Anatoly
c68d6ec148 fix extend guide method 2020-02-04 18:10:48 +03:00
Kuroshini
28d4122840 establishment statuses method 2020-02-04 16:23:03 +03:00
Kuroshini
94272609bf show correct positions for establishment 2020-02-03 20:57:04 +03:00
Kuroshini
b1cf952679 positions by establishment type/subtype list 2020-02-03 20:00:24 +03:00
Kuroshini
084db83c92 menu update/delete 2020-02-03 14:55:03 +03:00
Kuroshini
b1b3e923b7 create menu item for establishment 2020-02-03 14:37:17 +03:00
Kuroshini
287c538294 dish update-delete 2020-02-01 16:01:40 +03:00
Kuroshini
662a1427cd dish create view 2020-02-01 15:34:45 +03:00
Kuroshini
1876ca8c6d backoffice wine for establishment 2020-02-01 14:53:35 +03:00
Kuroshini
8488449cca card and wines getter 2020-02-01 13:32:20 +03:00
Kuroshini
a9ad3ef7e7 card_and_wines get method 2020-01-31 21:19:32 +03:00
Anatoly
8df96716cc added endpoint to add/remove establishment from guide 2020-01-31 18:25:25 +03:00
Kuroshini
202b8c8d96 menu type #2 2020-01-31 17:08:08 +03:00
Kuroshini
2e0cfabbce menu type 2020-01-31 17:06:38 +03:00
Kuroshini
e008e7f2a1 remove not sent menus 2020-01-31 14:40:02 +03:00
Kuroshini
22ee06403f menu create 2020-01-31 01:04:39 +03:00
Kuroshini
f83c7273d2 smol fixes 2020-01-31 00:27:40 +03:00
Kuroshini
ae9d505e3d create and update 2020-01-31 00:16:52 +03:00
dormantman
a0408204a1 Added MenuFiles serializer 2020-01-31 00:13:15 +03:00
Kuroshini
62eb5b0ccb get menus method 2020-01-30 22:06:56 +03:00
Kuroshini
a6fc88fdb9 lunch & diner fields 2020-01-30 21:55:20 +03:00
dormantman
b94e933cb1 Added migration 2020-01-30 20:58:45 +03:00
dormantman
14d9b32479 Revert serializer/routes/view/model 2020-01-30 20:45:07 +03:00
Anatoly
ca5440d431 refactored roles 2020-01-30 12:50:14 +03:00
Anatoly
25c63b8097 Merge branch 'develop' into feature/roles
# Conflicts:
#	apps/account/models.py
#	apps/collection/views/back.py
#	apps/comment/views/back.py
#	apps/establishment/models.py
#	apps/establishment/views/back.py
#	apps/news/views.py
#	apps/partner/views/back.py
2020-01-30 10:56:46 +03:00
Anatoly
57e63111fb intermediate commit 2020-01-30 10:28:01 +03:00
dormantman
19cf1b07d6 Added rud finding 2020-01-29 18:19:28 +03:00
dormantman
a6db15ed50 Added menu dishes 2020-01-29 16:11:53 +03:00
dormantman
bcc5f2da51 Added menus method 2020-01-29 15:17:15 +03:00
dormantman
e067e8e793 Added menu upload files 2020-01-28 18:29:02 +03:00
Anatoly
236b532d98 refactored permission classes 2020-01-28 14:54:14 +03:00
alex
193f1655e4 email cascade establishment 2020-01-28 14:36:54 +03:00
alex
a02a52f2b0 menu dishes gallery api 2020-01-28 12:49:45 +03:00
dormantman
bb38bb3393 Change api view method 2020-01-27 22:22:17 +03:00
dormantman
d51d304077 Refactor (structure) 2020-01-27 21:45:14 +03:00
Kuroshini
415c9b7851 fix 2020-01-27 21:18:48 +03:00
dormantman
095e482358 Optimize method 2020-01-27 20:59:19 +03:00
dormantman
e94787716e Change labels 2020-01-27 20:33:51 +03:00
dormantman
b687eb6024 Change format method 2020-01-27 20:29:54 +03:00
Ruslan Stepanov
1d534fe1a8 Merge branch 'develop' into 'feature/employees-params'
# Conflicts:
#   apps/establishment/serializers/back.py
#   apps/establishment/views/back.py
2020-01-27 17:04:15 +00:00
dormantman
3796a698d2 Added employee-establishment-positions method 2020-01-27 20:01:44 +03:00
Kuroshini
8a1651bf1f fix permission 2020-01-27 18:45:50 +03:00
Kuroshini
f5da5f71a3 base related qs for cities 2020-01-27 18:45:23 +03:00