From 9575a6308872b229781278b466a4cc9a3c879487 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 29 Mar 2018 13:33:29 +0300 Subject: [PATCH] finance email --- finance/models.py | 16 +++++++++++++--- finance/serializers.py | 4 ++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/finance/models.py b/finance/models.py index a897c59..b94e527 100755 --- a/finance/models.py +++ b/finance/models.py @@ -58,7 +58,7 @@ class Invoice(models.Model): blank=True, editable=False) bill = models.ForeignKey(to=Bill, verbose_name="Связный счёт") is_open = models.BooleanField(default=True, verbose_name="Открывает ли платёж курс") - date = models.DateTimeField(auto_now_add=True) + date = models.DateTimeField(auto_now_add=True, verbose_name="Дата создания") def get_comment(self): return '''Вам выставлен счёт,''' if \ @@ -72,5 +72,15 @@ class Invoice(models.Model): verbose_name_plural = 'Платежи' -# class InstallmentPlan(models.Model): -# bill = models.OneToOneField(to=Bill, verbose_name="Связный счёт") +class InstallmentPlan(models.Model): + bill = models.OneToOneField(to=Bill, verbose_name="Связный счёт") + date = models.DateTimeField(auto_now_add=True, verbose_name="Дата создания") + invoice_amount = models.IntegerField(verbose_name="Количество платежей") + price = models.IntegerField(verbose_name="Цена одного платежа") + + def __str__(self): + return '%s' % self.bill.user.email + + class Meta: + verbose_name = 'Рассрочка' + verbose_name_plural = 'Рассрочки' diff --git a/finance/serializers.py b/finance/serializers.py index 6930f5a..4549c16 100644 --- a/finance/serializers.py +++ b/finance/serializers.py @@ -28,7 +28,7 @@ class BillSerializer(serializers.ModelSerializer): class InvoiceSerializer(serializers.ModelSerializer): status = serializers.SerializerMethodField() method = serializers.SerializerMethodField() - yandex_pay_id = serializers.SerializerMethodField() + yandex_pay = serializers.SerializerMethodField() class Meta: model = Invoice @@ -39,7 +39,7 @@ class InvoiceSerializer(serializers.ModelSerializer): return self.get_status_display() @staticmethod - def get_yandex_pay_id(self): + def get_yandex_pay(self): return None if self.yandex_pay is None else self.yandex_pay.id @staticmethod