Commit Graph

1629 Commits

Author SHA1 Message Date
Kuroshini
59f44d84f1 Establishment facet visibble tags only 2019-11-22 14:27:40 +03:00
Kuroshini
17931eba53 Facet with tags id instead of text values
(cherry picked from commit 2ebe6e6)
2019-11-22 13:55:56 +03:00
Kuroshini
2ebe6e60a3 Facet with tags id instead of text values 2019-11-22 13:54:07 +03:00
Anatoly
f7703f18b0 refactored upload image endpoint 2019-11-22 13:02:04 +03:00
evgeniy-st
00d7bbe7ec update crontab parameters 2019-11-22 12:45:14 +03:00
Виктор Гладких
806a7d63e4 Migrate 2019-11-22 11:43:22 +03:00
Kuroshini
a758cad48f Fix f swagger 2019-11-22 11:11:39 +03:00
Виктор Гладких
3a1e55ba1f Site settings migrate data 2019-11-22 10:58:07 +03:00
Виктор Гладких
f52cc8eccc Merge branch 'develop' into migrate/site_settings 2019-11-22 10:38:50 +03:00
Виктор Гладких
ee781150fd Site settings 2019-11-22 10:38:03 +03:00
alex
d30d68bf17 partner test 2019-11-22 10:32:01 +03:00
Kuroshini
7e6b2712a9 Fix facet 2019-11-22 10:24:05 +03:00
Kuroshini
0fe3e3f8ba Fix 2019-11-22 10:17:34 +03:00
alex
22e1478a1f partner back api 2019-11-22 09:31:21 +03:00
Kuroshini
735e409734 Facets for products 2019-11-21 22:54:33 +03:00
Kuroshini
9f1e9effaf Facets for news 2019-11-21 22:46:49 +03:00
Kuroshini
7376c61c47 Facets for establishments 2019-11-21 22:43:10 +03:00
Kuroshini
e6b353e864 ES Facets in addition to results 2019-11-21 21:59:24 +03:00
evgeniy-st
04d6412f39 Merge branch 'develop' into feature/in_favorites 2019-11-21 18:18:09 +03:00
evgeniy-st
35b6a66c85 In favorites 2019-11-21 18:12:52 +03:00
Semyon Yekhmenin
4209b38d93 Fixed is_published filed type in serializer 2019-11-21 14:46:56 +00:00
Semyon Yekhmenin
98e140b0c4 Feature/news web view update 2019-11-21 14:12:22 +00:00
alex
86e29173ba transfer partner 2019-11-21 16:45:27 +03:00
Kuroshini
8e215b2555 Demonstration carousel item 2019-11-21 16:40:53 +03:00
alex
9156d9cc35 fix partner migrations 2019-11-21 14:00:17 +03:00
alex
a6bfb3ea6b partner migrations 2019-11-21 13:47:37 +03:00
alex
d9b88f7ef9 partner name field 2019-11-21 13:32:50 +03:00
Anatoly
3f164459a7 added transfer for filling city gallery 2019-11-21 12:37:13 +03:00
alex
e6a143f6ea partner model 2019-11-21 12:29:55 +03:00
alex
bebdf1e269 review test and fixes review crud api 2019-11-21 11:12:52 +03:00
Anatoly
e303e15f32 added two characteristics to wine detail serializer 2019-11-21 10:28:17 +03:00
Anatoly
617552841f refactored product, fix transfer and etc., see changelist 2019-11-21 09:58:43 +03:00
alex
a2a8b2927f Merge remote-tracking branch 'origin/develop' into develop 2019-11-21 09:12:00 +03:00
alex
cad0f8df0a award test 2019-11-21 09:11:52 +03:00
Dmitriy Kuzmenko
009ecf1973 fix filter for tag_category 2019-11-21 08:42:05 +03:00
Dmitriy Kuzmenko
74c1b7069a fix product tags 2019-11-21 00:23:17 +03:00
Kuroshini
2dc7f1e89d Boost the tempo 2019-11-20 20:35:56 +03:00
Kuroshini
06b8582976 Revert "Estabishment_type field"
This reverts commit 280da2d
2019-11-20 19:41:22 +03:00
Kuroshini
49940ebab4 Revert "Estabishment_type field #2"
This reverts commit b60dd87
2019-11-20 19:41:20 +03:00
Kuroshini
b60dd870f9 Estabishment_type field #2 2019-11-20 19:32:45 +03:00
Kuroshini
280da2d7de Estabishment_type field 2019-11-20 19:31:43 +03:00
Kuroshini
cd328186e1 wildcard boosting 2019-11-20 17:01:24 +03:00
alex
45fee0355c Merge remote-tracking branch 'origin/develop' into develop 2019-11-20 16:38:22 +03:00
alex
824cbe203b award back api 2019-11-20 16:38:11 +03:00
Dmitriy Kuzmenko
15ddbd5a7e Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-20 16:29:57 +03:00
Dmitriy Kuzmenko
2e17d7265d add back api for collection 2019-11-20 16:29:46 +03:00
alex
7ba3913000 award filter 2019-11-20 16:17:49 +03:00
evgeniy-st
bea485f936 city may be null 2019-11-20 15:56:56 +03:00
d.kuzmenko
62d7f13f80 Merge branch 'fix/tags_many' into 'develop'
Fix/tags many

