update establishment model, migrations
This commit is contained in:
parent
c942f00bd6
commit
910027d10f
|
|
@ -1,4 +1,4 @@
|
||||||
# Generated by Django 2.2.4 on 2019-08-27 09:29
|
# Generated by Django 2.2.4 on 2019-08-27 11:22
|
||||||
|
|
||||||
import django.contrib.postgres.fields.jsonb
|
import django.contrib.postgres.fields.jsonb
|
||||||
from django.db import migrations, models
|
from django.db import migrations, models
|
||||||
|
|
@ -56,6 +56,7 @@ class Migration(migrations.Migration):
|
||||||
('description', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=None, help_text='{"en":"some text"}', null=True, verbose_name='Description')),
|
('description', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=None, help_text='{"en":"some text"}', null=True, verbose_name='Description')),
|
||||||
('public_mark', models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='Public mark')),
|
('public_mark', models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='Public mark')),
|
||||||
('toque_number', models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='Toque number')),
|
('toque_number', models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='Toque number')),
|
||||||
|
('price_level', models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='Price level')),
|
||||||
('address', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='location.Address', verbose_name='Address')),
|
('address', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='location.Address', verbose_name='Address')),
|
||||||
('establishment_subtypes', models.ManyToManyField(related_name='subtype_establishment', to='establishment.EstablishmentSubType', verbose_name='Subtype')),
|
('establishment_subtypes', models.ManyToManyField(related_name='subtype_establishment', to='establishment.EstablishmentSubType', verbose_name='Subtype')),
|
||||||
('establishment_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='establishment', to='establishment.EstablishmentType', verbose_name='Type')),
|
('establishment_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='establishment', to='establishment.EstablishmentType', verbose_name='Type')),
|
||||||
|
|
|
||||||
|
|
@ -88,6 +88,9 @@ class Establishment(ProjectBaseMixin, ImageMixin):
|
||||||
address = models.ForeignKey(Address, blank=True, null=True, default=None,
|
address = models.ForeignKey(Address, blank=True, null=True, default=None,
|
||||||
on_delete=models.PROTECT,
|
on_delete=models.PROTECT,
|
||||||
verbose_name=_('Address'))
|
verbose_name=_('Address'))
|
||||||
|
price_level = models.PositiveIntegerField(blank=True, null=True,
|
||||||
|
default=None,
|
||||||
|
verbose_name=_('Price level'))
|
||||||
|
|
||||||
objects = EstablishmentManager()
|
objects = EstablishmentManager()
|
||||||
|
|
||||||
|
|
@ -104,7 +107,7 @@ class Establishment(ProjectBaseMixin, ImageMixin):
|
||||||
@property
|
@property
|
||||||
def subtypes(self):
|
def subtypes(self):
|
||||||
return EstablishmentSubType.objects.filter(
|
return EstablishmentSubType.objects.filter(
|
||||||
establishments=self,
|
subtype_establishment=self,
|
||||||
establishment_type=self.establishment_type,
|
establishment_type=self.establishment_type,
|
||||||
establishment_type__use_subtypes=True)
|
establishment_type__use_subtypes=True)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
"""Establishment serializers."""
|
"""Establishment serializers."""
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
from establishment import models
|
from establishment import models
|
||||||
|
from location.serializers import AddressSerializer
|
||||||
|
|
||||||
|
|
||||||
class EstablishmentTypeSerializer(serializers.ModelSerializer):
|
class EstablishmentTypeSerializer(serializers.ModelSerializer):
|
||||||
|
|
@ -10,7 +11,7 @@ class EstablishmentTypeSerializer(serializers.ModelSerializer):
|
||||||
"""Meta class."""
|
"""Meta class."""
|
||||||
|
|
||||||
model = models.EstablishmentType
|
model = models.EstablishmentType
|
||||||
fields = ('id', 'name', 'use_subtypes')
|
fields = ('id', 'name',)
|
||||||
|
|
||||||
|
|
||||||
class EstablishmentSubTypeSerializer(serializers.ModelSerializer):
|
class EstablishmentSubTypeSerializer(serializers.ModelSerializer):
|
||||||
|
|
@ -30,6 +31,7 @@ class EstablishmentSerializer(serializers.ModelSerializer):
|
||||||
description_trans = serializers.CharField()
|
description_trans = serializers.CharField()
|
||||||
type = EstablishmentTypeSerializer(source='establishment_type')
|
type = EstablishmentTypeSerializer(source='establishment_type')
|
||||||
subtypes = EstablishmentSubTypeSerializer(many=True)
|
subtypes = EstablishmentSubTypeSerializer(many=True)
|
||||||
|
address = AddressSerializer()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
"""Meta class."""
|
"""Meta class."""
|
||||||
|
|
@ -40,7 +42,9 @@ class EstablishmentSerializer(serializers.ModelSerializer):
|
||||||
'name_trans',
|
'name_trans',
|
||||||
'description_trans',
|
'description_trans',
|
||||||
'public_mark',
|
'public_mark',
|
||||||
|
'price_level',
|
||||||
'type',
|
'type',
|
||||||
'subtypes',
|
'subtypes',
|
||||||
|
'image',
|
||||||
'address',
|
'address',
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -88,6 +88,8 @@ class Address(models.Model):
|
||||||
_('Coordinates'), blank=True, null=True, default=None)
|
_('Coordinates'), blank=True, null=True, default=None)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
"""Meta class."""
|
||||||
|
|
||||||
verbose_name_plural = _('Address')
|
verbose_name_plural = _('Address')
|
||||||
verbose_name = _('Address')
|
verbose_name = _('Address')
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user