Changeset e92836 in indico

Timestamp:

02/17/11 17:20:11 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

8ca1b0

Parents:

08b56c

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (01/18/11 15:45:34)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (02/17/11 17:20:11)

Message:

[FIX] Use proper email subjects and add pay link

• Do not use "new registrant" subject in payment emails
• Include payment link in payment summary email

File:

• indico/MaKaC/registration.py (modified) (3 diffs)

indico/MaKaC/registration.py

@@ -794 +794 @@
         idRegistrant=registrant.getIdPay()
         detailPayment=registrant.getConference().getModPay().getPaymentDetails()
-        subject=_("""New registrant in '%s': %s - payment""")%(strip_ml_tags(registrant.getConference().getTitle()), registrant.getFullName())
+        subject=_("""Payment summary for '%s': %s""")%(strip_ml_tags(registrant.getConference().getTitle()), registrant.getFullName())
         body= _("""
 Please use this information for your payment (except for e-payment):\n
@@ -852 +852 @@
         #    GenericMailer.send(GenericNotification(maildata))
         # send email to participants
+        paymentMsg = _("If you haven't paid for your registration yet, you can do it at %s") % urlHandlers.UHConfRegistrationFormCreationDone.getURL(registrant)
         if registrant.getEmail().strip() != "":
-            bodyReg = _("""%s\n\n%s\n\n%s""")%(
+            bodyReg = _("""%s\n\n%s\n\n%s\n\n%s""")%(
                 registrant.getConference().getModPay().getPaymentReceiptMsg(),
-                "\n".join(booking), body)
+                "\n".join(booking), body, paymentMsg)
             to=registrant.getEmail().strip()
             maildata = { "fromAddr": fromAddr, "toList": [to], "subject": subject, "body": bodyReg }
@@ -866 +867 @@
         idRegistrant=registrant.getIdPay()
 
-        subject= _("""New registrant in '%s': %s""")%(strip_ml_tags(registrant.getConference().getTitle()), registrant.getFullName())
+        subject= _("""Payment successful for '%s': %s""")%(strip_ml_tags(registrant.getConference().getTitle()), registrant.getFullName())
         body= _("""- detail of payment  : \n%s
 - date conference    : %s