Commit Graph

1447 Commits

Author SHA1 Message Date
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
evgeniy-st
0dfa1c85d5 Recalculate toque number fallback 2019-11-12 18:15:53 +03:00
Kuroshini
fef5008d35 Revert "Change images search fields sources"
This reverts commit 0833d40
2019-11-12 18:13:52 +03:00
alex
3ace542deb comment created date 2019-11-12 18:12:14 +03:00
Kuroshini
0833d4057f Change images search fields sources 2019-11-12 18:08:50 +03:00
Виктор Гладких
01d6403ad3 Merge branch 'develop' into feature/add_tag_product 2019-11-12 17:54:52 +03:00
Виктор Гладких
ced49965f9 Fix employee name 2019-11-12 17:54:07 +03:00
Виктор Гладких
e702be2691 Fix employee name 2019-11-12 17:51:57 +03:00
Виктор Гладких
8659ce0a92 Fix merge 2019-11-12 17:44:02 +03:00
Anatoly
70614abc03 - renamed fix_wine_color_tag to fix_wine_color_tag
- added command add_assemblage_tag
- added transfer commands: cepage, assemblage (execute in this order)
2019-11-12 17:40:15 +03:00
Виктор Гладких
097bab4bb1 Merge branch 'develop' into feature/add_tag_product 2019-11-12 17:37:51 +03:00
Виктор Гладких
13db34237b Add tag for product 2019-11-12 17:36:48 +03:00
Kuroshini
896da284a9 Merge branch 'feature/last_fallback_translation_fix' into develop 2019-11-12 17:09:45 +03:00
Semyon
621918af4a Fixed last fallback translation case 2019-11-12 17:07:58 +03:00
Dmitriy Kuzmenko
1d2440ff7b fix TagCategory label migrator 2019-11-12 17:02:05 +03:00
alex
3f2de46420 fix filter comment by establishment and user 2019-11-12 16:38:06 +03:00
alex
0db7972b5a fix comment country 2019-11-12 16:19:03 +03:00
Semyon Yekhmenin
fe6f9953d8 Added mobile news endpoints 2019-11-12 13:12:10 +00:00
Semyon Yekhmenin
a7f9bfd161 Feature/news search translation fix 2019-11-12 13:10:12 +00:00
d.kuzmenko
16b78f0bea Merge branch 'bugfix/label_translated' into 'develop'
Label translated field is translated again

See merge request gm/gm-backend!114
2019-11-12 13:02:00 +00:00
d.kuzmenko
dd35319e5c Merge branch 'feature/fill-closed-at' into 'develop'
Closed_at fill command

See merge request gm/gm-backend!121
2019-11-12 12:58:24 +00:00
d.kuzmenko
feb1b8c6ea Merge branch 'feature/bring-back-address' into 'develop'
Add city name field to establishment api representations

See merge request gm/gm-backend!118
2019-11-12 12:57:05 +00:00
d.kuzmenko
59f1313891 Merge branch 'feature/news-recipes' into 'develop'
Filter recipes news

See merge request gm/gm-backend!116
2019-11-12 12:35:33 +00:00
d.kuzmenko
cd1967ee51 Merge branch 'feature/works-whole-day-es-filter' into 'develop'
Feature/works whole day es filter

See merge request gm/gm-backend!113
2019-11-12 12:33:45 +00:00
a.feteleu
0af5de9bd4 added merge migration 2019-11-12 15:18:46 +03:00
Anatoly
d2af496b17 Merge branch 'develop' into feature/notes 2019-11-12 15:16:23 +03:00
Anatoly
8eac730d9f added transfer for notes 2019-11-12 15:14:35 +03:00
Kuroshini
7bba5237dc Closed_at fill command 2019-11-12 15:12:47 +03:00