diff --git a/apps/establishment/migrations/0082_establishment_western_name.py b/apps/establishment/migrations/0082_establishment_western_name.py new file mode 100644 index 00000000..a5c5e942 --- /dev/null +++ b/apps/establishment/migrations/0082_establishment_western_name.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.7 on 2020-01-28 12:33 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0081_menuuploads_title'), + ] + + operations = [ + migrations.AddField( + model_name='establishment', + name='western_name', + field=models.CharField(default='', max_length=255, verbose_name='Western name'), + ), + ] diff --git a/apps/establishment/migrations/0083_establishment_instagram.py b/apps/establishment/migrations/0083_establishment_instagram.py new file mode 100644 index 00000000..e5733f6d --- /dev/null +++ b/apps/establishment/migrations/0083_establishment_instagram.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.7 on 2020-01-28 12:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0082_establishment_western_name'), + ] + + operations = [ + migrations.AddField( + model_name='establishment', + name='instagram', + field=models.URLField(blank=True, default=None, max_length=255, null=True, verbose_name='Instagram URL'), + ), + ] diff --git a/apps/establishment/models.py b/apps/establishment/models.py index fbe333cf..b1adf435 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -528,6 +528,8 @@ class Establishment(GalleryMixin, ProjectBaseMixin, URLImageMixin, name = models.CharField(_('name'), max_length=255, default='') transliterated_name = models.CharField(default='', max_length=255, verbose_name=_('Transliterated name')) + western_name = models.CharField(default='', max_length=255, + verbose_name=_('Western name')) index_name = models.CharField(_('Index name'), max_length=255, default='') description = TJSONField(blank=True, null=True, default=None, verbose_name=_('description'), @@ -559,6 +561,8 @@ class Establishment(GalleryMixin, ProjectBaseMixin, URLImageMixin, verbose_name=_('Facebook URL')) twitter = models.URLField(blank=True, null=True, default=None, max_length=255, verbose_name=_('Twitter URL')) + instagram =models.URLField(blank=True, null=True, default=None, max_length=255, + verbose_name=_('Instagram URL')) lafourchette = models.URLField(blank=True, null=True, default=None, max_length=255, verbose_name=_('Lafourchette URL')) guestonline_id = models.PositiveIntegerField(blank=True, verbose_name=_('guestonline id'), diff --git a/apps/establishment/serializers/back.py b/apps/establishment/serializers/back.py index cf463454..8d02f252 100644 --- a/apps/establishment/serializers/back.py +++ b/apps/establishment/serializers/back.py @@ -156,6 +156,7 @@ class EstablishmentRUDSerializer(model_serializers.EstablishmentBaseSerializer): fields = [ 'id', 'slug', + 'western_name', 'name', 'website', 'phones', @@ -169,6 +170,7 @@ class EstablishmentRUDSerializer(model_serializers.EstablishmentBaseSerializer): # TODO: check in admin filters 'is_publish', 'address', + 'transportation', 'tags', ] diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index cd60e9f1..5d53eec8 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -464,6 +464,7 @@ class EstablishmentDetailSerializer(EstablishmentBaseSerializer): 'website', 'facebook', 'twitter', + 'instagram', 'lafourchette', 'booking', 'phones', diff --git a/apps/location/migrations/0037_address_district_name.py b/apps/location/migrations/0037_address_district_name.py new file mode 100644 index 00000000..294989e6 --- /dev/null +++ b/apps/location/migrations/0037_address_district_name.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.7 on 2020-01-28 12:47 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('location', '0036_auto_20200127_2004'), + ] + + operations = [ + migrations.AddField( + model_name='address', + name='district_name', + field=models.CharField(blank=True, default='', max_length=500, verbose_name='District name'), + ), + ] diff --git a/apps/location/models.py b/apps/location/models.py index 5b2fa721..a50b1f41 100644 --- a/apps/location/models.py +++ b/apps/location/models.py @@ -223,6 +223,8 @@ class Address(models.Model): default='', help_text=_('Ex.: 350018')) coordinates = models.PointField( _('Coordinates'), blank=True, null=True, default=None) + district_name = models.CharField( + _('District name'), max_length=500, blank=True, default='') old_id = models.IntegerField(null=True, blank=True, default=None) class Meta: diff --git a/apps/location/serializers/common.py b/apps/location/serializers/common.py index ff356be4..00fc893a 100644 --- a/apps/location/serializers/common.py +++ b/apps/location/serializers/common.py @@ -171,6 +171,7 @@ class AddressBaseSerializer(serializers.ModelSerializer): 'postal_code', 'latitude', 'longitude', + 'district_name', # todo: remove this fields (backward compatibility) 'geo_lon',