Commit Graph

194 Commits

Author SHA1 Message Date
Anatoly
82e7262fdf modified documentation strings for creating establishment schedule 2020-02-07 15:28:59 +03:00
alex
e0cbf1115b Merge remote-tracking branch 'origin/develop' into develop 2020-02-07 15:03:07 +03:00
alex
955527a2c1 employee for admin 2020-02-07 15:02:58 +03:00
Kuroshini
9084fbeab6 reviews or bo list 2020-02-07 14:25:57 +03:00
alex
6feb67b0b5 GET carousel for BO 2020-02-07 13:43:20 +03:00
Александр Пархомин
60fd0d3aa4 add docstring for email 2020-02-07 11:09:01 +03:00
Александр Пархомин
7dec8048e1 add docstring for establishment schedule 2020-02-06 18:05:29 +03:00
Александр Пархомин
bb040fffdf Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-02-06 17:45:25 +03:00
Александр Пархомин
f6d41f878f add docstring for establishment type 2020-02-06 17:45:01 +03:00
Kuroshini
c8d2884a48 filter employees by country for BO 2020-02-06 15:17:21 +03:00
Anatoly
0104400dbd added documentation for employees 2020-02-06 14:54:29 +03:00
Anatoly
cd766e6bbf added documentation for /api/back/establishments/<id>/employees/ 2020-02-06 13:12:10 +03:00
Anatoly
8993ec1097 added documentation for /api/back/establishments/employees/<id>/ 2020-02-06 11:19:41 +03:00
Kuroshini
d234214467 more detailed address information 2020-02-05 18:46:17 +03:00
Александр Пархомин
8aa7f89fe2 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-02-05 18:42:54 +03:00
Александр Пархомин
f87278a4dc add docstring for establishment subtype by id 2020-02-05 18:42:42 +03:00
Kuroshini
9a493545d8 types 2020-02-05 18:39:22 +03:00
Александр Пархомин
b679fdab56 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-02-05 18:37:38 +03:00
Александр Пархомин
58c4ab8788 add docstring for establishment subtype 2020-02-05 18:37:22 +03:00
Anatoly
a54bc86d20 added documentation for /api/back/establishments/employees/ (GET, POST) 2020-02-05 18:28:08 +03:00
Александр Пархомин
06a215060f add docstring for establishment from carousel 2020-02-05 18:24:54 +03:00
Александр Пархомин
b859792b8c Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-02-05 17:05:24 +03:00
Александр Пархомин
20096fee8d add docstring for establishment by slug 2020-02-05 17:05:00 +03:00
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
Олег Хаятов
d5b5149fb0 Merge branch 'feature/establishment_fields' into 'develop'
added new fields

See merge request gm/gm-backend!259
2020-02-04 11:34:44 +00:00
a.gorbunov
26b76c0b8c Optimize query 2020-02-04 11:31:13 +00:00
a.gorbunov
990b15f1d7 added new fields 2020-02-04 11:11:52 +00: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