Commit Graph

98 Commits

Author SHA1 Message Date
Kuroshini
9781014626 sort by modified_at 2020-02-10 14:25:33 +03:00
Anatoly
1c6ec90fbf added an endpoint that return an array of country calling codes /api/back/location/countries/calling-codes/ 2020-02-04 17:02:02 +03:00
Kuroshini
bf0a0b42a9 some fixes & migrations 2020-02-03 17:56:05 +03:00
Anatoly
400b5ac402 change display_country_code type of returning value, refactored create guide method, added filtering award type list, change name of username_random -> string_random 2020-02-03 17:16:40 +03:00
dormantman
a544810cac Alter location field 2020-01-31 19:10:40 +03:00
Anatoly
b518faaf8b added DEFAULT_CALLING_CODE_ANTILLES_GUYANE_WEST_INDIES param, refactored serializers 2020-01-31 14:52:35 +03:00
Anatoly
08831de43a refactored a little 2020-01-31 13:43:44 +03:00
Anatoly
095cc2cb91 fix 2020-01-31 13:38:07 +03:00
Anatoly
fb1eee3e4c added hardcoded calling number for Antilles Guyane West Indies islands 2020-01-31 13:36:41 +03:00
Anatoly
ced3abe3cf added command to set the calling code for countries, modified setup_clean_db transfer, modified serializers 2020-01-30 17:57:53 +03:00
Anatoly
21b0786daf fix city model 2020-01-30 13:11:19 +03:00
Anatoly
302e22045e fixes 2020-01-29 16:59:16 +03:00
dormantman
56b5af1291 Added district_name field 2020-01-28 15:49:00 +03:00
Kuroshini
029cd36b98 localized cities #7 2020-01-28 12:35:30 +03:00
Kuroshini
ff34d66854 localized cities #2 2020-01-27 23:15:48 +03:00
Kuroshini
468527bc0e localized cities #1 2020-01-27 23:13:22 +03:00
Kuroshini
f5da5f71a3 base related qs for cities 2020-01-27 18:45:23 +03:00
Kuroshini
6d2aee572a fix configs 2020-01-23 18:02:26 +03:00
a.gorbunov
749775075c fix sort 2020-01-22 14:57:37 +00:00
Anatoly
8f206f2a9c remove city gallery 2020-01-15 14:20:51 +03:00
Anatoly
8cb0f51802 fix transfer command transfer_city_gallery, add field image to City model, fix serializer CityDetailSerializer 2020-01-15 13:22:54 +03:00
d.kuzmenko
700d8b5286 Merge branch 'feature/fix-location-sort' into 'develop'
Add order

See merge request gm/gm-backend!189
2019-12-30 07:45:00 +00:00
Anatoly
b41c185a65 see changes 2019-12-27 14:46:36 +03:00
littlewolf
2651ad1a29 Add order 2019-12-26 14:19:26 +03:00
littlewolf
d4c2af9d65 Fix country 2019-12-24 11:53:46 +03:00
littlewolf
0c2dacb3bf Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
#	apps/location/models.py
#	apps/transfer/serializers/news.py
#	apps/utils/models.py
2019-12-24 11:03:08 +03:00
Anatoly
cc7125b468 added image url to es 2019-12-23 09:19:16 +03:00
littlewolf
769a71b5eb Fix 2019-12-20 13:52:20 +03:00
littlewolf
3dd76503a5 Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
#	apps/location/models.py
#	apps/transfer/management/commands/transfer.py
2019-12-20 11:55:23 +03:00
Anatoly
36834835cd added filters to location views 2019-12-20 11:05:02 +03:00
Anatoly
956aae281f refactored fix duplicates 2019-12-16 13:46:52 +03:00
Anatoly
5fe8273379 fix incorrect removal of uniqueness constraint code field 2019-12-12 12:48:20 +03:00
Anatoly
28bf782731 update method to remove city duplicates 2019-12-12 11:17:59 +03:00
Anatoly
1b7c83899a Merge branch 'develop' into feature/fix-country-region-city-transfer 2019-12-11 15:01:17 +03:00
Anatoly
d330aa5205 refactoring 2019-12-09 13:34:17 +03:00
Dmitriy Kuzmenko
dfe4ab92a6 Merge remote-tracking branch 'origin/develop' into feature/add-city-search
# Conflicts:
#	_dockerfiles/db/Dockerfile
#	project/settings/local.py
2019-12-09 11:41:02 +03:00
littlewolf
c480089f30 Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
#	_dockerfiles/db/Dockerfile
#	apps/transfer/management/commands/transfer.py
#	docker-compose.mysql.yml
#	project/settings/local.py
2019-12-09 10:41:01 +03:00
Anatoly
29ff10fb4b added wine origins 2019-12-04 20:13:09 +03:00
littlewolf
93056cf524 Add filter
Add queryset
Add settings
2019-12-03 13:35:52 +03:00
Anatoly
0fb28467fb updated serializer 2019-11-29 13:26:05 +03:00
littlewolf
470bd096b0 Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
#	apps/location/models.py
#	apps/location/transfer_data.py
#	apps/location/views/common.py
#	apps/transfer/management/commands/transfer.py
#	project/settings/local.py
2019-11-21 14:43:30 +03:00
Kuroshini
be581c7b7d Dynamic front filters #1 2019-11-20 14:15:25 +03:00
Anatoly
ef1af8c3ac added city gallery 2019-11-20 13:27:26 +03:00
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
Kuroshini
f8c9a5c830 Wine regions route 2019-11-18 01:20:35 +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