a.gorbunov
|
8483a56ea7
|
fix country_name for mobile
|
2020-02-07 07:53:29 +00:00 |
|
Kuroshini
|
2c3beb78d8
|
remove wrong unique constraint
|
2020-02-06 21:50:27 +03:00 |
|
Александр Пархомин
|
32439c9db6
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-02-06 18:06:46 +03:00 |
|
Александр Пархомин
|
7dec8048e1
|
add docstring for establishment schedule
|
2020-02-06 18:05:29 +03:00 |
|
Олег Хаятов
|
e656316cda
|
Merge branch 'feature/save-address-cascade' into 'develop'
cascade save address
See merge request gm/gm-backend!265
|
2020-02-06 14:55:44 +00: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 |
|
a.gorbunov
|
2235198198
|
cascade save address
|
2020-02-06 14:19:17 +00: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 |
|
Олег Хаятов
|
2ffe4bc3ea
|
Merge branch 'bug-establishment_tag_filtration' into 'develop'
bug-establishment_tag_filtration
See merge request gm/gm-backend!264
|
2020-02-06 09:07:34 +00:00 |
|
Kirill
|
89f2c3bf1d
|
remove shop category tags from serialization
|
2020-02-06 11:22:14 +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 |
|
Александр Пархомин
|
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 |
|