Changeset ab85b3 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:

08b56c

Parents:

8dee82

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (01/17/11 14:54:14)

git-committer:

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

Message:

[IMP] Various regform/epayment improvements

• Get rid of space right after '('
• Allow disabling of certain conference registration emails
• Make the "payment successful" email (partially) customizable
• Make the "payment summary" email (partially) customizable
• fixes #602

Location:

indico

Files:

• MaKaC/epayment.py (modified) (2 diffs)
• MaKaC/registration.py (modified) (7 diffs)
• MaKaC/webinterface/pages/epayments.py (modified) (4 diffs)
• MaKaC/webinterface/pages/registrationForm.py (modified) (3 diffs)
• MaKaC/webinterface/rh/ePaymentModif.py (modified) (1 diff)
• MaKaC/webinterface/rh/registrationFormDisplay.py (modified) (1 diff)
• MaKaC/webinterface/rh/registrationFormModif.py (modified) (1 diff)
• MaKaC/webinterface/tpls/ConfModifEPayment.tpl (modified) (2 diffs)
• MaKaC/webinterface/tpls/ConfModifEPaymentDataModification.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/ConfModifRegForm.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/ConfModifRegFormDataModification.tpl (modified) (3 diffs)
• htdocs/css/Default.css (modified) (1 diff)

indico/MaKaC/epayment.py

@@ -170 +170 @@
             return "%s"%(self.getPaymentSpecificConditions())
 
+    def getPaymentReceiptMsg(self):
+        try:
+            return self.receiptMsg
+        except:
+            self.receiptMsg = EPaymentDefaultValues.getDefaultReceiptMsg()
+        return self.receiptMsg
+
+    def setPaymentReceiptMsg(self, txt):
+        self.receiptMsg = txt
+
+    def getPaymentSuccessMsg(self):
+        try:
+            return self.successMsg
+        except:
+            self.successMsg = EPaymentDefaultValues.getDefaultSuccessMsg()
+        return self.successMsg
+
+    def setPaymentSuccessMsg(self, txt):
+        self.successMsg = txt
+
     def isActivated(self):
         return self.activated
@@ -301 +321 @@
 The Conference committee reserves the right to refuse reimbursement of part or all of the fee in the case of late cancellation. However, each case of cancellation would be considered individually.
 """
+
+    @staticmethod
+    def getDefaultSuccessMsg():
+        return """Congratulations, your payment was successful."""
+
+    @staticmethod
+    def getDefaultReceiptMsg():
+        return """Please, see the summary of your order:"""
 
 class BaseEPayMod(Persistent):

indico/MaKaC/registration.py

@@ -126 +126 @@
         form.setActivated(self.isActivated())
         form.setMandatoryAccount(self.isMandatoryAccount())
+        form.setSendRegEmail(self.isSendRegEmail())
+        form.setSendReceiptEmail(self.isSendReceiptEmail())
+        form.setSendPaidEmail(self.isSendPaidEmail())
+        form.setAllSessions()
         form.notification=self.getNotification().clone()
         form.personalData = self.getPersonalData().clone()
@@ -202 +206 @@
     def setMandatoryAccount(self, v=True):
         self._mandatoryAccount = v
+
+    def isSendRegEmail(self):
+        try:
+            if self._sendRegEmail:
+                pass
+        except AttributeError, e:
+            self._sendRegEmail = True
+        return self._sendRegEmail
+
+    def setSendRegEmail(self, v=True):
+        self._sendRegEmail = v
+
+    def isSendReceiptEmail(self):
+        try:
+            if self._sendReceiptEmail:
+                pass
+        except AttributeError, e:
+            self._sendReceiptEmail = True
+        return self._sendReceiptEmail
+
+    def setSendReceiptEmail(self, v=True):
+        self._sendReceiptEmail = v
+
+    def isSendPaidEmail(self):
+        try:
+            if self._sendPaidEmail:
+                pass
+        except AttributeError, e:
+            self._sendPaidEmail = True
+        return self._sendPaidEmail
+
+    def setSendPaidEmail(self, v=True):
+        self._sendPaidEmail = v
 
     def setTitle( self, newName ):
@@ -723 +760 @@
             GenericMailer.send(GenericNotification(maildata))
         # send mail to participant
-        if rp.getEmail().strip() != "":
+        if regForm.isSendRegEmail() and rp.getEmail().strip() != "":
             bodyReg = _("""
 Congratulations, your registration to %s was successful%s See your information below:
@@ -816 +853 @@
         # send email to participants
         if registrant.getEmail().strip() != "":
