Commit Graph

1726 Commits

Author SHA1 Message Date
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
Kuroshini
7d4d555eee Label translated field is translated again 2019-11-12 15:12:12 +03:00
Kuroshini
57a4498ba1 Add schedule to establishment list serializer 2019-11-12 15:11:32 +03:00
Kuroshini
521d7f19f3 Add city name field to establishment api representations 2019-11-12 15:11:32 +03:00
Kuroshini
d3ab910fba Filter recipes news 2019-11-12 15:10:50 +03:00
Kuroshini
e065f1c9b4 Works at weekday fiter 2019-11-12 15:10:16 +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
d.kuzmenko
995d55302a Merge branch 'feature/nested-published-features' into 'develop'
Feature/nested published features

See merge request gm/gm-backend!112
2019-11-12 11:57:20 +00: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
Dmitriy Kuzmenko
9d208610df fix tag humanization 2019-11-12 12:21:19 +03:00
Anatoly
5290e33ea7 added preview image crop for model Product 2019-11-12 12:14:45 +03:00
Anatoly
cf8abf27ae added transfer commands 2019-11-12 12:04:29 +03:00
Anatoly
f0c65a20cb fix AdvertisementSerializer 2019-11-12 11:07:36 +03:00
Anatoly
811f9defc4 Merge remote-tracking branch 'origin/develop' into develop 2019-11-12 11:06:21 +03:00
Anatoly
d07fd9282e added command fix_sugar_content_tag in products 2019-11-12 11:05:52 +03:00
Виктор Гладких
429cc705a1 Fix add_empl_position 2019-11-12 10:42:15 +03:00
alex
0b157244e0 Merge remote-tracking branch 'origin/feature/favorite-news' into develop 2019-11-12 08:51:55 +03:00
alex
b5c255f7fb migrate inquiry photos 2019-11-12 08:40:42 +03:00
alex
60c62eb84a Merge remote-tracking branch 'origin/develop' into feature/migrate-inquiries 2019-11-12 08:03:09 +03:00
Dmitriy Kuzmenko
2fe56d713d enabled elastic 2019-11-12 04:12:27 +03:00
Dmitriy Kuzmenko
e4061996a8 fix model currency 2019-11-12 04:09:57 +03:00
Dmitriy Kuzmenko
359deeeb39 fix model currency 2019-11-12 04:06:28 +03:00
Dmitriy Kuzmenko
858f64a26a fix product serializer 2019-11-12 03:42:18 +03:00
Dmitriy Kuzmenko
6a5cedc8b9 fix product serializer 2019-11-12 03:41:24 +03:00
Dmitriy Kuzmenko
362070656e fix product serializer 2019-11-12 03:40:09 +03:00
Dmitriy Kuzmenko
352e1bba8a fix product type 2019-11-12 02:31:08 +03:00
Dmitriy Kuzmenko
ec96c32453 fix product type 2019-11-12 02:28:33 +03:00
Dmitriy Kuzmenko
c433c18c60 add blank TZ as UTC 2019-11-12 01:02:35 +03:00
Dmitriy Kuzmenko
db84d87eb1 Merge remote-tracking branch 'origin/develop' into develop 2019-11-11 23:16:49 +03:00
Dmitriy Kuzmenko
1cd71ad830 disabled elastic 2019-11-11 23:16:32 +03:00
Anatoly
eefbec20b1 fix swagger 2019-11-11 22:25:05 +03:00
Anatoly
f4b411e73d added tags, image urls to product serializers 2019-11-11 21:29:34 +03:00
Anatoly
46662398e4 refactored detail and list view of products 2019-11-11 19:19:18 +03:00
Anatoly
7fcba802c1 fixed tags 2019-11-11 18:52:09 +03:00
alex
d5799ca768 migrate inquiries grid 2019-11-11 17:45:34 +03:00
alex
7106249d1e Merge remote-tracking branch 'origin/develop' into feature/migrate-inquiries
# Conflicts:
#	apps/transfer/management/commands/transfer.py
#	apps/transfer/models.py
2019-11-11 17:02:24 +03:00
Dmitriy Kuzmenko
04f3823047 fix product queryset 2019-11-11 15:55:11 +03:00
Dmitriy Kuzmenko
a7dca6cd78 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/establishment/transfer_data.py
2019-11-11 15:32:42 +03:00
Dmitriy Kuzmenko
7617981259 change command for migration of users 2019-11-11 15:29:31 +03:00
Anatoly
df38afa36b refactored a little model Product 2019-11-11 15:27:58 +03:00
alex
b0177dfe13 refactor inquiries 2019-11-11 14:45:33 +03:00
Anatoly
0610075706 fixed transfer product with sub type plates 2019-11-11 13:15:37 +03:00
Anatoly
3a1f57e195 refactored product admin page 2019-11-11 12:29:10 +03:00
Anatoly
358407e786 merged develop 2019-11-11 12:01:16 +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
alex
2512400885 fix serializer 2019-11-11 09:43:27 +03:00