From 02cc55dd4848328d485ce8ea683eba2e2695ec46 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 16 Aug 2017 16:42:50 +0530 Subject: [PATCH] [hotfix] minor fixes --- frappe/email/queue.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/frappe/email/queue.py b/frappe/email/queue.py index 5aa6e4c802..67c1f1d739 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -224,11 +224,12 @@ def check_email_limit(recipients): monthly_email_limit = 500 daily_email_limit = 50 - # get count of today's sent mails - today = get_emails_sent_today() - if daily_email_limit and (today + len(recipients)) > daily_email_limit: - throw(_("Cannot send this email. You have crossed the sending limit of {0} emails for this day.").format(daily_email_limit), - EmailLimitCrossedError) + if daily_email_limit: + # get count of sent mails in last 24 hours + today = get_emails_sent_today() + if (today + len(recipients)) > daily_email_limit: + throw(_("Cannot send this email. You have crossed the sending limit of {0} emails for this day.").format(daily_email_limit), + EmailLimitCrossedError) if not monthly_email_limit: return @@ -246,7 +247,7 @@ def get_emails_sent_this_month(): def get_emails_sent_today(): return frappe.db.sql("""select count(name) from `tabEmail Queue` where - status='Sent' and DATE(creation)=CURDATE()""")[0][0] + status='Sent' and creation>DATE_SUB(NOW(), INTERVAL 24 HOUR)""")[0][0] def get_unsubscribe_message(unsubscribe_message, expose_recipients): if unsubscribe_message: