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 |
|
dormantman
|
e9646acfe1
|
Add migration
|
2020-01-29 18:38:15 +03:00 |
|
dormantman
|
19cf1b07d6
|
Added rud finding
|
2020-01-29 18:19:28 +03:00 |
|
Anatoly
|
302e22045e
|
fixes
|
2020-01-29 16:59:16 +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 |
|
Kuroshini
|
63fa81385e
|
western_name creation
|
2020-01-29 14:41:34 +03:00 |
|
alex
|
d9ff3227dc
|
address read only
|
2020-01-28 18:54:27 +03:00 |
|
dormantman
|
e067e8e793
|
Added menu upload files
|
2020-01-28 18:29:02 +03:00 |
|
Anatoly
|
61d2f6ec46
|
added filter - establishment_id, refactored guide counters
|
2020-01-28 17:52:49 +03:00 |
|
dormantman
|
191c168c99
|
Added migrations
|
2020-01-28 15:49:50 +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
|
a02a52f2b0
|
menu dishes gallery api
|
2020-01-28 12:49:45 +03:00 |
|
alex
|
c0f3aca532
|
menu gallery
|
2020-01-28 12:16:56 +03:00 |
|
dormantman
|
bb38bb3393
|
Change api view method
|
2020-01-27 22:22:17 +03:00 |
|
dormantman
|
d51d304077
|
Refactor (structure)
|
2020-01-27 21:45:14 +03:00 |
|
Kuroshini
|
415c9b7851
|
fix
|
2020-01-27 21:18:48 +03:00 |
|
dormantman
|
095e482358
|
Optimize method
|
2020-01-27 20:59:19 +03:00 |
|
dormantman
|
e94787716e
|
Change labels
|
2020-01-27 20:33:51 +03:00 |
|
dormantman
|
b687eb6024
|
Change format method
|
2020-01-27 20:29:54 +03:00 |
|
Ruslan Stepanov
|
1d534fe1a8
|
Merge branch 'develop' into 'feature/employees-params'
# Conflicts:
# apps/establishment/serializers/back.py
# apps/establishment/views/back.py
|
2020-01-27 17:04:15 +00:00 |
|
dormantman
|
f45eae56e9
|
Added new features
|
2020-01-27 20:03:42 +03:00 |
|
dormantman
|
3796a698d2
|
Added employee-establishment-positions method
|
2020-01-27 20:01:44 +03:00 |
|
Kuroshini
|
8a1651bf1f
|
fix permission
|
2020-01-27 18:45:50 +03:00 |
|
Kuroshini
|
f5da5f71a3
|
base related qs for cities
|
2020-01-27 18:45:23 +03:00 |
|
dormantman
|
d2f04d4958
|
Reformat method structure
|
2020-01-25 00:42:00 +03:00 |
|
dormantman
|
dd49ee7b6c
|
Reformat restaurant to name
|
2020-01-24 22:37:06 +03:00 |
|
dormantman
|
809b5ccab7
|
Fixed employee establishments method
|
2020-01-24 22:33:39 +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 |
|
Kuroshini
|
5353c5a67c
|
fix award unbind
|
2020-01-24 15:46:07 +03:00 |
|
alex
|
34055d3669
|
fix plate_set
|
2020-01-24 13:31:00 +03:00 |
|
alex
|
a195ed3a53
|
menu dishes rud
|
2020-01-24 10:35:55 +03:00 |
|
alex
|
22b1b3064d
|
is_drinks_included and last_update in serializer
|
2020-01-24 10:31:07 +03:00 |
|
alex
|
29a7fb82ce
|
dishes menu list-create
|
2020-01-24 10:21:35 +03:00 |
|
alex
|
792c11e128
|
transfer formulas menu
|
2020-01-24 09:20:22 +03:00 |
|
alex
|
9b6918b3b0
|
menu old_id for transfer
|
2020-01-24 08:59:11 +03:00 |
|
Kuroshini
|
34977db805
|
fix permission
|
2020-01-23 21:03:24 +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 |
|
alex
|
e5faa90c76
|
multiply filters for employee
|
2020-01-23 13:54:36 +03:00 |
|
Kuroshini
|
a6f3384126
|
change employees search precision const
|
2020-01-23 11:26:08 +03:00 |
|
dormantman
|
8fb8c49bfe
|
Added employee positions method
|
2020-01-22 18:48:16 +03:00 |
|
a.gorbunov
|
24c352aeac
|
fix country_id
|
2020-01-22 13:53:28 +00:00 |
|
Kuroshini
|
0023fcb47b
|
fix photos
|
2020-01-22 12:19:16 +03:00 |
|
dormantman
|
0688c622cc
|
Fixed structure view
|
2020-01-21 19:28:29 +03:00 |
|
dormantman
|
88e488e481
|
Added employee establishments method
|
2020-01-21 19:19:38 +03:00 |
|
Kuroshini
|
8235c6d172
|
fix
|
2020-01-21 12:37:33 +03:00 |
|
Kuroshini
|
416af8d343
|
photo for employee
|
2020-01-21 12:33:15 +03:00 |
|
alex
|
61c47e4c79
|
establishment employee position delete view
|
2020-01-21 08:17:03 +03:00 |
|
alex
|
a994e7214b
|
fix from_date and to_date for est_employee
|
2020-01-20 15:51:47 +03:00 |
|
alex
|
beefc82d7b
|
toque number and employee for establishment
|
2020-01-20 14:20:46 +03:00 |
|
alex
|
215e7b5f19
|
establishment employee list
|
2020-01-20 12:13:50 +03:00 |
|
Kuroshini
|
a05db696b0
|
optimize db queries on /api/back/establishments/employees
|
2020-01-17 19:08:33 +03:00 |
|
Kuroshini
|
8544098f8c
|
fix command #2
|
2020-01-17 17:41:53 +03:00 |
|
Kuroshini
|
0bb521b479
|
fix command
|
2020-01-17 17:35:50 +03:00 |
|
Kuroshini
|
9ef26594b6
|
code improvements
|
2020-01-17 17:33:13 +03:00 |
|
Ruslan Stepanov
|
281aca4fe5
|
Added establishment saving
|
2020-01-17 17:33:13 +03:00 |
|
dormantman
|
294c468405
|
Added live link part
|
2020-01-17 17:33:13 +03:00 |
|
dormantman
|
0a832136d3
|
Added update establishment image urls command
|
2020-01-17 17:33:13 +03:00 |
|
Kuroshini
|
8b4a6b0b74
|
fix employees search
|
2020-01-17 16:13:33 +03:00 |
|
alex
|
a8ea238bfc
|
some optimize for employee list
|
2020-01-17 16:02:00 +03:00 |
|
Kuroshini
|
abfd4d7288
|
full-text search employees
|
2020-01-17 14:33:57 +03:00 |
|
alex
|
4a7eb22291
|
order by position for establishment employee
|
2020-01-17 14:02:46 +03:00 |
|
alex
|
a915cff73d
|
photo for employee
|
2020-01-17 13:56:58 +03:00 |
|