From 309e513bb53bc675ecf5b2794d87ea76264a4c12 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 28 Mar 2018 09:32:42 +0300 Subject: [PATCH] finance email --- finance/models.py | 4 ++-- finance/views.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/finance/models.py b/finance/models.py index 401cfa6..01bf635 100755 --- a/finance/models.py +++ b/finance/models.py @@ -62,8 +62,8 @@ class Invoice(models.Model): def get_comment(self): return '''Вам выставлен счёт, для оплаты перейдите по ссылке - %s/api/v1/finance/payment/%s/''' % (settings.DOMAIN, self.yandex_pay.id,) if\ - self.comment is None or self.comment == "" else self.comment + %s/api/v1/finance/payment/%s/''' % (settings.DOMAIN, self.yandex_pay.id,) if \ + self.comment == "" else self.comment def __str__(self): return '%s:%s %s' % (self.id, self.get_status_display(), self.bill.user) diff --git a/finance/views.py b/finance/views.py index 7f8d95e..6dd7339 100644 --- a/finance/views.py +++ b/finance/views.py @@ -147,7 +147,7 @@ class InvoiceDetailView(APIView): invoice.price = price invoice.is_open = is_open - invoice.comment = comment if comment else None + invoice.comment = comment if invoice.method == 'Y' and invoice.yandex_pay is None: yandex_pay = Payment.objects.create( @@ -175,7 +175,7 @@ class InvoiceDetailView(APIView): text_content = plaintext.render(context) html_content = html.render(context) - msg = EmailMultiAlternatives(subject, text_content, from_email, [to], bcc=['dmitry.dolya@skillbox.ru'],) + msg = EmailMultiAlternatives(subject, text_content, from_email, [to], bcc=['dmitry.dolya@skillbox.ru']) msg.attach_alternative(html_content, "text/html") msg.send()