0002-lingo-send-emails-when-notifying-new-invoices-13122.patch

Serghei Mihai (congés, retour 15/05), 09 mars 2018 13:48

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/6] lingo: send emails when notifying new invoices (#13122)

 combo/apps/lingo/models.py                         | 28 ++++++++++++++++-
 .../combo/invoice_email_notification_body.html     | 20 ++++++++++++
 .../combo/invoice_email_notification_body.txt      | 12 ++++++++
 .../combo/invoice_email_notification_subject.txt   | 10 ++++++
 combo/settings.py                                  |  3 ++
 tests/test_lingo_remote_regie.py                   | 36 ++++++++++++++++++++++
 6 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 combo/apps/lingo/templates/lingo/combo/invoice_email_notification_body.html
 create mode 100644 combo/apps/lingo/templates/lingo/combo/invoice_email_notification_body.txt
 create mode 100644 combo/apps/lingo/templates/lingo/combo/invoice_email_notification_subject.txt

     from django.forms import models as model_forms, Select
     from django.utils.translation import ugettext_lazy as _
     from django.utils import timezone, dateparse
     from django.core.mail import EmailMultiAlternatives
     from django.core.urlresolvers import reverse
     from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
     from django.utils.http import urlencode
     from django.contrib.auth.models import User
     from django.template.loader import render_to_string
     from combo.data.fields import RichTextField
     from combo.data.models import CellBase
-...
                         notification = Notification.objects.filter_by_id(invoice_id).filter(user=user).last()
                         if notification.end_timestamp < timezone.now():
                             remind_id = 'remind-%s' % invoice_id
                             Notification.notify(user, _('Reminder: invoice %s to pay') % invoice['label'],
                             notification, created = Notification.notify(user, _('Reminder: invoice %s to pay') % invoice['label'],
                                                 id=remind_id, end_timestamp=notification_end_timestamp)
                     if created:
                         self.notify_remote_invoice_by_email(user, invoice)
         def notify_remote_invoice_by_email(self, user, invoice):
             subject_template = 'lingo/combo/invoice_email_notification_subject.txt'
             text_body_template = 'lingo/combo/invoice_email_notification_body.txt'
             html_body_template = 'lingo/combo/invoice_email_notification_body.html'
             remote_item = build_remote_item(invoice, self)
             payment_url = reverse('view-item', kwargs={'regie_id': self.id,
                                 'item_crypto_id': remote_item.crypto_id})
             ctx = {'item': remote_item}
             ctx.update({'payment_url': urlparse.urljoin(settings.SITE_BASE_URL, payment_url)})
             subject = render_to_string([subject_template], ctx).strip()
             text_body = render_to_string([text_body_template], ctx)
             html_body = render_to_string([html_body_template], ctx)
             message = EmailMultiAlternatives(subject, text_body, to=[user.email])
             message.attach_alternative(html_body, 'text/html')
             if invoice['has_pdf']:
                 invoice_pdf = self.get_invoice_pdf(user, invoice['id'])
                 message.attach('%s.pdf' % invoice['id'], invoice_pdf.content, 'application/pdf')
             message.send()
     class BasketItem(models.Model):

     {% load i18n %}
     <html>
       <body style="max-width: 60em">
         <p>{% blocktrans with id=item.id creation_date=item.creation_date|date:"DATE_FORMAT" amount=item.amount %}
           We inform you that your invoice nr. {{ id }} issued on {{ creation_date }} of amount of {{ amount }}€ is available on {{ site_title }}.
           {% endblocktrans %}</p>
         {% if item.online_payment %}
         <p>{% blocktrans %}You can <a href="{{ payment_url }}">view and pay it online</a>.{% endblocktrans %}</p>
         {% else %}
         <p>{% blocktrans %}You can view it by going on your <a href="{{ portal_url }}">{{ site_title }}</a>.{% endblocktrans %}</p>
         {% if item.no_online_payment_reason == 'autobilling' %}
         <p>{% blocktrans with debit_date=item.payment_limit_date|date:"DATE_FORMAT" %}
           The amount of this invoice will be debited from your account at {{ debit_date }}.
           {% endblocktrans %}
         </p>
         {% endif %}
         {% endif %}
       </body>
     </html>

     {% load i18n %}
     {% blocktrans with id=item.id creation_date=item.creation_date|date:"DATE_FORMAT" amount=item.amount %}We inform you that your invoice nr. {{ id }} issued on {{ creation_date }} of amount of {{ amount }}€ is available on {{ site_title }}.{% endblocktrans %}
     {% if item.online_payment %}
     {% blocktrans %}You can view and pay it online on {{ payment_url }}.{% endblocktrans %}
     {% else %}{% blocktrans %}You can view it by going on {{ portal_url }}.{% endblocktrans %}
     {% if item.no_online_payment_reason == 'autobilling' %}
     {% blocktrans with debit_date=item.payment_limit_date|date:"DATE_FORMAT" %}The amount of this invoice will be debited from your account at {{ debit_date }}.{% endblocktrans %}
     {% endif %}
     {% endif %}

     {% load i18n %}
     {% if site_title %}
     {% blocktrans with invoice_id=item.id %}
     {{ site_title }}: new invoice nr. {{ invoice_id }} is available
     {% endblocktrans %}
     {% else %}
     {% blocktrans with invoice_id=item.id %}
     New invoice nr. {{ invoice_id }} is available
     {% endblocktrans %}
     {% endif %}

     # default delay for invoice payment notifications in days
     LINGO_NEW_INVOICES_NOTIFICATION_DELAY = 10
     # default site
     SITE_BASE_URL = 'http://localhost'
     # timeout used in python-requests call, in seconds
     # we use 28s by default: timeout just before web server, which is usually 30s
     REQUESTS_TIMEOUT = 28

     from django.core.urlresolvers import reverse
     from django.conf import settings
     from django.core.management import call_command
     from django.utils.timezone import timedelta, now
     from django.contrib.auth.models import User
     from combo.utils import check_query, aes_hex_encrypt
     from combo.data.models import Page
-...
         },
+    ]
     @pytest.fixture
     def user():
         try:
             admin = User.objects.get(username='foo')
         except User.DoesNotExist:
             admin = User.objects.create_user('foo', email=None, password='bar')
         admin.email = 'foo@example.net'
         admin.save()
         return admin
     @pytest.fixture
     def remote_regie():
         try:
