Commit Graph

74 Commits

Author SHA1 Message Date
Anatoly
ca5440d431 refactored roles 2020-01-30 12:50:14 +03:00
Anatoly
57e63111fb intermediate commit 2020-01-30 10:28:01 +03:00
Anatoly
236b532d98 refactored permission classes 2020-01-28 14:54:14 +03:00
Anatoly
38a6508396 modified role model 2020-01-24 18:04:32 +03:00
Anatoly
a468f264e0 fix similarity rules 2020-01-15 17:50:34 +03:00
a.gorbunov
5e5d2832cd fix sort by product type 2020-01-14 13:39:25 +00:00
Anatoly
1468e5cdde intermediate commit 2019-12-30 18:15:55 +03:00
Anatoly
2827374911 intermediate commit 2019-12-30 13:22:57 +03:00
Anatoly
151c017561 see changes 2019-12-27 17:49:56 +03:00
Anatoly
d9df886b98 added guide type field, added tasks, refactored GuideElement model, added endpoint, 2019-12-25 22:14:35 +03:00
d.kuzmenko
6a68042178 Merge branch 'feature/permission_liquor' into 'develop'
Feature/permission liquor

See merge request gm/gm-backend!175
2019-12-23 13:40:13 +00:00
Anatoly
cc7125b468 added image url to es 2019-12-23 09:19:16 +03:00
Kuroshini
660c8e791b tags translation 2019-12-20 19:08:53 +03:00
Anatoly
72e5d723db added default image for type/subtype 2019-12-20 17:27:04 +03:00
Виктор Гладких
458370d4c9 Merge branch 'develop' into feature/permission_liquor 2019-12-17 14:24:15 +03:00
Anatoly
dbbb526902 Refactored mechanism to find similar objects. Added endpoints to product app. 2019-12-17 13:02:46 +03:00
alex
41659958f7 product establishment_detail address 2019-12-11 09:10:49 +03:00
Виктор Гладких
0a8db7e3ad permission 2019-12-10 18:36:18 +03:00
Виктор Гладких
6b8fdf7eed Add migrate for product models 2019-12-10 10:45:35 +03:00
Dmitriy Kuzmenko
f6cb62c49c Merge branch 'develop' into fix/check_tags 2019-12-09 12:06:37 +03:00
dormantman
0c5140d359 Added current product exclude 2019-12-06 15:03:18 +03:00
Anatoly
29ff10fb4b added wine origins 2019-12-04 20:13:09 +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
Виктор Гладких
1687e80492 Check serial number for product 2019-11-21 13:13:19 +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
Anatoly
ef1af8c3ac added city gallery 2019-11-20 13:27:26 +03:00
Anatoly
d3faacba3b fix product view mixins 2019-11-20 12:41:43 +03:00
Anatoly
9975f3f3b5 added bo endpoints for product notes 2019-11-19 18:28:53 +03:00
Anatoly
484a9a3250 added field - average price to model Product and transfer command 2019-11-19 17:37:23 +03:00
Kuroshini
5c4c4c60c3 ES as separate server 2019-11-18 20:12: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
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
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
Kuroshini
144b5abdbf Fix issue w/ product display name 2019-11-16 14:58:59 +03:00
Kuroshini
3bf029616f Try to fix indexing 2019-11-14 23:58:12 +03:00
alex
a1d5feb8dc poroduct in_fav 2019-11-14 18:23:42 +03:00
Anatoly
a6d064daba changed representation of product name in ProductBaseSerializer 2019-11-14 16:35:41 +03:00
Kuroshini
36f4ab1dd9 Fix ES product relations & swagger 2019-11-14 14:09:37 +03:00
Kuroshini
9dae8832cd Optimize indexing request 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
Anatoly
3641d88a05 fixed admin pages for product 2019-11-13 17:33:19 +03:00
Anatoly
58155025c5 added back-office endpoints for products 2019-11-13 14:46:30 +03:00
Anatoly
8eac730d9f added transfer for notes 2019-11-12 15:14:35 +03:00
Anatoly
7064790606 added transfer for product notes 2019-11-12 12:41:27 +03:00
Anatoly
d07fd9282e added command fix_sugar_content_tag in products 2019-11-12 11:05:52 +03:00
Anatoly
f4b411e73d added tags, image urls to product serializers 2019-11-11 21:29:34 +03:00