Merge remote-tracking branch 'origin/feature/establishment_transportation_field' into develop

# Conflicts:
#	apps/establishment/models.py

apps/establishment/migrations/0019_establishment_transportation.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2019-09-17 10:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('establishment', '0018_socialnetwork'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='establishment',
+            name='transportation',
+            field=models.TextField(blank=True, default=None, null=True, verbose_name='Transportation'),
+        ),
+    ]

apps/establishment/models.py

@@ -264,6 +264,8 @@ class Establishment(ProjectBaseMixin, ImageMixin, TranslatedFieldsMixin):
     tags = generic.GenericRelation(to='main.MetaDataContent')
     reviews = generic.GenericRelation(to='review.Review')
     comments = generic.GenericRelation(to='comment.Comment')
+    transportation = models.TextField(blank=True, null=True, default=None,
+                                      verbose_name=_('Transportation'))
     collections = generic.GenericRelation(to='collection.CollectionItem')
 
     objects = EstablishmentQuerySet.as_manager()

apps/establishment/serializers/common.py

@@ -241,6 +241,7 @@ class EstablishmentDetailSerializer(EstablishmentListSerializer):
             'menu',
             'best_price_menu',
             'best_price_carte',
+            'transportation',
         ]
 
     def get_review(self, obj):