-...
         assert Transaction.objects.all()[0].to_be_paid_remote_items is None
         call_command('update_transactions')
     @mock.patch('combo.apps.lingo.models.requests.get')
     def test_send_new_remote_invoices_by_email(mock_get, user, app, remote_regie, mailoutbox):
         datetime_format = '%Y-%m-%dT%H:%M:%S'
         invoice_now = now()
         creation_date = (invoice_now - timedelta(days=1)).strftime(datetime_format)
         pay_limit_date = (invoice_now + timedelta(days=30)).strftime(datetime_format)
         FAKE_PENDING_INVOICES = {
             'data' :  {'foo': {'invoices': [{'id': '01', 'label': '010101', 'paid': False,
                             'amount': '37.26',  'total_amount': '37.26', 'online_payment': True,
                             'has_pdf': True, 'created': creation_date,
                             'pay_limit_date': pay_limit_date}]},
+            }
+        }
         mock_response = mock.Mock(status_code=200, content=json.dumps(FAKE_PENDING_INVOICES))
         mock_response.json.return_value = FAKE_PENDING_INVOICES
         mock_get.return_value = mock_response
         remote_regie.notify_new_remote_invoices()
         assert len(mailoutbox) == 1
         assert mailoutbox[0].recipients() == ['foo@example.net']
         assert mailoutbox[0].from_email == settings.DEFAULT_FROM_EMAIL
         assert mailoutbox[0].subject == 'New invoice nr. 01 is available'
         assert mailoutbox[0].attachments[0][0] == '01.pdf'
         assert mailoutbox[0].attachments[0][2] == 'application/pdf'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0002-lingo-send-emails-when-notifying-new-invoices-13122.patch