Commit Graph

1474 Commits

Author SHA1 Message Date
Dmitriy Kuzmenko
12d44c0a0d enable elastic 2019-11-15 12:18:04 +03:00
Dmitriy Kuzmenko
b52a5dc890 add migration 2019-11-15 12:15:39 +03:00
Dmitriy Kuzmenko
4a53cca6c0 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-15 12:15:03 +03:00
Dmitriy Kuzmenko
41c842e224 change review transfer 2019-11-15 12:14:53 +03:00
Semyon Yekhmenin
36b47a6cba Added establishment subtype to product view 2019-11-15 09:13:28 +00:00
evgeniy-st
43963f3020 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-15 11:57:16 +03:00
evgeniy-st
ff006eb6fb Try this style of update tasks of the establishments 2019-11-15 11:56:16 +03:00
alex
1bcf4ca112 Merge remote-tracking branch 'origin/develop' into develop 2019-11-15 10:53:37 +03:00
alex
4d302395a9 fix product in_fav 2019-11-15 10:53:28 +03:00
Виктор Гладких
0f142d3870 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-15 10:48:18 +03:00
Виктор Гладких
b590a762c1 Fix update 2019-11-15 10:48:04 +03:00
alex
0dbb2c64cd fix new in_fav detail 2019-11-15 10:46:21 +03:00
alex
5f52806d97 Merge remote-tracking branch 'origin/develop' into develop 2019-11-15 10:36:33 +03:00
alex
1348a1def6 notification serializer start 2019-11-15 10:36:23 +03:00
evgeniy-st
8951de7399 updated requirements, updated ES task 2019-11-15 10:23:16 +03:00
alex
4ebece45d3 Merge remote-tracking branch 'origin/develop' into develop 2019-11-15 10:21:37 +03:00
alex
418ef27694 transfer newsletter_subscriber 2019-11-15 10:21:28 +03:00
Виктор Гладких
2931381126 Fix update employee 2019-11-15 10:12:19 +03:00
alex
e922117c61 refactor subscriber model 2019-11-15 10:09:26 +03:00
Dmitriy Kuzmenko
6b83003eac add product review loader 2019-11-15 02:44:09 +03:00
Kuroshini
2367fec098 Use establishment type product serializer w/ index name 2019-11-15 00:28:00 +03:00
Dmitriy Kuzmenko
956467e999 add view count to news serializer 2019-11-15 00:26:14 +03:00
d.kuzmenko
c644cbfd64 Merge branch 'feature/transfer-page-counters' into 'develop'
Add rating.views_count transfer

See merge request gm/gm-backend!134
2019-11-14 21:09:26 +00:00
Kuroshini
3bf029616f Try to fix indexing 2019-11-14 23:58:12 +03:00
littlewolf
726610d147 Update to onetoone
Update rating annotation
Add migrations
2019-11-14 23:44:49 +03:00
littlewolf
75307dbf73 Fix view_count transfer 2019-11-14 23:31:24 +03:00
Dmitriy Kuzmenko
141bddc0db add active flag for languages and Countries 2019-11-14 22:54:27 +03:00
Kuroshini
5718955ba8 Index name for products establishment 2019-11-14 22:31:21 +03:00
Kuroshini
afbe8a59f2 Product type as object 2019-11-14 21:41:47 +03:00
littlewolf
4e72487558 Add rating.views_count transfer 2019-11-14 20:54:14 +03:00
Kuroshini
843230b641 Filters for news favorites 2019-11-14 20:02:09 +03:00
alex
97f40c7ea7 Merge remote-tracking branch 'origin/develop' into develop 2019-11-14 18:23:50 +03:00
alex
a1d5feb8dc poroduct in_fav 2019-11-14 18:23:42 +03:00
Kuroshini
e455c5e750 Use only existing locales to index 2019-11-14 18:17:19 +03:00
Kuroshini
a06a7cef7f Remove weird indexing locales 2019-11-14 18:01:58 +03:00
Semyon Yekhmenin
b60ed7c7d5 Added establishment type to product view 2019-11-14 14:33:49 +00:00
Kuroshini
aa0e95d677 Product index replicas number 2019-11-14 17:30:30 +03:00
Kuroshini
2be15a9448 Fix Wine Region country serializer 2019-11-14 17:20:25 +03:00
alex
322af9efef fix news in_fav 2019-11-14 17:07:31 +03:00
Kuroshini
f4e762bb80 Increase product shards number 2019-11-14 17:05:56 +03:00
Виктор Гладких
76f570caa9 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-14 16:37:13 +03:00
Виктор Гладких
acd30fb457 Delete old awards, add new awards 2019-11-14 16:36:55 +03:00
Anatoly
a6d064daba changed representation of product name in ProductBaseSerializer 2019-11-14 16:35:41 +03:00
Виктор Гладких
e08bd8508a Fix print 2019-11-14 16:35:12 +03:00
Виктор Гладких
bd3f7ac8ab Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-14 16:34:23 +03:00
alex
68aa9e3914 fix api 2019-11-14 16:26:47 +03:00
Виктор Гладких
2a9c7bf28d Fix award add 2019-11-14 16:13:44 +03:00
Kuroshini
322318a4f9 Fix fuzziness for product documents 2019-11-14 16:04:21 +03:00
alex
bf8afab0fb refactor refactor reviews 2019-11-14 15:33:46 +03:00
Kuroshini
32e29b19e6 Fix approximate search 2019-11-14 15:32:14 +03:00
Kuroshini
8ef31fa560 Tune fuzzy search 2019-11-14 14:54:06 +03:00
Kuroshini
873e757389 News fav images to serializer 2019-11-14 14:48:34 +03:00
Kuroshini
f59d30f5aa Added images to fav news 2019-11-14 14:45:58 +03:00
Kuroshini
36f4ab1dd9 Fix ES product relations & swagger 2019-11-14 14:09:37 +03:00
Anatoly
2ca4ab6bb5 fixed product related tags 2019-11-14 14:05:51 +03:00
Anatoly
688bc851bb fixed product related tags 2019-11-14 12:39:09 +03:00
e.stoyushko
cf04f55bd3 Merge branch 'feature/products_search' into 'develop'
Feature/products search