See merge request gm/gm-backend!143
2019-11-20 12:43:05 +00:00
Kuroshini
cf22027dc1 Search by wildcard 2019-11-20 15:40:10 +03:00
Виктор Гладких
5a55fa82a2 Codestyle 2019-11-20 15:32:36 +03:00
Виктор Гладких
c570cfdadd Fix 2019-11-20 15:29:03 +03:00
Kuroshini
be581c7b7d Dynamic front filters #1 2019-11-20 14:15:25 +03:00
Anatoly
ef1af8c3ac added city gallery 2019-11-20 13:27:26 +03:00
alex
2f6d0cf4ed review filter fix 2019-11-20 13:00:50 +03:00
alex
61e049f5c3 review filter by product id 2019-11-20 12:56:57 +03:00
Anatoly
d3faacba3b fix product view mixins 2019-11-20 12:41:43 +03:00
evgeniy-st
0639aee494 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-20 12:24:41 +03:00
evgeniy-st
7f8f72815e append city or country to ProductDocumentSerialzier 2019-11-20 12:21:55 +03:00
Anatoly
0e6a4eded2 fixed transfer_product_reviews 2019-11-20 12:10:28 +03:00
Anatoly
498e8ac126 fix product country filter in ES 2019-11-20 11:56:31 +03:00
a.feteleu
d932df4392 add unknown migrations from developm server:-( 2019-11-20 10:07:23 +03:00
a.feteleu
8e01c2092d Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-20 09:43:58 +03:00
Anatoly
1a1a2a2d24 added bo endpoints for establishment notes 2019-11-20 09:43:45 +03:00
a.feteleu
41b43b7d55 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-20 09:26:57 +03:00
alex
46d4898428 user back api test 2019-11-20 09:11:17 +03:00
alex
7456e9c3af hardcoded review filter 2019-11-19 20:47:10 +03:00
a.feteleu
73bc390121 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-19 18:54:41 +03:00
Kuroshini
c4e9f9e843 Filter products by country 2019-11-19 18:54:22 +03:00
a.feteleu
10579843af Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-19 18:29:20 +03:00
Anatoly
9975f3f3b5 added bo endpoints for product notes 2019-11-19 18:28:53 +03:00
alex
a8cc734d20 back user api 2019-11-19 17:48:20 +03:00
a.feteleu
0b1b89b6ba added merge migration 2019-11-19 17:38:53 +03:00
Anatoly
484a9a3250 added field - average price to model Product and transfer command 2019-11-19 17:37:23 +03:00
d.kuzmenko
b6292261e4 Merge branch 'fix/tag_product' into 'develop'
Fix/tag product

See merge request gm/gm-backend!142
2019-11-19 14:30:16 +00:00
alex
d03a151bf8 fix slice review 2019-11-19 16:58:12 +03:00
alex
8b194f8324 fix transfer review text 2019-11-19 16:40:03 +03:00
Виктор Гладких
e51070f500 Merge branch 'develop' into fix/tag_product 2019-11-19 16:39:39 +03:00
Виктор Гладких
68baebcbcc Fix fix 2019-11-19 16:39:04 +03:00
d.kuzmenko
9d816ade6b Merge branch 'fix/tag_product' into 'develop'
Fix

See merge request gm/gm-backend!141
2019-11-19 13:08:52 +00:00
Виктор Гладких
fb0157042a Fix 2019-11-19 15:45:49 +03:00
d.kuzmenko
a00cb91b8b Merge branch 'fix/tag_product' into 'develop'
Fix category, poduct-tags

See merge request gm/gm-backend!140
2019-11-19 12:34:40 +00:00
Semyon Yekhmenin
7d8e4c96f1 Added filter by type for bo news list 2019-11-19 12:13:43 +00:00
Виктор Гладких
3b0c872d51 Merge branch 'develop' into fix/tag_product 2019-11-19 15:06:31 +03:00
Виктор Гладких
39a406cbc1 Product type tags 2019-11-19 15:04:12 +03:00
Kuroshini
dbe39ae5cb Search establishment by region id
(cherry picked from commit 7a5774a)
2019-11-19 14:06:47 +03:00
Виктор Гладких
c9a0fb6656 Fix category, poduct-tags 2019-11-19 12:17:05 +03:00
alex
267544a0b1 merge for migration 2019-11-19 09:48:25 +03:00
Kuroshini
f6e5f84889 fix issue w/ empty tags 2019-11-18 22:41:14 +03:00
Kuroshini
d080f689cb Change Pagination for collection 2019-11-18 22:23:23 +03:00
Kuroshini
5c4c4c60c3 ES as separate server 2019-11-18 20:12:58 +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
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