Changeset 80d8926

Timestamp:

Jul 7, 2014, 10:06:58 PM (11 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master

Children:

56c7337

Parents:

b61cf1a

git-author:

Alex Dehnert <adehnert@…> (07/07/14 22:06:58)

git-committer:

Alex Dehnert <adehnert@…> (07/07/14 22:06:58)

Message:

Refactor email-sending part of RR approval

File:

• remit/vouchers/models.py (modified) (2 diffs)

remit/vouchers/models.py

@@ -118 +118 @@
         self.save()
 
+    def send_approval_email(self, approver, approval_type):
+        tmpl = get_template('vouchers/emails/request_approval_admin.txt')
+        ctx = Context({
+            'approver': approver,
+            'request': self,
+            'approval_type': approval_type,
+        })
+        body = tmpl.render(ctx)
+        mail_admins(
+            'Request approval: %s approved $%s [%s]' % (
+                approver,
+                self.amount,
+                approval_type,
+            ),
+            body,
+        )
+
     def approve(self, approver, signatory_name, signatory_email=None, ):
         """Mark a request as approved.
@@ -126 +143 @@
         """
         self.convert_to_voucher(signatory_name, signatory_email,)
-        tmpl = get_template('vouchers/emails/request_approval_admin.txt')
-        ctx = Context({
-            'approver': approver,
-            'request': self,
-            'approval_type': 'voucher',
-        })
-        body = tmpl.render(ctx)
-        mail_admins(
-            'Request approval: %s approved $%s [voucher]' % (
-                approver,
-                self.amount,
-            ),
-            body,
-        )
+        self.send_approval_email(approver, 'voucher')
 
     def approve_as_rfp(self, approver, ):
         self.convert_to_rfp()
-        tmpl = get_template('vouchers/emails/request_approval_admin.txt')
-        ctx = Context({
-            'approver': approver,
-            'request': self,
-            'approval_type': 'RFP',
-        })
-        body = tmpl.render(ctx)
-        mail_admins(
-            'Request approval: %s approved $%s [RFP]' % (
-                approver,
-                self.amount,
-            ),
-            body,
-        )
-
+        self.send_approval_email(approver, 'RFP')
 
     def review_link(self, ):