Commit Graph

54 Commits

Author SHA1 Message Date
littlewolf
180daeca0c Add ruby data getter
Add ruby files write
Add models migrations
REMOVE UNIQUE FROM location.country.code
Add function to save correct original objects from old database
2019-11-18 06:37:30 +03:00
littlewolf
6bac3fc9c2 Add fields 2019-11-16 14:58:22 +03:00
littlewolf
cf7cc9bd0c Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
#	apps/transfer/management/commands/transfer.py
#	apps/transfer/serializers/location.py
2019-11-15 17:08:51 +03:00
Dmitriy Kuzmenko
141bddc0db add active flag for languages and Countries 2019-11-14 22:54:27 +03:00
Anatoly
688bc851bb fixed product related tags 2019-11-14 12:39:09 +03:00
Kuroshini
a91ba7e6f3 Indexing products is ready 2019-11-13 18:43:30 +03:00
Anatoly
3641d88a05 fixed admin pages for product 2019-11-13 17:33:19 +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
littlewolf
cf226974c8 Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
#	apps/collection/models.py
#	apps/location/serializers/common.py
#	apps/location/transfer_data.py
#	apps/transfer/management/commands/transfer.py
#	apps/transfer/serializers/location.py
#	project/settings/base.py
2019-11-13 00:28:49 +03:00
Anatoly
46662398e4 refactored detail and list view of products 2019-11-11 19:19:18 +03:00
littlewolf
6d27ac533a Add transfer to city_photos
Add migrations
2019-11-10 16:34:31 +03:00
littlewolf
ec07ba74da Add migrations 2019-11-08 09:51:30 +03:00
littlewolf
1c8e08fab1 Fix location city gallery 2019-11-08 01:50:55 +03:00
littlewolf
22ac3d3046 add gallery relation 2019-11-07 11:49:59 +03:00
littlewolf
0463afdecb Add fields and migration to location.city 2019-11-07 10:43:08 +03:00
littlewolf
57d22bedcb Add gallery
Add name_translated
Add migrations
2019-11-06 22:56:41 +03:00
Anatoly
0aa0378ae0 intermediate commit 2019-11-06 15:35:47 +03:00
Anatoly
d46ba31654 Merge branch 'develop' into features/migrate-wine
# Conflicts:
#	apps/product/models.py
#	apps/transfer/management/commands/transfer.py
#	apps/transfer/models.py
2019-11-05 14:56:26 +03:00
Kuroshini
e69f272a63 Fix time format for frontend 2019-11-02 15:42:33 +03:00
evgeniy-st
04afd4d913 update country time_format and __str__ method 2019-11-01 11:34:48 +03:00
Kuroshini
a8861238ac Time format for country 2019-10-31 19:02:48 +03:00
Anatoly
dd38e6e5de refactor models 2019-10-31 17:53:37 +03:00
Dmitriy Kuzmenko
638bafe4a6 Merge remote-tracking branch 'origin/develop' into origin/migration_fix
# Conflicts:
#	apps/establishment/admin.py
#	project/settings/base.py
2019-10-30 19:12:59 +03:00
littlewolf
7d556df8d5 Add address serializer 2019-10-28 10:13:01 +03:00
littlewolf
25d58a8bc5 Fix and add city transfer 2019-10-28 07:19:17 +03:00
Anatoly
e41b539ed7 added wine region 2019-10-27 18:42:51 +03:00
littlewolf
0db2638eb8 Fix country queryset 2019-10-27 17:23:04 +03:00
littlewolf
7eb241ffed Tmp commit 2019-10-27 12:47:45 +03:00
Kuroshini
d5609e4cb8 Works now filter first part 2019-10-23 17:29:00 +03:00
evgeniy-st
0c8959f4e7 Merge branch 'develop' into feature/gm-148 2019-10-22 17:11:22 +03:00
Semyon Yekhmenin
939e4a26a0 Feature/cities by country 2019-10-22 13:00:22 +00:00
evgeniy-st
6c195bc185 Merge branch 'develop' into feature/gm-148 2019-10-21 20:26:31 +03:00
Виктор Гладких
f338906736 Fix location tests 2019-10-21 11:44:47 +03:00
Kuroshini
b77c654c6c Open now filter 2019-10-18 02:38:59 +03:00
Виктор Гладких
86692019d1 Add Country admin to views 2019-10-16 10:14:23 +03:00
Виктор Гладких
a6c56a4bf1 Fix and refactor 2019-10-11 14:49:32 +03:00
Виктор Гладких
ab5a66afe2 Test change 2019-10-10 15:20:13 +03:00
Виктор Гладких
56c0927a52 Add country control 2019-10-10 14:58:19 +03:00
evgeniy-st
e42f4d061c refactor address 2019-10-01 18:07:04 +03:00
evgeniy-st
e67d7767a1 Elasticsearch: establishment address. Filter by country_id, country_code 2019-09-17 17:33:07 +03:00
evgeniy-st
aa88721800 sites endpoint 2019-09-04 10:14:11 +03:00
Dmitriy Kuzmenko
fc4facbf83 add contacts for establishments 2019-09-01 12:35:09 +03:00
evgeniy-st
1aef1a5bb1 Translation & establishment 2019-08-28 15:21:28 +03:00
Anatoly
ee619922fa fixed looped import 2019-08-27 17:26:43 +03:00
evgeniy-st
c04771ca58 recalculate price level preview version 2019-08-27 16:53:05 +03:00
evgeniy-st
910027d10f update establishment model, migrations 2019-08-27 14:23:11 +03:00
Anatoly
5edcd0afe9 replace image field with svg_image field, added validator, and change serializer 2019-08-26 17:39:03 +03:00
Anatoly
93bd8a59c4 added image field to Country model 2019-08-26 11:50:54 +03:00
evgeniy-st
4cceb62d49 update Country model 2019-08-22 14:45:01 +03:00
evgeniy-st
8a08c9b326 Fix __str__ for Country model 2019-08-22 14:41:45 +03:00