Commit Graph

1736 Commits

Author SHA1 Message Date
Kuroshini
c7033d4b10 Revert "Revert "ES as separate server""
This reverts commit f81e879
2019-11-18 18:09:19 +03:00
Kuroshini
f81e879ae4 Revert "ES as separate server"
This reverts commit 3536be8
2019-11-18 18:03:21 +03:00
Kuroshini
3536be8394 ES as separate server 2019-11-18 18:01:55 +03:00
Anatoly
012d2dcb23 added validation to Company serializer 2019-11-18 17:58:46 +03:00
Anatoly
0d9d45bcc5 added model Product and bo endpoints 2019-11-18 17:58:46 +03:00
Kuroshini
2a680311ae Revert "use another ES server"
This reverts commit 89191fc
2019-11-18 17:37:10 +03:00
Kuroshini
89191fcf35 use another ES server 2019-11-18 17:35:16 +03:00
Kuroshini
9212f85ee5 Visible tags for establishments 2019-11-18 15:15:33 +03:00
alex
303d7f5277 city for favorite establishment 2019-11-18 13:51:44 +03:00
alex
dc0b4ce107 fix collection establishment in_fav 2019-11-18 13:12:24 +03:00
Anatoly
d0fec2591f added bo endpoints for ads 2019-11-18 12:48:39 +03:00
alex
4412e39e96 filter by establishment for review 2019-11-18 11:19:35 +03:00
Kuroshini
f4ebd58e09 Tune products ES 2019-11-18 01:37:41 +03:00
Kuroshini
83153b14c1 Add wine_region and wine_sub_region to ES 2019-11-18 01:26:01 +03:00
Kuroshini
f8c9a5c830 Wine regions route 2019-11-18 01:20:35 +03:00
Anatoly
cb1366b57b added grape variety attr to es 2019-11-18 00:01:30 +03:00
Kuroshini
d9e46fdfad Wine color for wine tags only 2019-11-17 23:57:08 +03:00
Kuroshini
a305c6ba83 try to fix tag categories
(cherry picked from commit 376d22c)
2019-11-17 23:44:15 +03:00
Kuroshini
7d26d4a0cf Tags for artisans. Chosen & Category 2019-11-17 23:27:58 +03:00
Anatoly
1159dfca65 added assemblage to detail view of product, and fix verbose name in ProductType 2019-11-17 22:55:03 +03:00
Kuroshini
8641188c45 Chosen tags for artisans 2019-11-17 22:16:20 +03:00
Anatoly
0d2f961ad5 added temporary potential bug (change auto_crop_images dict names for News) 2019-11-17 21:52:07 +03:00
Anatoly
62c4ab8d74 added temporary potential bug (change auto_crop_images dict names for News) 2019-11-17 20:39:03 +03:00
Anatoly
c2c182e992 remove duplicated migration 2019-11-17 14:51:48 +03:00
Anatoly
dce951c4f9 Merge branch 'develop' into feature/establishment-gallery
# Conflicts:
#	apps/product/serializers/common.py
2019-11-17 14:25:41 +03:00
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
Dmitriy Kuzmenko
09db5c9540 minor changes for tags translation command 2019-11-16 23:26:50 +03:00
Dmitriy Kuzmenko
82c79091a3 add some change for add translations for tags 2019-11-16 23:24:22 +03:00
Dmitriy Kuzmenko
9f03da9bef fix for tag migration 2019-11-16 23:03:17 +03:00
Dmitriy Kuzmenko
b1d176c583 enable elastic 2019-11-16 23:01:22 +03:00
Dmitriy Kuzmenko
ca9843482e Merge branch 'develop' into fix_tags 2019-11-16 22:57:43 +03:00
Dmitriy Kuzmenko
ad3966b2aa add method for label 2019-11-16 22:56:32 +03:00
Dmitriy Kuzmenko
45b0b93068 add new migrations for tags 2019-11-16 22:49:38 +03:00
Kuroshini
70b2110744 Fix booking slots order 2019-11-16 20:51:40 +03:00
Kuroshini
9d4a672d67 Multilingual textfield products analyzers 2019-11-16 20:14:25 +03:00
Kuroshini
be0d63cf07 Fix products search 2019-11-16 19:59:10 +03:00
Kuroshini
8a86018a5e Fix wines db queries #2 2019-11-16 18:42:26 +03:00
Kuroshini
cc67499601 Fix wines db queries 2019-11-16 18:32:38 +03:00
alex
94d20469f6 Merge remote-tracking branch 'origin/develop' into develop 2019-11-16 16:57:38 +03:00
alex
78e42550c1 add address to establishment similar and collection establishment 2019-11-16 16:57:26 +03:00
Kuroshini
2e463feb8d Sort countries by name accordingly to locale 2019-11-16 16:23:31 +03:00
alex
4e005a7a4d migrate subscribers 2019-11-16 15:56:23 +03:00
Kuroshini
144b5abdbf Fix issue w/ product display name 2019-11-16 14:58:59 +03:00
Kuroshini
94797c354a Fix search results produt name 2019-11-16 14:48:32 +03:00
Kuroshini
5a014ca7fe Fix some product search issues 2019-11-16 14:38:35 +03:00
Kuroshini
bff533e7d5 Tag types 2019-11-16 14:13:00 +03:00
Kuroshini
ca61359a81 Fix product type serializer 2019-11-16 13:35:21 +03:00
Dmitriy Kuzmenko
36d16625ea change filter for Establishment 2019-11-16 13:28:03 +03:00
d.kuzmenko
dc10203f8a Merge branch 'feature/guestonline_no_period_fix' into 'develop'
Fixed problem with no required period in guest online service response

See merge request gm/gm-backend!137
2019-11-16 09:38:33 +00:00
Semyon Yekhmenin
8b656b9bb6 Fixed problem with no required period in guest online service response 2019-11-16 09:38:33 +00:00