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 |
|
Anatoly
|
061c96d198
|
refactored a little, added Gin indexes to account.User model.
|
2020-02-05 17:59:06 +03:00 |
|
Kuroshini
|
285f52ce30
|
establishment back list add toque number and public_mark
|
2020-02-05 17:46:14 +03:00 |
|
alex
|
590292919b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-02-05 17:32:45 +03:00 |
|
alex
|
10b9c36edb
|
fix unconfirmed_email
|
2020-02-05 17:31:13 +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 |
|
Anatoly
|
16ed67f9b1
|
refactored doc-string
|
2020-02-05 16:58:41 +03:00 |
|
Anatoly
|
8eb07205e1
|
added report app
|
2020-02-05 16:46:30 +03:00 |
|
Kuroshini
|
ab3666b03d
|
fix news states
|
2020-02-05 16:29:13 +03:00 |
|
Kuroshini
|
ce9aa30074
|
change news states
|
2020-02-05 16:12:28 +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
|
6d556665e0
|
apply user role
|
2020-02-05 14:23:37 +03:00 |
|
Kuroshini
|
c9cf2672b6
|
establishment team role revoked email
|
2020-02-05 14:18:46 +03:00 |
|
Anatoly
|
6d9852fc7b
|
added guide type filter to guide list view
|
2020-02-05 14:16:36 +03:00 |
|
Anatoly
|
34adf748ed
|
fix location integration with ruby script
|
2020-02-05 13:58:48 +03:00 |
|
Kuroshini
|
8e22119de9
|
team
|
2020-02-05 13:32:50 +03:00 |
|
Anatoly
|
b421b934c1
|
refactored guides
|
2020-02-05 12:16:07 +03:00 |
|
Kuroshini
|
ec1caeced3
|
invite existing user email
|
2020-02-04 22:02:40 +03:00 |
|
Kuroshini
|
1c5976896b
|
fix hardcode
|
2020-02-04 21:32:39 +03:00 |
|
Kuroshini
|
fd4b6a68b1
|
email on new user
|
2020-02-04 21:30:19 +03:00 |
|
Kuroshini
|
d2440f5bf1
|
clean unaccepted invites task
|
2020-02-04 20:26:39 +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
|
68ceb44acf
|
fix guide
|
2020-02-04 18:42:03 +03:00 |
|
Kuroshini
|
49d6a983d9
|
new user for team w/ confirmed email
|
2020-02-04 18:26:00 +03:00 |
|
Kuroshini
|
fc0cf3e25b
|
invite team member route
|
2020-02-04 18:22:03 +03:00 |
|
Kuroshini
|
2db59131a8
|
migration for team
|
2020-02-04 18:20:23 +03:00 |
|
Anatoly
|
c68d6ec148
|
fix extend guide method
|
2020-02-04 18:10:48 +03:00 |
|
alex
|
e7759ada27
|
AwardType List filters
|
2020-02-04 17:40:07 +03:00 |
|
alex
|
6a0943b0de
|
years field in award type serializer
|
2020-02-04 17:22:37 +03:00 |
|
alex
|
0c87e3cd25
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-02-04 17:19:18 +03:00 |
|
alex
|
8f899905ec
|
years for award types
|
2020-02-04 17:19:09 +03:00 |
|
Anatoly
|
37eef69ee2
|
fix view
|
2020-02-04 17:16:31 +03:00 |
|
Anatoly
|
b7a84a147c
|
small fix
|
2020-02-04 17:11:06 +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 |
|
alex
|
5687eff646
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-02-04 16:01:40 +03:00 |
|
alex
|
9177d41309
|
refactor location transfer
|
2020-02-04 16:01:31 +03:00 |
|
Олег Хаятов
|
6bf5b2a75b
|
Merge branch 'bug-published_comments_not_displayed_v2' into 'develop'
filtration only in moderation v2
See merge request gm/gm-backend!261
|
2020-02-04 12:53:50 +00:00 |
|
a.gorbunov
|
a23c50a130
|
available_for_events not required
|
2020-02-04 12:53:08 +00:00 |
|
Kirill
|
6030b438a0
|
filtration only in moderation v2
|
2020-02-04 15:50:57 +03:00 |
|
Kuroshini
|
5aa74ff7c9
|
fix positions by establishment type/subtype
|
2020-02-04 15:42:15 +03:00 |
|
Олег Хаятов
|
9982c2ca77
|
Merge branch 'bug-published_comments_not_displayed_v2' into 'develop'
published_comments_not_displayed
See merge request gm/gm-backend!260
|
2020-02-04 12:13:44 +00:00 |
|
Anatoly
|
b286bbb1fa
|
added migrations, refactored establishment serializers
|
2020-02-04 15:07:58 +03:00 |
|
Kirill
|
f3a5605111
|
filtration only in moderation
|
2020-02-04 15:05:59 +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 |
|
Anatoly
|
25e829e629
|
added filtering by establishment id in /api/back/collections/guides/all/
|
2020-02-04 12:11:56 +03:00 |
|
Anatoly
|
04c6948539
|
added endpoint /api/back/collections/guides/all/,
revert pagination in /api/back/collections/guides/
|
2020-02-04 11:36:46 +03:00 |
|
Anatoly
|
9bfba9af70
|
refactored a little guide list view
|
2020-02-04 10:50:52 +03:00 |
|
Anatoly
|
7cbfeb9845
|
added filtering by country code
|
2020-02-04 10:40:22 +03:00 |
|
Anatoly
|
87686abbb7
|
disable counter for guide elements
|
2020-02-04 10:40:22 +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 |
|
Олег Хаятов
|
122680af0b
|
Merge branch 'bug-country_code_filtration' into 'develop'
bug-country_code_filtration
See merge request gm/gm-backend!258
|
2020-02-03 16:33:09 +00:00 |
|
dormantman
|
65ace7fb88
|
Added nullable
|
2020-02-03 19:18:50 +03:00 |
|
Kirill
|
fd6aced51e
|
filtration by country code
|
2020-02-03 19:18:23 +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 |
|
Anatoly
|
400b5ac402
|
change display_country_code type of returning value, refactored create guide method, added filtering award type list, change name of username_random -> string_random
|
2020-02-03 17:16:40 +03:00 |
|
alex
|
4d52ec57c4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-02-03 16:57:09 +03:00 |
|
alex
|
2a9ef2c704
|
refactor location transfer 1
|
2020-02-03 16:57:00 +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
|
6c7b7ff19e
|
fix permissions
|
2020-02-03 13:14:00 +03:00 |
|
Anatoly
|
a5bc5e98d1
|
refactored serializers that retrieving phone numbers
|
2020-02-03 13:11:13 +03:00 |
|
Anatoly
|
15b8241213
|
refactored serializers that retrieving phone numbers
|
2020-02-03 13:11:13 +03:00 |
|
alex
|
3c56b0c061
|
refactor account transfer
|
2020-02-03 12:32:53 +03:00 |
|
Олег Хаятов
|
33942b70b5
|
Merge branch 'bug-only_waiting_comments_v2' into 'develop'
bug-only_waiting_comments_v2
See merge request gm/gm-backend!256
|
2020-02-03 09:00:25 +00:00 |
|
Anatoly
|
227b3746ca
|
fix city transfer
|
2020-02-03 11:03:38 +03:00 |
|
Kirill
|
8d8a5f50fb
|
move comments filtration from model to view
|
2020-02-03 10:46:44 +03:00 |
|
Олег Хаятов
|
2dc1674f81
|
Merge branch 'bug-collections_sorting' into 'develop'
bug-collections_sorting
See merge request gm/gm-backend!255
|
2020-02-03 07:21:39 +00: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 |
|
dormantman
|
f67c8b08a5
|
Alter comment validator
|
2020-01-31 20:50:08 +03:00 |
|
Kuroshini
|
2f4bda9a3a
|
fix comments mark transfer
|
2020-01-31 20:32:18 +03:00 |
|
dormantman
|
a544810cac
|
Alter location field
|
2020-01-31 19:10:40 +03:00 |
|
Kuroshini
|
1794de6d15
|
news transfer fix
|
2020-01-31 18:52:19 +03:00 |
|
Kuroshini
|
45f09094f8
|
try to return recipes
|
2020-01-31 18:45:20 +03:00 |
|
Anatoly
|
8df96716cc
|
added endpoint to add/remove establishment from guide
|
2020-01-31 18:25:25 +03:00 |
|
Kirill
|
97588f1efc
|
change start to created sorting
|
2020-01-31 17:57:31 +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
|
cfba383940
|
refactored menu models
|
2020-01-31 17:01:05 +03:00 |
|
Олег Хаятов
|
6d9983ad3f
|
Merge branch 'feature/agenda-fields' into 'develop'
Added fields separation
See merge request gm/gm-backend!254
|
2020-01-31 13:23:22 +00:00 |
|
dormantman
|
77129ec7ce
|
Alter serializer transliterated_name field
|
2020-01-31 15:48:24 +03:00 |
|
dormantman
|
b309d69079
|
Alter serializer location field
|
2020-01-31 15:44:44 +03:00 |
|
dormantman
|
1f887b3367
|
Added fields separation
|
2020-01-31 15:33:25 +03:00 |
|
Anatoly
|
b518faaf8b
|
added DEFAULT_CALLING_CODE_ANTILLES_GUYANE_WEST_INDIES param, refactored serializers
|
2020-01-31 14:52:35 +03:00 |
|
Kuroshini
|
e008e7f2a1
|
remove not sent menus
|
2020-01-31 14:40:02 +03:00 |
|
Anatoly
|
421ec5c73c
|
refactored serializer
|
2020-01-31 13:50:42 +03:00 |
|
Kuroshini
|
4a1e0a347c
|
remove pagination for tag categories in BO
|
2020-01-31 13:47:50 +03:00 |
|
Anatoly
|
08831de43a
|
refactored a little
|
2020-01-31 13:43:44 +03:00 |
|
Anatoly
|
095cc2cb91
|
fix
|
2020-01-31 13:38:07 +03:00 |
|
Anatoly
|
fb1eee3e4c
|
added hardcoded calling number for Antilles Guyane West Indies islands
|
2020-01-31 13:36:41 +03:00 |
|
Anatoly
|
11e037f699
|
modified permissions for tags
|
2020-01-31 13:21:00 +03:00 |
|
Anatoly
|
2544f8ef5b
|
added flag is_superuser to UserDetailView
|
2020-01-31 13:06:03 +03:00 |
|
Anton Gorbunov
|
ac53543dc7
|
Merge branch 'bug/fix-related-objects-for-collections' into 'develop'
check before get related_objects
See merge request gm/gm-backend!252
|
2020-01-31 08:49:15 +00:00 |
|
a.gorbunov
|
4ba2edecd0
|
check before get related_objects
|
2020-01-31 08:48:36 +00:00 |
|
Kuroshini
|
c6413c7493
|
subtypes for establishment back
|
2020-01-31 11:42:44 +03:00 |
|
Anatoly
|
57cf90c631
|
added merge migrations
|
2020-01-31 11:35:49 +03:00 |
|
Anatoly
|
45f65658f0
|
added "status" field to Establishment model, refactored serializers and filters associated with field "is_publish", modified transfer
|
2020-01-31 11:34:06 +03:00 |
|
alex
|
d3bf68ab09
|
add_confirmed_at command
|
2020-01-31 11:25:38 +03:00 |
|
alex
|
c3cc87507e
|
confirmed at for csv users
|
2020-01-31 09:03:15 +03:00 |
|
dormantman
|
982a52ab96
|
Added guides binding objects
|
2020-01-31 04:29:50 +03:00 |
|
Kuroshini
|
22ee06403f
|
menu create
|
2020-01-31 01:04:39 +03:00 |
|
dormantman
|
4d2d08a6f4
|
Added auto type
|
2020-01-31 00:35:51 +03:00 |
|
Kuroshini
|
f83c7273d2
|
smol fixes
|
2020-01-31 00:27:40 +03:00 |
|
Kuroshini
|
10620ac881
|
fix set uploaded files #2
|
2020-01-31 00:16:52 +03:00 |
|
Kuroshini
|
47f8905832
|
fix set uploaded files
|
2020-01-31 00:16:52 +03:00 |
|
Kuroshini
|
ae9d505e3d
|
create and update
|
2020-01-31 00:16:52 +03:00 |
|
Kuroshini
|
39cdd18392
|
fix serializer
|
2020-01-31 00:16:52 +03:00 |
|
Kuroshini
|
e1b3908e00
|
serializer for menu uploads BO
|
2020-01-31 00:16:15 +03:00 |
|
dormantman
|
a0408204a1
|
Added MenuFiles serializer
|
2020-01-31 00:13:15 +03:00 |
|
dormantman
|
fbed631f40
|
Merge branch 'feature/menus-for-dima' of https://gl.id-east.ru/gm/gm-backend into feature/menus-for-dima
Conflicts:
apps/establishment/serializers/back.py
|
2020-01-30 22:25:25 +03:00 |
|
dormantman
|
5aa831ee3c
|
Added MenuFiles serializer
|
2020-01-30 22:16:11 +03:00 |
|
Kuroshini
|
3e0c05c541
|
fix serializer
|
2020-01-30 22:11:07 +03:00 |
|
Kuroshini
|
62eb5b0ccb
|
get menus method
|
2020-01-30 22:06:56 +03:00 |
|
Kuroshini
|
a6fc88fdb9
|
lunch & diner fields
|
2020-01-30 21:55:20 +03:00 |
|
dormantman
|
07cfcb08d7
|
Added uploads to menu
|
2020-01-30 21:49:31 +03:00 |
|
dormantman
|
b94e933cb1
|
Added migration
|
2020-01-30 20:58:45 +03:00 |
|
dormantman
|
14d9b32479
|
Revert serializer/routes/view/model
|
2020-01-30 20:45:07 +03:00 |
|
Kuroshini
|
bf941d8755
|
fix agenda migration
|
2020-01-30 19:48:21 +03:00 |
|