Commit Graph

83 Commits

Author SHA1 Message Date
Kuroshini
8641188c45 Chosen tags for artisans 2019-11-17 22:16:20 +03:00
Dmitriy Kuzmenko
09db5c9540 minor changes for tags translation command 2019-11-16 23:26:50 +03:00
Dmitriy Kuzmenko
82c79091a3 add some change for add translations for tags 2019-11-16 23:24:22 +03:00
Dmitriy Kuzmenko
9f03da9bef fix for tag migration 2019-11-16 23:03:17 +03:00
Dmitriy Kuzmenko
ca9843482e Merge branch 'develop' into fix_tags 2019-11-16 22:57:43 +03:00
Dmitriy Kuzmenko
ad3966b2aa add method for label 2019-11-16 22:56:32 +03:00
Dmitriy Kuzmenko
45b0b93068 add new migrations for tags 2019-11-16 22:49:38 +03:00
Kuroshini
cc67499601 Fix wines db queries 2019-11-16 18:32:38 +03:00
Kuroshini
bff533e7d5 Tag types 2019-11-16 14:13:00 +03:00
Dmitriy Kuzmenko
36d16625ea change filter for Establishment 2019-11-16 13:28:03 +03:00
Kuroshini
798e58202c Return hardcode for chosen tags 2019-11-15 15:53:26 +03:00
Anatoly
688bc851bb fixed product related tags 2019-11-14 12:39:09 +03:00
Anatoly
92ee7537a3 fixed assemblage tags 2019-11-14 10:23:18 +03:00
Anatoly
2ec40ff8fe removed choices from index names for models ProductType, ProductSubType, EstablishmentType, EstablishmentSubType 2019-11-13 18:22:26 +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
d6126856b5 some tag migrations 2019-11-13 12:31:19 +03:00
a.feteleu
94f7bda03a added merge migrations 2019-11-12 18:53:01 +03:00
Виктор Гладких
c5ac47953c Merge branch 'develop' into feature/add_tag_product 2019-11-12 18:38:25 +03:00
alex
3a5c34fd4f comment command 2019-11-12 18:29:24 +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
Dmitriy Kuzmenko
1d2440ff7b fix TagCategory label migrator 2019-11-12 17:02:05 +03:00
Kuroshini
7d4d555eee Label translated field is translated again 2019-11-12 15:12:12 +03:00
Виктор Гладких
27bef66398 Add old_id for category 2019-11-12 15:02:20 +03:00
Виктор Гладких
7d9b6d1f30 Add category tag for products 2019-11-12 15:01:12 +03:00
Dmitriy Kuzmenko
9d208610df fix tag humanization 2019-11-12 12:21:19 +03:00
Dmitriy Kuzmenko
359deeeb39 fix model currency 2019-11-12 04:06:28 +03:00
Dmitriy Kuzmenko
1cd71ad830 disabled elastic 2019-11-11 23:16:32 +03:00
Anatoly
46662398e4 refactored detail and list view of products 2019-11-11 19:19:18 +03:00
Anatoly
c67109d9f8 Merge branch 'develop' into features/migrate-wine
# Conflicts:
#	apps/transfer/management/commands/transfer.py
#	apps/transfer/models.py
#	project/settings/base.py
2019-11-11 11:35:03 +03:00
Anatoly
13228ec85a finalizing 2019-11-11 11:33:20 +03:00
Anatoly
9bdeabe352 added tags 2019-11-07 19:03:12 +03:00
Kuroshini
f52847a71a Remove all crunches from projects 2019-11-05 14:29:53 +03:00
d.kuzmenko
6f0122fe35 Merge branch 'feature/chosen-tags-hardcode' into 'develop'
Remove doubles

See merge request gm/gm-backend!98
2019-11-04 11:37:17 +00:00
Kuroshini
cf1bb0a88c Remove doubles 2019-11-04 14:30:03 +03:00
d.kuzmenko
3abb74d19e Merge branch 'feature/chosen-tags-hardcode' into 'develop'
Temp crunch for chosen tags

See merge request gm/gm-backend!96
2019-11-04 08:58:41 +00:00
Dmitriy Kuzmenko
fb3e5e5c93 change add_tags 2019-11-04 10:53:16 +03:00
Kuroshini
b8fe50f806 Temp crunch for chosen tags 2019-11-03 22:45:44 +03:00
Dmitriy Kuzmenko
8e61071759 add news tag command 2019-11-03 20:33:45 +03:00
d.kuzmenko
902382a82a Merge branch 'feature/chosen_tags-logic' into 'develop'
Feature/chosen tags logic

See merge request gm/gm-backend!93
2019-11-03 13:20:51 +00:00
Dmitriy Kuzmenko
914450e8c2 add translation fix for tag 2019-11-02 19:18:58 +03:00
Dmitriy Kuzmenko
7de6043861 filter for tag 2019-11-02 17:19:59 +03:00
Dmitriy Kuzmenko
f3f06fcf09 filter for tag 2019-11-02 17:06:13 +03:00
Kuroshini
0f8425f363 Tags by category 2019-11-02 16:19:48 +03:00
Semyon Yekhmenin
d17790dc34 Added filtering chosen tags by country 2019-11-01 12:54:24 +00:00
Kuroshini
26e04719c3 Index name for tags 2019-10-31 17:58:39 +03:00