-            bodyReg = _("""
-             Please, see the summary of your order:\n\n%s\n\n%s""")%\
-                                                                                 ("\n".join(booking),body)
+            bodyReg = _("""%s\n\n%s\n\n%s""")%(
+                registrant.getConference().getModPay().getPaymentReceiptMsg(),
+                "\n".join(booking), body)
             to=registrant.getEmail().strip()
             maildata = { "fromAddr": fromAddr, "toList": [to], "subject": subject, "body": bodyReg }
@@ -830 +867 @@
 
         subject= _("""New registrant in '%s': %s""")%(strip_ml_tags(registrant.getConference().getTitle()), registrant.getFullName())
-        body= _("""
-        thank you for the payment :\n
-
-- detail of payment  : \n%s
+        body= _("""- detail of payment  : \n%s
 - date conference    : %s
 - name conference    : %s
@@ -839 +873 @@
         booking=[]
         total=0
-        booking.append( _(""" Thank you for this payment """))
         booking.append("""Quantity\t\tItem\t\tunit.price\t\tCost""")
         for gsf in registrant.getMiscellaneousGroupList():
@@ -886 +919 @@
             GenericMailer.send(GenericNotification(maildata))
         # send email to participant
-        if registrant.getEmail().strip() != "":
-            bodyReg =  _("""
-             Congratulations, your registration and your payment were successful. See your informations below:\n\n%s\n\n%s""")%\
-                                                                                 ("\n".join(booking),body)
+        if regForm.isSendPaidEmail() and registrant.getEmail().strip() != "":
+            bodyReg =  _("""%s\n\n%s\n\n%s""")%(registrant.getConference().getModPay().getPaymentSuccessMsg(),
+                                                                "\n".join(booking),
+                                                                body)
             to=registrant.getEmail().strip()
             maildata = { "fromAddr": fromAddr, "toList": [to], "subject": subject, "body": bodyReg }

indico/MaKaC/webinterface/pages/epayments.py

@@ -122 +122 @@
             vars["conditionsPayment"] = self._conf.getModPay().getPaymentConditions()
             vars["specificConditionsPayment"] = self._conf.getModPay().getPaymentSpecificConditions()
+            vars["successMsgPayment"] = self._conf.getModPay().getPaymentSuccessMsg()
+            vars["receiptMsgPayment"] = self._conf.getModPay().getPaymentReceiptMsg()
             vars["conditionsEnabled"] = "DISABLED"
             if self._conf.getModPay().arePaymentConditionsEnabled():
@@ -134 +136 @@
             vars["conditionsEnabled"] = "DISABLED"
             vars["specificConditionsPayment"] = ""
+            vars["successMsgPayment"] = ""
+            vars["receiptMsgPayment"] = ""
         vars["dataModificationURL"]=urlHandlers.UHConfModifEPaymentdetailPaymentModification.getURL(self._conf)
         vars["sections"] = self._getSectionsHTML()
@@ -152 +156 @@
         vars = wcomponents.WTemplated.getVars(self)
         vars["postURL"]=urlHandlers.UHConfModifEPaymentPerformdetailPaymentModification.getURL(self._conf)
+        vars["dataModificationURL"]=urlHandlers.UHConfModifRegFormDataModification.getURL(self._conf)
         vars["detailPayment"]= self._conf.getModPay().getPaymentDetails()
         vars["conditionsPayment"]= self._conf.getModPay().getPaymentConditions()
@@ -158 +163 @@
         if self._conf.getModPay().arePaymentConditionsEnabled():
             vars["conditionsEnabled"]= "checked=\"checked\""
+        vars["successMsgPayment"] = self._conf.getModPay().getPaymentSuccessMsg()
+        vars["receiptMsgPayment"] = self._conf.getModPay().getPaymentReceiptMsg()
+        regForm = self._conf.getRegistrationForm()
+        vars["successMsgPaymentEnabled"] = regForm.isSendPaidEmail() and _("ENABLED") or _("DISABLED")
+        vars["receiptMsgPaymentEnabled"] = regForm.isSendReceiptEmail() and _("ENABLED") or _("DISABLED")
         return vars
 

indico/MaKaC/webinterface/pages/registrationForm.py

@@ -253 +253 @@
             if not regForm.isMandatoryAccount():
                 vars["mandatoryAccount"] =  _("No")
+            vars["sendRegEmail"] = _("Yes")
+            if not regForm.isSendRegEmail():
+                vars["sendRegEmail"] = _("No")
+            vars["sendReceiptEmail"] = _("Yes")
+            if not regForm.isSendReceiptEmail():
+                vars["sendReceiptEmail"] = _("No")
+            vars["sendPaidEmail"] = _("Yes")
+            if not regForm.isSendPaidEmail():
+                vars["sendPaidEmail"] = _("No")
             vars["Currency"]=regForm.getCurrency()
         else:
@@ -270 +279 @@
             vars["notification"] = ""
             vars["mandatoryAccount"] = ""
+            vars["sendRegEmail"] = ""
+            vars["sendReceiptEmail"] = ""
+            vars["sendPaidEmail"] = ""
             vars["Currency"]=""
         vars["sections"] = self._getSectionsHTML()
@@ -327 +339 @@
         vars["mandatoryAccount"]=""
         if regForm.isMandatoryAccount():
-            vars["mandatoryAccount"]= _("CHECKED")
+            vars["mandatoryAccount"]= "CHECKED"
+        vars["sendRegEmail"] = ""
+        vars["sendReceiptEmail"] = ""
+        vars["sendPaidEmail"] = ""
+        if regForm.isSendRegEmail():
+            vars["sendRegEmail"] = "CHECKED"
+        if regForm.isSendReceiptEmail():
+            vars["sendReceiptEmail"] = "CHECKED"
+        if regForm.isSendPaidEmail():
+            vars["sendPaidEmail"] = "CHECKED"
         vars["Currency"]="""<select name="%s">%s</select>"""%("Currency", CurrencyRegistry.getSelectItemsHTML(regForm.getCurrency()))
         vars["extraTimeAmount"] = regForm.getEndExtraTimeAmount()

indico/MaKaC/webinterface/rh/ePaymentModif.py

@@ -76 +76 @@
             modpay.setPaymentDetails(params.get("detailPayment", ""))
             modpay.setPaymentSpecificConditions(params.get("specificConditionsPayment", ""))
+            modpay.setPaymentSuccessMsg(params.get("successMsgPayment", ""))
+            modpay.setPaymentReceiptMsg(params.get("receiptMsgPayment", ""))
             from MaKaC.common import HelperMaKaCInfo
             minfo = HelperMaKaCInfo.getMaKaCInfoInstance()

indico/MaKaC/webinterface/rh/registrationFormDisplay.py

@@ -224 +224 @@
         if self._registrant is not None:
             # avoid multiple sending in case of db conflict
-            if not hasattr(self, "_emailSent"):
+            if not hasattr(self, "_emailSent") and self._regForm.isSendReceiptEmail():
                 self._regForm.getNotification().sendEmailNewRegistrantDetailsPay(self._regForm,self._registrant)
                 self._emailSent = True

indico/MaKaC/webinterface/rh/registrationFormModif.py

@@ -127 +127 @@
             regForm.getNotification().setCCList( utils.getEmailList(params.get("ccList", "")) )
             regForm.setMandatoryAccount(params.has_key("mandatoryAccount"))
+            regForm.setSendRegEmail(params.has_key("sendRegEmail"))
+            regForm.setSendReceiptEmail(params.has_key("sendReceiptEmail"))
+            regForm.setSendPaidEmail(params.has_key("sendPaidEmail"))
             regForm.setCurrency(params.get("Currency",""))
         self._redirect(urlHandlers.UHConfModifRegForm.getURL(self._conf))

indico/MaKaC/webinterface/tpls/ConfModifEPayment.tpl

@@ -6 +6 @@
         <td bgcolor="white" width="100%%" class="blacktext" colspan="2">
             <form action="%(setStatusURL)s" method="POST">
-                <input name="changeTo" type="hidden" value="%(changeTo)s"> 
-                <b>%(status)s</b> 
+                <input name="changeTo" type="hidden" value="%(changeTo)s">
+                <b>%(status)s</b>
                 <small><input type="submit" value="%(changeStatus)s"></small>
             </form>
@@ -41 +41 @@
 <%end%>
     <tr>
-        <td class="dataCaptionTD"><span class="dataCaptionFormat">Conditions</span></td>
+        <td class="dataCaptionTD"><span class="dataCaptionFormat"><%= _("Conditions")%></span></td>
         <td bgcolor="white" width="100%%" class="blacktext">
            <TEXTAREA ROWS="6" COLS="60" disabled="true" >%(specificConditionsPayment)s</TEXTAREA>
+           <br/>
+        </td>
+        <td></td>
+    </tr>
+    <tr>
+        <td class="dataCaptionTD"><span class="dataCaptionFormat"><%= _("Payment Summary Email Message")%></span></td>
+        <td bgcolor="white" width="100%%" class="blacktext">
+           <textarea rows="6" cols="60" disabled="disabled">%(receiptMsgPayment)s</textarea>
+           <br/>
+        </td>
+        <td></td>
+    </tr>
+    <tr>
+        <td class="dataCaptionTD"><span class="dataCaptionFormat"><%= _("Success Email Message")%></span></td>
+        <td bgcolor="white" width="100%%" class="blacktext">
+           <textarea rows="6" cols="60" disabled="disabled">%(successMsgPayment)s</textarea>
            <br/>
         </td>

indico/MaKaC/webinterface/tpls/ConfModifEPaymentDataModification.tpl

@@ -28 +28 @@
             <td align="left"><TEXTAREA name="specificConditionsPayment" ROWS="6" COLS="60">%(specificConditionsPayment)s</TEXTAREA></td>
         </tr>
+        <tr>
+            <td nowrap class="dataCaptionTD"><span class="titleCellFormat"><%= _("Payment Summary Email Message")%></span></td>
+            <td align="left">
+                <%=_("Currently this email is")%> <strong>%(receiptMsgPaymentEnabled)s</strong> (<%=_("You can change this in the")%> <a href="%(dataModificationURL)s"><%=_("registration form setup")%></a>)<br>
+                <textarea name="receiptMsgPayment" rows="6" cols="60">%(receiptMsgPayment)s</textarea>
+            </td>
+        </tr>
+        <tr>
+            <td nowrap class="dataCaptionTD"><span class="titleCellFormat"><%= _("Success Email Message")%></span></td>
+            <td align="left">
+                <%=_("Currently this email is")%> <strong>%(successMsgPaymentEnabled)s</strong> (<%=_("You can change this in the")%> <a href="%(dataModificationURL)s"><%=_("registration form setup")%></a>)<br>
+                <textarea name="successMsgPayment" rows="6" cols="60">%(successMsgPayment)s</textarea>
+            </td>
+        </tr>
                 <tr><td>&nbsp;</td></tr>
         <tr>

indico/MaKaC/webinterface/tpls/ConfModifRegForm.tpl

@@ -69 +69 @@
     <td class="blacktext">
       %(notification)s
+    </td>
+  </tr>
+  <tr>
+    <td class="dataCaptionTD"><span class="dataCaptionFormat"> <%= _("Email registrant:")%></span></td>
+    <td bgcolor="white" width="100%%">
+      <table>
+        <tr>
+          <td align="right"><strong><%= _("After registration")%></strong>:</td>
+          <td>%(sendRegEmail)s</td>
+        </tr>
+        <tr>
+          <td align="right"><strong><%= _("With a payment summary")%></strong>:</td>
+          <td>%(sendReceiptEmail)s</td>
+        </tr>
+        <tr>
+          <td align="right"><strong><%= _("After successful payment")%></strong>:</td>
+          <td>%(sendPaidEmail)s</td>
+        </tr>
+      </table>
     </td>
   </tr>

indico/MaKaC/webinterface/tpls/ConfModifRegFormDataModification.tpl

@@ -86 +86 @@
     </tr>
     <tr>
-      <td nowrap class="titleCellTD"><span class="titleCellFormat"> <%= _("Email Notification")%></span></td>
+      <td nowrap class="titleCellTD">
+        <span class="titleCellFormat"> <%= _("Email organisators")%></span><br>
+        <span class="smallLabel"><%= _("(on new registrations)")%></span>
+      </td>
       <td bgcolor="white" width="100%%">
         <table align="left">
@@ -98 +101 @@
         </tr>
         <tr>
-          <td>
+          <td align="right">
           <b> <%= _("Cc List")%>:&nbsp;</b>
           </td>
@@ -109 +112 @@
     </tr>
     <tr>
+      <td nowrap class="titleCellTD"><span class="titleCellFormat"> <%= _("Email registrant...")%></span></td>
+      <td bgcolor="white" width="100%%">
+        <input type="checkbox" size="50" name="sendRegEmail" id="sendRegEmail" %(sendRegEmail)s>
+        <label for="sendRegEmail"><strong><%= _("...after registration")%></strong></label>
+        <br>
+
+        <input type="checkbox" size="50" name="sendReceiptEmail" id="sendReceiptEmail" %(sendReceiptEmail)s>
+        <label for="sendReceiptEmail"><strong><%= _("...with a payment summary")%></strong></label>
+        <br>
+
+        <input type="checkbox" size="50" name="sendPaidEmail" id="sendPaidEmail" %(sendPaidEmail)s>
+        <label for="sendPaidEmail"><strong><%= _("...after successful payment")%></strong></label>
+      </td>
+    </tr>
+    <tr>
       <td nowrap class="titleCellTD"><span class="titleCellFormat"> <%= _("Must have an account")%></span></td>
-      <td bgcolor="white" width="100%%"><input type="checkbox" size="50" name="mandatoryAccount" %(mandatoryAccount)s> ( <%= _("Uncheck if an account is not needed")%>)</td>
+      <td bgcolor="white" width="100%%"><input type="checkbox" size="50" name="mandatoryAccount" %(mandatoryAccount)s> (<%= _("Uncheck if an account is not needed")%>)</td>
     </tr>
 

indico/htdocs/css/Default.css

@@ -13 +13 @@
 div.wrapper .emptyFooter {
     height: 50px; /* The height of the footer */
+}
+
+.smallLabel {
+    font-size: 10px;
 }