From b062d0b729e48f84014fb788c9e0c93ff8cb07e9 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Mon, 3 Feb 2020 16:09:25 +0300 Subject: [PATCH 1/2] refactor plates --- apps/establishment/models.py | 8 +------- apps/establishment/serializers/back.py | 7 ------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index fc734e8c..d7eb3ad6 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -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) diff --git a/apps/establishment/serializers/back.py b/apps/establishment/serializers/back.py index 09aab542..06c965d6 100644 --- a/apps/establishment/serializers/back.py +++ b/apps/establishment/serializers/back.py @@ -829,26 +829,19 @@ 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): From 28253d74c435e60b04ac14db252e4238dc6e473b Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Mon, 3 Feb 2020 16:11:11 +0300 Subject: [PATCH 2/2] remove currency code --- apps/establishment/serializers/back.py | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/establishment/serializers/back.py b/apps/establishment/serializers/back.py index 06c965d6..2b6b32e9 100644 --- a/apps/establishment/serializers/back.py +++ b/apps/establishment/serializers/back.py @@ -837,7 +837,6 @@ class CardAndWinesPlatesSerializer(serializers.ModelSerializer): 'id', 'name', 'is_signature_plate', - 'currency_code', 'price', 'type', )