See merge request gm/gm-backend!126
2019-11-14 09:16:15 +00:00
Виктор Гладких
78064481db Award migrate add tqdm 2019-11-14 10:53:19 +03:00
Anatoly
92ee7537a3 fixed assemblage tags 2019-11-14 10:23:18 +03:00
alex
e49d62de5d social choice api and test 2019-11-14 09:53:36 +03:00
alex
b94a6dfd62 social choices model 2019-11-14 09:14:36 +03:00
Kuroshini
46df31cbed Products search signals & filters 2019-11-13 22:35:07 +03:00
Kuroshini
81ebd5764c Serializers for product document 2019-11-13 21:20:19 +03:00
alex
906ca921f5 in_favorites news 2019-11-13 19:33:09 +03:00
Kuroshini
9dae8832cd Optimize indexing request 2019-11-13 18:43:30 +03:00
Kuroshini
a91ba7e6f3 Indexing products is ready 2019-11-13 18:43:30 +03:00
Kuroshini
692f4ba3ab Product ES index #2 2019-11-13 18:43:30 +03:00
Semyon
93d32c7ae0 Products search draft 2019-11-13 18:43:30 +03:00
Anatoly
2ec40ff8fe removed choices from index names for models ProductType, ProductSubType, EstablishmentType, EstablishmentSubType 2019-11-13 18:22:26 +03:00
Semyon Yekhmenin
9b3d42147a Feature/cook news search 2019-11-13 15:01:06 +00:00
Anatoly
3641d88a05 fixed admin pages for product 2019-11-13 17:33:19 +03:00
Kuroshini
ebf31f8492 Order news in search results 2019-11-13 17:11:47 +03:00
Anatoly
b56829accc added command add_cepage_tag_category to link cepage tag category with wine region 2019-11-13 16:30:30 +03:00
Виктор Гладких
2abb474221 Fix 2019-11-13 15:15:39 +03:00
Виктор Гладких
4f6cbe9297 Fix 2019-11-13 15:13:47 +03:00
Виктор Гладких
903db06f0e Fix tag add product 2019-11-13 15:12:48 +03:00
Anatoly
23a1af1870 Merge branch 'develop' into feature/bo-endpoints
# Conflicts:
#	apps/product/serializers/common.py
2019-11-13 14:48:44 +03:00
Anatoly
58155025c5 added back-office endpoints for products 2019-11-13 14:46:30 +03:00
alex
e9bfdf5f82 Merge remote-tracking branch 'origin/develop' into develop 2019-11-13 12:41:15 +03:00
alex
97cd3b7ae0 newsletter_subscriber legacy model 2019-11-13 12:40:55 +03:00
Виктор Гладких
00d7e410ba Elastic on 2019-11-13 12:37:54 +03:00
alex
d6126856b5 some tag migrations 2019-11-13 12:31:19 +03:00
alex
51268522f0 Merge branch 'inquiries-api' into develop 2019-11-13 12:30:11 +03:00
Виктор Гладких
9dde868828 Fix 2019-11-13 12:29:27 +03:00
alex
9626a946b1 inquiries test 2019-11-13 12:29:25 +03:00
Виктор Гладких
f915657124 Fix 2019-11-13 12:27:03 +03:00
Виктор Гладких
2cf845eedb Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-13 12:23:21 +03:00
Виктор Гладких
ed1ee3705f Fix 2019-11-13 12:23:05 +03:00
Anatoly
d19e75e50e added wine region and wine colors to product list view 2019-11-13 12:14:29 +03:00
Виктор Гладких
cb127ef879 Fix off elastic 2019-11-13 12:12:16 +03:00
Anatoly
8cf50ff2cd added endpoints for back office and refactored a little 2019-11-13 12:07:02 +03:00
Виктор Гладких
9fcaa6747a Fix tag category add 2019-11-13 11:41:58 +03:00
alex
b20baa5bcd inquiries and grid crud 2019-11-13 09:28:27 +03:00
a.feteleu
94f7bda03a added merge migrations 2019-11-12 18:53:01 +03:00
Anatoly
83a3444c95 added product RUD-endpoints for back-office 2019-11-12 18:50:59 +03:00
Виктор Гладких
c5ac47953c Merge branch 'develop' into feature/add_tag_product 2019-11-12 18:38:25 +03:00
Виктор Гладких
89fa7c5d56 Fix for merge 2019-11-12 18:37:43 +03:00
alex
cab171e306 Merge remote-tracking branch 'origin/develop' into develop 2019-11-12 18:29:34 +03:00
alex
3a5c34fd4f comment command 2019-11-12 18:29:24 +03:00
evgeniy-st
b13cb6916e Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-12 18:16:19 +03:00