Commit Graph

87 Commits

Author SHA1 Message Date
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
dormantman
d2f04d4958 Reformat method structure 2020-01-25 00:42:00 +03:00
dormantman
809b5ccab7 Fixed employee establishments method 2020-01-24 22:33:39 +03:00
Anatoly
38a6508396 modified role model 2020-01-24 18:04:32 +03:00
Kuroshini
5353c5a67c fix award unbind 2020-01-24 15:46:07 +03:00
alex
a195ed3a53 menu dishes rud 2020-01-24 10:35:55 +03:00
alex
29a7fb82ce dishes menu list-create 2020-01-24 10:21:35 +03:00
Kuroshini
34977db805 fix permission 2020-01-23 21:03:24 +03:00
Kuroshini
d8d9a97746 remove award from employee 2020-01-23 21:02:43 +03:00
alex
e5faa90c76 multiply filters for employee 2020-01-23 13:54:36 +03:00
dormantman
8fb8c49bfe Added employee positions method 2020-01-22 18:48:16 +03:00
dormantman
0688c622cc Fixed structure view 2020-01-21 19:28:29 +03:00
dormantman
88e488e481 Added employee establishments method 2020-01-21 19:19:38 +03:00
alex
61c47e4c79 establishment employee position delete view 2020-01-21 08:17:03 +03:00
alex
215e7b5f19 establishment employee list 2020-01-20 12:13:50 +03:00
Kuroshini
a05db696b0 optimize db queries on /api/back/establishments/employees 2020-01-17 19:08:33 +03:00
alex
a8ea238bfc some optimize for employee list 2020-01-17 16:02:00 +03:00
alex
4a7eb22291 order by position for establishment employee 2020-01-17 14:02:46 +03:00
alex
a915cff73d photo for employee 2020-01-17 13:56:58 +03:00
alex
0695cdce6b available_for_events field for employee 2020-01-17 11:36:13 +03:00
alex
4880b2629d select_related for establishment types serializers 2020-01-17 09:54:05 +03:00
alex
85e5537b82 prefetch_related for employee serializers 2020-01-17 09:43:13 +03:00
Kuroshini
4b45cab976 employees trigram search for back-office 2020-01-15 20:49:33 +03:00
alex
d1572cbb56 rm publish filter from BO establishment api 2020-01-13 11:25:22 +03:00
Dmitriy Kuzmenko
5041798020 add pagination for employee 2020-01-09 17:47:09 +03:00
Dmitriy Kuzmenko
6e72c7c0e4 merge with debelop 2019-12-13 15:47:05 +03:00