Kuroshini
|
2c3beb78d8
|
remove wrong unique constraint
|
2020-02-06 21:50:27 +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 |
|
a.gorbunov
|
a3a66a88e6
|
allow bind or remove award for establishment
|
2020-02-05 12:31:02 +00:00 |
|
Kuroshini
|
e633b4f5f5
|
subtypes to establishments list
|
2020-02-04 16:05:31 +03: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 |
|
Олег Хаятов
|
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
|
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
|
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
|
b062d0b729
|
refactor plates
|
2020-02-03 16:09:25 +03:00 |
|
Anatoly
|
15b8241213
|
refactored serializers that retrieving phone numbers
|
2020-02-03 13:11:13 +03:00 |
|
Kuroshini
|
662a1427cd
|
dish create view
|
2020-02-01 15:34:45 +03:00 |
|
Kuroshini
|
8488449cca
|
card and wines getter
|
2020-02-01 13:32:20 +03:00 |
|
Kuroshini
|
cfba383940
|
refactored menu models
|
2020-01-31 17:01:05 +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 |
|
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 |
|
Anatoly
|
ced3abe3cf
|
added command to set the calling code for countries, modified setup_clean_db transfer, modified serializers
|
2020-01-30 17:57:53 +03:00 |
|
Anatoly
|
e6de2cc4f9
|
fix method
|
2020-01-30 16:28:32 +03:00 |
|
Anatoly
|
13cc40c19c
|
added transfer for table - a la cartes
|
2020-01-30 16:17:30 +03:00 |
|
dormantman
|
f05fab8329
|
Reformat establishment back serializer
|
2020-01-30 15:07:46 +03:00 |
|
Anatoly
|
469a80339a
|
replaced checking is_staff on is_superuser
|
2020-01-30 14:33:11 +03:00 |
|
Anatoly
|
ca5440d431
|
refactored roles
|
2020-01-30 12:50:14 +03:00 |
|
Anatoly
|
25c63b8097
|
Merge branch 'develop' into feature/roles
# Conflicts:
# apps/account/models.py
# apps/collection/views/back.py
# apps/comment/views/back.py
# apps/establishment/models.py
# apps/establishment/views/back.py
# apps/news/views.py
# apps/partner/views/back.py
|
2020-01-30 10:56:46 +03:00 |
|
Anatoly
|
57e63111fb
|
intermediate commit
|
2020-01-30 10:28:01 +03:00 |
|
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 |
|
dormantman
|
d0e75ca07c
|
Added instagram/western_name fields
|
2020-01-28 15:46:23 +03:00 |
|
Anatoly
|
236b532d98
|
refactored permission classes
|
2020-01-28 14:54:14 +03:00 |
|
alex
|
193f1655e4
|
email cascade establishment
|
2020-01-28 14:36:54 +03:00 |
|
alex
|
c0f3aca532
|
menu gallery
|
2020-01-28 12:16:56 +03:00 |
|
Anatoly
|
38a6508396
|
modified role model
|
2020-01-24 18:04:32 +03:00 |
|
alex
|
ec351bf12a
|
fix plate
|
2020-01-24 16:44:16 +03:00 |
|
alex
|
34055d3669
|
fix plate_set
|
2020-01-24 13:31:00 +03:00 |
|
alex
|
29a7fb82ce
|
dishes menu list-create
|
2020-01-24 10:21:35 +03:00 |
|
alex
|
9b6918b3b0
|
menu old_id for transfer
|
2020-01-24 08:59:11 +03:00 |
|
Kuroshini
|
d8d9a97746
|
remove award from employee
|
2020-01-23 21:02:43 +03:00 |
|
alex
|
7391463f5a
|
uploads model for menu
|
2020-01-23 14:47:55 +03:00 |
|
alex
|
874de420f6
|
drinks and schedule for menu
|
2020-01-23 14:17:29 +03:00 |
|