Merge branch 'feature/establishment_currency' into 'develop'

Added currency to establishment model

See merge request gm/gm-backend!69
This commit is contained in:
d.kuzmenko 2019-10-24 11:06:58 +00:00
commit b6283863f4
3 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,24 @@
# Generated by Django 2.2.4 on 2019-10-24 08:33
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('account', '0015_merge_20191023_1317'),
]
operations = [
migrations.AlterField(
model_name='role',
name='role',
field=models.PositiveIntegerField(choices=[(1, 'Standard user'), (2, 'Comments moderator'), (3, 'Country admin'), (4, 'Content page manager'), (5, 'Establishment manager'), (6, 'Reviewer manager'), (7, 'Restaurant reviewer')], verbose_name='Role'),
),
migrations.AlterField(
model_name='userrole',
name='establishment',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='establishment.Establishment', verbose_name='Establishment'),
),
]

View File

@ -17,7 +17,7 @@ from phonenumber_field.modelfields import PhoneNumberField
from collection.models import Collection from collection.models import Collection
from location.models import Address from location.models import Address
from main.models import Award from main.models import Award, Currency
from review.models import Review from review.models import Review
from utils.models import (ProjectBaseMixin, TJSONField, URLImageMixin, from utils.models import (ProjectBaseMixin, TJSONField, URLImageMixin,
TranslatedFieldsMixin, BaseAttributes) TranslatedFieldsMixin, BaseAttributes)
@ -362,6 +362,9 @@ class Establishment(ProjectBaseMixin, URLImageMixin, TranslatedFieldsMixin):
reviews = generic.GenericRelation(to='review.Review') reviews = generic.GenericRelation(to='review.Review')
comments = generic.GenericRelation(to='comment.Comment') comments = generic.GenericRelation(to='comment.Comment')
favorites = generic.GenericRelation(to='favorites.Favorites') favorites = generic.GenericRelation(to='favorites.Favorites')
currency = models.ForeignKey(Currency, blank=True, null=True, default=None,
on_delete=models.PROTECT,
verbose_name=_('currency'))
objects = EstablishmentQuerySet.as_manager() objects = EstablishmentQuerySet.as_manager()

View File

@ -163,6 +163,7 @@ class EstablishmentBaseSerializer(ProjectModelSerializer):
address = AddressBaseSerializer() address = AddressBaseSerializer()
in_favorites = serializers.BooleanField(allow_null=True) in_favorites = serializers.BooleanField(allow_null=True)
tags = TagBaseSerializer(read_only=True, many=True) tags = TagBaseSerializer(read_only=True, many=True)
currency = CurrencySerializer()
class Meta: class Meta:
"""Meta class.""" """Meta class."""
@ -180,6 +181,7 @@ class EstablishmentBaseSerializer(ProjectModelSerializer):
'in_favorites', 'in_favorites',
'address', 'address',
'tags', 'tags',
'currency'
] ]