Do not send transaction history email when there are no transactions …

…to show.
bartromgens · Dec 2, 2014 · af676b2 · af676b2
1 parent 6d2f8a6
commit af676b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/base/mailnotification.py b/base/mailnotification.py
@@ -12,7 +12,7 @@ def create_transaction_history_table_html(userprofile, date_start, date_end):
             transactions_in_timerange.append(transaction)
 
     if not transactions_in_timerange:
-        return 'No shares in date range.'
+        return ''
     transaction_table = '<table>'
     transaction_table += '<tr align=\'left\'>'
     transaction_table += '<th><b>&#8364;/pp</b></th>'
@@ -41,7 +41,7 @@ def create_transaction_real_history_table_html(userprofile, date_start, date_end
             transactions_in_timerange.append(transaction)
 
     if not transactions_in_timerange:
-        return 'No transactions in date range.'
+        return ''
     transaction_table = '<table style="font-size: 12px">'
     transaction_table += '<tr align=\'left\'>'
     transaction_table += '<th><b>&#8364;</b></th>'

diff --git a/userprofile/models.py b/userprofile/models.py
@@ -62,6 +62,8 @@ def send_transaction_history(self, force_send=False):
         transactionTableHtml = mailnotification.create_transaction_history_table_html(self, date_start, date_end)
         transactionRealTable = mailnotification.create_transaction_real_history_table_html(self, date_start, date_end)
 
+        if transactionTableHtml == '' and transactionRealTable == '':
+            return
         emailserver.send_transaction_history(self.user.username, self.user.email, transactionTableHtml, transactionRealTable, date_start, date_end)        
 
     @staticmethod