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

This commit is contained in:
alex 2020-02-03 16:57:09 +03:00
commit 4d52ec57c4
2 changed files with 1 additions and 15 deletions

View File

@ -1242,14 +1242,8 @@ class ContactEmail(models.Model):
class Plate(TranslatedFieldsMixin, models.Model):
"""Plate model."""
STR_FIELD_NAME = 'name'
name = TJSONField(
blank=True, null=True, default=None, verbose_name=_('name'),
help_text='{"en-GB":"some text"}')
description = TJSONField(
blank=True, null=True, default=None, verbose_name=_('description'),
help_text='{"en-GB":"some text"}')
name = models.TextField(blank=True, default=None, null=True, verbose_name=_('name'), help_text='Dish name')
price = models.DecimalField(
_('price'), max_digits=14, decimal_places=2)
is_signature_plate = models.BooleanField(_('is signature plate'), default=False)

View File

@ -829,26 +829,18 @@ class EstablishmentBackOfficeWineSerializer(serializers.ModelSerializer):
class CardAndWinesPlatesSerializer(serializers.ModelSerializer):
"""Serializer for card&wines backoffice section"""
name_translated = TranslatedField(read_only=True)
description_translated = TranslatedField(read_only=True)
type = serializers.CharField(source='menu.type')
class Meta:
model = models.Plate
fields = (
'id',
'name_translated',
'name',
'description_translated',
'description',
'is_signature_plate',
'currency_code',
'price',
'type',
)
extra_kwargs = {
'name': {'write_only': True},
'description': {'write_only': True},
}
def create(self, validated_data):