Commit Graph

39 Commits

Author SHA1 Message Date
Anatoly
46662398e4 refactored detail and list view of products 2019-11-11 19:19:18 +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
evgeniy-st
c4ba375323 update Country model 2019-08-22 14:40:21 +03:00
evgeniy-st
e839094e28 Site settings and determine user location over ip 2019-08-22 14:23:02 +03:00
Dmitriy Kuzmenko
68f6e0bc9c version 0.0.6 new models and api for News 2019-08-13 15:23:00 +03:00
Dmitriy Kuzmenko
c5df0faa16 version 0.0.4: add app locations with models City, Regions, Address, Countries 2019-08-08 17:06:07 +03:00