Commit Graph

672 Commits

Author SHA1 Message Date
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
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
cfba383940 refactored menu models 2020-01-31 17:01:05 +03:00
dormantman
77129ec7ce Alter serializer transliterated_name field 2020-01-31 15:48:24 +03:00
Kuroshini
e008e7f2a1 remove not sent menus 2020-01-31 14:40:02 +03: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
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
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
7541909390 added merge migration 2020-01-30 16:19:15 +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
7378d6d253 Merge branch 'feature/roles' into develop 2020-01-30 13:08:26 +03:00
Anatoly
ca5440d431 refactored roles 2020-01-30 12:50:14 +03:00
alex
13968b3ed7 type read only 2020-01-30 11:21:14 +03:00
alex
8137bf0f68 fix establishment socials read_only 2020-01-30 11:09:12 +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
Олег Хаятов
0e7fd39d37 Merge branch 'feature/bo-menus' into 'develop'
Feature/bo menus

See merge request gm/gm-backend!247
2020-01-29 15:54:44 +00:00