Commit Graph

250 Commits

Author SHA1 Message Date
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
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
a.gorbunov
24c352aeac fix country_id 2020-01-22 13:53:28 +00:00
alex
beefc82d7b toque number and employee for establishment 2020-01-20 14:20:46 +03:00
Kuroshini
a05db696b0 optimize db queries on /api/back/establishments/employees 2020-01-17 19:08:33 +03:00
Kuroshini
8b4a6b0b74 fix employees search 2020-01-17 16:13:33 +03:00
alex
a915cff73d photo for employee 2020-01-17 13:56:58 +03:00
alex
0695cdce6b available_for_events field for employee 2020-01-17 11:36:13 +03:00
alex
f15a93f760 username, first_name, last_name filter for employee 2020-01-17 09:37:15 +03:00
alex
38485292f9 public_mark filter for actual employee 2020-01-17 09:21:51 +03:00
Kuroshini
ea485d9960 optimize images at least for establishments 2020-01-16 19:21:57 +03:00
alex
2aec0bdfb4 position filter for employee 2020-01-16 16:23:10 +03:00
Kuroshini
127d15b181 try to fix performance issues
(cherry picked from commit 964ead1)
2020-01-16 12:14:04 +03:00
Kuroshini
4b45cab976 employees trigram search for back-office 2020-01-15 20:49:33 +03:00
Kuroshini
7a7d7a70b0 fix naming issue 2020-01-15 19:15:32 +03:00
Anatoly
a468f264e0 fix similarity rules 2020-01-15 17:50:34 +03:00
Kuroshini
59f7f8d2d4 distillery_type 2020-01-15 17:50:12 +03:00
Anatoly
c0273773bc refactored a little similarity rules 2020-01-15 17:00:14 +03:00
Kuroshini
0607a56739 Revert "possible fix for similar distilleries"
This reverts commit 2197863
2020-01-15 16:47:04 +03:00