From 082a8a1470b248e13e41e55e62f43b3481b87685 Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Sun, 1 Sep 2019 17:22:53 +0300 Subject: [PATCH 1/4] add fake best_price_menu --- apps/establishment/models.py | 8 ++++++++ apps/establishment/serializers.py | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index b44ee4f9..de2891af 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -152,6 +152,14 @@ class Establishment(ProjectBaseMixin, ImageMixin, TraslatedFieldsMixin): raise ValidationError('Establishment type of subtype does not match') self.establishment_subtypes.add(establishment_subtype) + @property + def best_price_menu(self): + return 150 + + @property + def best_price_carte(self): + return 200 + class Position(BaseAttributes, TraslatedFieldsMixin): """Position model.""" diff --git a/apps/establishment/serializers.py b/apps/establishment/serializers.py index f46cbc4e..74c7286c 100644 --- a/apps/establishment/serializers.py +++ b/apps/establishment/serializers.py @@ -157,6 +157,9 @@ class EstablishmentSerializer(serializers.ModelSerializer): many=True) menu = MenuSerializers(source='menu_set', many=True, read_only=True) + best_price_menu = serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True) + best_price_carte = serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True) + class Meta: """Meta class.""" @@ -182,4 +185,6 @@ class EstablishmentSerializer(serializers.ModelSerializer): 'comments', 'employees', 'menu', + 'best_price_menu', + 'best_price_carte' ) From 6d6e1169a491aeaea829749ca45be8e7edadc50a Mon Sep 17 00:00:00 2001 From: evgeniy-st Date: Sun, 1 Sep 2019 17:30:39 +0300 Subject: [PATCH 2/4] extended establishment model (social) --- .../migrations/0013_auto_20190901_1428.py | 33 +++++++++++++++++++ apps/establishment/models.py | 8 +++++ apps/establishment/serializers.py | 4 +++ 3 files changed, 45 insertions(+) create mode 100644 apps/establishment/migrations/0013_auto_20190901_1428.py diff --git a/apps/establishment/migrations/0013_auto_20190901_1428.py b/apps/establishment/migrations/0013_auto_20190901_1428.py new file mode 100644 index 00000000..9e91b715 --- /dev/null +++ b/apps/establishment/migrations/0013_auto_20190901_1428.py @@ -0,0 +1,33 @@ +# Generated by Django 2.2.4 on 2019-09-01 14:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0012_auto_20190901_1251'), + ] + + operations = [ + migrations.AddField( + model_name='establishment', + name='booking', + field=models.URLField(blank=True, default=None, null=True, verbose_name='Booking URL'), + ), + migrations.AddField( + model_name='establishment', + name='facebook', + field=models.URLField(blank=True, default=None, null=True, verbose_name='Facebook URL'), + ), + migrations.AddField( + model_name='establishment', + name='lafourchette', + field=models.URLField(blank=True, default=None, null=True, verbose_name='Lafourchette URL'), + ), + migrations.AddField( + model_name='establishment', + name='twitter', + field=models.URLField(blank=True, default=None, null=True, verbose_name='Twitter URL'), + ), + ] diff --git a/apps/establishment/models.py b/apps/establishment/models.py index de2891af..41c4d721 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -108,6 +108,14 @@ class Establishment(ProjectBaseMixin, ImageMixin, TraslatedFieldsMixin): price_level = models.PositiveIntegerField(blank=True, null=True, default=None, verbose_name=_('Price level')) + facebook = models.URLField(blank=True, null=True, default=None, + verbose_name=_('Facebook URL')) + twitter = models.URLField(blank=True, null=True, default=None, + verbose_name=_('Twitter URL')) + lafourchette = models.URLField(blank=True, null=True, default=None, + verbose_name=_('Lafourchette URL')) + booking = models.URLField(blank=True, null=True, default=None, + verbose_name=_('Booking URL')) awards = generic.GenericRelation(to='main.Award') tags = generic.GenericRelation(to='main.MetaDataContent') reviews = generic.GenericRelation(to='review.Review') diff --git a/apps/establishment/serializers.py b/apps/establishment/serializers.py index 74c7286c..6a2fd4f7 100644 --- a/apps/establishment/serializers.py +++ b/apps/establishment/serializers.py @@ -179,6 +179,10 @@ class EstablishmentSerializer(serializers.ModelSerializer): 'tags', 'awards', 'schedule', + 'facebook', + 'twitter', + 'lafourchette', + 'booking', 'phones', 'emails', 'reviews', From e91a64ad6b925fdac71afab87fcc4d059e376ed0 Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Sun, 1 Sep 2019 17:51:13 +0300 Subject: [PATCH 3/4] add website --- apps/establishment/models.py | 4 +++- apps/establishment/serializers.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 41c4d721..20a9755d 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -108,6 +108,8 @@ class Establishment(ProjectBaseMixin, ImageMixin, TraslatedFieldsMixin): price_level = models.PositiveIntegerField(blank=True, null=True, default=None, verbose_name=_('Price level')) + website = models.URLField(blank=True, null=True, default=None, + verbose_name=_('Web site URL')) facebook = models.URLField(blank=True, null=True, default=None, verbose_name=_('Facebook URL')) twitter = models.URLField(blank=True, null=True, default=None, @@ -115,7 +117,7 @@ class Establishment(ProjectBaseMixin, ImageMixin, TraslatedFieldsMixin): lafourchette = models.URLField(blank=True, null=True, default=None, verbose_name=_('Lafourchette URL')) booking = models.URLField(blank=True, null=True, default=None, - verbose_name=_('Booking URL')) + verbose_name=_('Booking URL')) awards = generic.GenericRelation(to='main.Award') tags = generic.GenericRelation(to='main.MetaDataContent') reviews = generic.GenericRelation(to='review.Review') diff --git a/apps/establishment/serializers.py b/apps/establishment/serializers.py index 6a2fd4f7..c3bdc75e 100644 --- a/apps/establishment/serializers.py +++ b/apps/establishment/serializers.py @@ -179,6 +179,7 @@ class EstablishmentSerializer(serializers.ModelSerializer): 'tags', 'awards', 'schedule', + 'website', 'facebook', 'twitter', 'lafourchette', From 2f692bacf32779930cb018a2587efa99f242bff7 Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Sun, 1 Sep 2019 17:52:01 +0300 Subject: [PATCH 4/4] add migrate --- .../migrations/0014_establishment_website.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 apps/establishment/migrations/0014_establishment_website.py diff --git a/apps/establishment/migrations/0014_establishment_website.py b/apps/establishment/migrations/0014_establishment_website.py new file mode 100644 index 00000000..e685f469 --- /dev/null +++ b/apps/establishment/migrations/0014_establishment_website.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.4 on 2019-09-01 14:48 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0013_auto_20190901_1428'), + ] + + operations = [ + migrations.AddField( + model_name='establishment', + name='website', + field=models.URLField(blank=True, default=None, null=True, verbose_name='Web site URL'), + ), + ]