Commit Graph

711 Commits

Author SHA1 Message Date
Александр Пархомин
2151c36d92 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-02-05 18:25:10 +03:00
Александр Пархомин
06a215060f add docstring for establishment from carousel 2020-02-05 18:24:54 +03:00
Kuroshini
0ab947f5bb establishment address for BO list 2020-02-05 18:00:11 +03:00
Kuroshini
285f52ce30 establishment back list add toque number and public_mark 2020-02-05 17:46:14 +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
bf3a88fe57 cleanup code 2020-02-05 12:50:42 +00: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
Anatoly
1c6ec90fbf added an endpoint that return an array of country calling codes /api/back/location/countries/calling-codes/ 2020-02-04 17:02:02 +03:00
Kuroshini
28d4122840 establishment statuses method 2020-02-04 16:23:03 +03:00
a.gorbunov
b74590ce75 remove allow null for available_for_events 2020-02-04 13:12:51 +00:00
a.gorbunov
ee8dc65f0b available_for_events allow null 2020-02-04 13:08:19 +00:00
Kuroshini
e633b4f5f5 subtypes to establishments list 2020-02-04 16:05:31 +03:00
a.gorbunov
a23c50a130 available_for_events not required 2020-02-04 12:53:08 +00:00
Kuroshini
5aa74ff7c9 fix positions by establishment type/subtype 2020-02-04 15:42:15 +03:00
Anatoly
b286bbb1fa added migrations, refactored establishment serializers 2020-02-04 15:07:58 +03:00
Kuroshini
11cd688851 merge migrations 2020-02-04 14:36:33 +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
Anatoly
d0311ec974 fix field name in serializer 2020-02-04 13:28:11 +03:00
Kuroshini
8820988196 fix establishment slugification 2020-02-04 13:27:35 +03:00
Kuroshini
056fbb4eed fix issue w/ transliterated name 2020-02-04 12:54:14 +03:00
Kuroshini
6811a5b6c0 establishment slug from index_name 2020-02-04 12:41:53 +03:00
Kuroshini
223f5217a2 sort positions 2020-02-03 21:23:02 +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
b4cdb2dc5b positions are binded to est type/subtype 2020-02-03 19:16:33 +03:00
Kuroshini
ab2affe305 fix transliterated name 2020-02-03 18:04:27 +03:00
Kuroshini
bf0a0b42a9 some fixes & migrations 2020-02-03 17:56:05 +03:00
Kuroshini
28253d74c4 remove currency code 2020-02-03 16:11:11 +03:00
Kuroshini
b062d0b729 refactor plates 2020-02-03 16:09:25 +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
Anatoly
831b043a48 refactored serializers that retrieving phone numbers 2020-02-03 14:13:45 +03:00
Anatoly
15b8241213 refactored serializers that retrieving phone numbers 2020-02-03 13:11:13 +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
804164833a fix typo 2020-02-01 14:02:29 +03:00
Kuroshini
cbad99e3ac read file name 2020-02-01 13:58:42 +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