Commit Graph

86 Commits

Author SHA1 Message Date
Anatoly
1a1a2a2d24 added bo endpoints for establishment notes 2019-11-20 09:43:45 +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
Виктор Гладких
68baebcbcc Fix fix 2019-11-19 16:39:04 +03:00
Виктор Гладких
fb0157042a Fix 2019-11-19 15:45:49 +03:00
Виктор Гладких
39a406cbc1 Product type tags 2019-11-19 15:04:12 +03:00
Виктор Гладких
c9a0fb6656 Fix category, poduct-tags 2019-11-19 12:17:05 +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
alex
4d302395a9 fix product in_fav 2019-11-15 10:53:28 +03:00
Kuroshini
3bf029616f Try to fix indexing 2019-11-14 23:58:12 +03:00
Kuroshini
afbe8a59f2 Product type as object 2019-11-14 21:41:47 +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
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
Anatoly
92ee7537a3 fixed assemblage tags 2019-11-14 10:23:18 +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
Виктор Гладких
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
Виктор Гладких
9dde868828 Fix 2019-11-13 12:29:27 +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
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
Anatoly
83a3444c95 added product RUD-endpoints for back-office 2019-11-12 18:50:59 +03:00
Виктор Гладких
89fa7c5d56 Fix for merge 2019-11-12 18:37:43 +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
Anatoly
8eac730d9f added transfer for notes 2019-11-12 15:14:35 +03:00
Виктор Гладких
7d9b6d1f30 Add category tag for products 2019-11-12 15:01:12 +03:00
Anatoly
7064790606 added transfer for product notes 2019-11-12 12:41:27 +03:00
a.feteleu
22521f76fc Change serializer field in ProductSerializer 2019-11-12 12:22:59 +03:00
Anatoly
d07fd9282e added command fix_sugar_content_tag in products 2019-11-12 11:05:52 +03:00