Commit Graph

61 Commits

Author SHA1 Message Date
Anatoly
57e63111fb intermediate commit 2020-01-30 10:28:01 +03:00
Anatoly
236b532d98 refactored permission classes 2020-01-28 14:54:14 +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
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
Dmitriy Kuzmenko
bd6f8a47a1 add api for establishment admin 2019-12-13 11:02:37 +03:00
alex
f565285abd back menu filter by establishment 2019-12-12 16:58:13 +03:00
Виктор Гладких
8e63b969bf Merge branch 'develop' into feature/permission_winery 2019-12-06 16:58:44 +03:00
Виктор Гладких
e824b5ee65 winery permission 2019-12-06 16:51:57 +03:00
d.kuzmenko
29d05929ff Merge branch 'fix/backoffice-slug-url' into 'develop'
Fix/backoffice slug url

See merge request gm/gm-backend!169
2019-12-06 11:15:16 +00:00
Виктор Гладких
d0378ad14e Fix options 2019-12-04 17:27:51 +03:00
dormantman
a81f3f079a Changed url id to slug in back-office 2019-12-04 13:37:49 +03:00
Semyon Yekhmenin
1711057cee Feature/bo establishment employee features 2019-11-25 12:15:51 +00:00
Semyon Yekhmenin
e565406729 Feature/bo employee update 2019-11-22 14:21:25 +00:00
Anatoly
617552841f refactored product, fix transfer and etc., see changelist 2019-11-21 09:58:43 +03:00
Anatoly
1a1a2a2d24 added bo endpoints for establishment notes 2019-11-20 09:43:45 +03:00
Anatoly
0d9d45bcc5 added model Product and bo endpoints 2019-11-18 17:58:46 +03:00
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
alex
e49d62de5d social choice api and test 2019-11-14 09:53:36 +03:00
evgeniy-st
568ec84da0 Added filter class to EstalibshmentListCreateView 2019-11-05 16:20:24 +03:00
Виктор Гладких
264e7bcb2a Fix conflict 2019-10-21 14:43:14 +03:00
Виктор Гладких
5ad3776fe3 establishment manager 2019-10-16 12:14:13 +03:00
Виктор Гладких
86692019d1 Add Country admin to views 2019-10-16 10:14:23 +03:00
evgeniy-st
9d4c483f51 clean models (tags) 2019-10-15 18:25:09 +03:00
evgeniy-st
60cdec99e0 refactor tags 2019-10-15 17:17:03 +03:00
Anatoly
469f7bdf4c added prefetch select related 2019-10-14 12:24:26 +03:00
Anatoly
9e237d4657 removed endpoint to display a list of tags by establishment id, added instead filter to filter tags by establishment id 2019-10-14 11:40:03 +03:00
Anatoly
47993a7155 added endpoint ot get list of tag categories with tags by establishment type 2019-10-14 10:22:17 +03:00
Anatoly
cb762ce746 added param to attr for Establoishment model and small refactoring, boost queries 2019-10-11 18:26:13 +03:00
Anatoly
ddb3eec679 finished endpoint to get tags by establishment type and subtype 2019-10-11 15:41:31 +03:00
Anatoly
f83b735eb3 changed files 2019-10-10 15:10:43 +03:00