Commit Graph

74 Commits

Author SHA1 Message Date
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
alex
a02a52f2b0 menu dishes gallery api 2020-01-28 12:49:45 +03:00
dormantman
e94787716e Change labels 2020-01-27 20:33:51 +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
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
d8d9a97746 remove award from employee 2020-01-23 21:02:43 +03:00
dormantman
8fb8c49bfe Added employee positions method 2020-01-22 18:48:16 +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
Kuroshini
4b45cab976 employees trigram search for back-office 2020-01-15 20:49:33 +03:00
Anatoly
0a3fe15e9c small refactoring (/.../establishments/slug/{slug}/similar/artisans/distilleries to /.../establishments/slug/{slug}/similar/producers/distilleries) 2020-01-10 17:25:27 +03:00
Anatoly
db8917e7af added two endpoints: /.../establishments/slug/{slug}/similar/producers/food/, /.../establishments/slug/{slug}/similar/artisans/distilleries/ 2020-01-10 17:25:27 +03:00
Anatoly
dbbb526902 Refactored mechanism to find similar objects. Added endpoints to product app. 2019-12-17 13:02:46 +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
Anatoly
e2ec179f69 refactored the mechanism for finding similar establishments 2019-12-12 18:10:20 +03:00
Anatoly
51da45b00b refactoring 2019-12-10 13:08:28 +03:00
Anatoly
439fb17778 Merge branch 'develop' into feature/similar-wines 2019-12-10 12:46:44 +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
Anatoly
b659308729 exclude field from Establishment serializer 2019-12-06 13:06:59 +03:00
Kuroshini
69b40f21b7 last comment for mobile establishment detail 2019-12-04 18:26:03 +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
alex
17f67d020a back carousel api and test 2019-11-25 15:00:53 +03:00
Semyon Yekhmenin
e565406729 Feature/bo employee update 2019-11-22 14:21:25 +00:00
alex
a5d5dc1335 establishment carousel web and mobile api 2019-11-22 17:13:41 +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
Anatoly
03c75efece gm-259, gm-260, gm-261 2019-10-29 17:16:39 +03:00
Anatoly
7be7315cef added filters and endpoint to get winery list 2019-10-18 18:00:57 +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
1764cfc08b added urlpath to get establishment tags to all platform 2019-10-15 12:52:21 +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
Anatoly
2191a505a5 refactored EstablishmentBase serializer 2019-10-09 14:11:53 +03:00
Anatoly
d321866dc2 gm-192: in progress 2019-10-08 15:38:35 +03:00
Anatoly
f1eec96ce8 Merge branch 'develop' into feature/gm-127
# Conflicts:
#	apps/establishment/models.py
#	apps/establishment/urls/common.py
2019-09-26 14:29:39 +03:00
Anatoly
c4d8b89a8d gm-127: finished 2019-09-26 14:19:01 +03:00
littlewolf
a2ade761b4 Update web urls 2019-09-25 14:04:52 +03:00