nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Newsletter: Bulk Send via worker

Browse Source
This commit is contained in:
Anand Doshi
2014-07-22 19:48:26 +05:30
parent cb86d597b7
commit de85a3af15
2 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/support/doctype/newsletter/newsletter.py
View File

@@ -8,11 +8,12 @@ import frappe.utils
from frappe.utils import cstr
from frappe import throw, _
from frappe.model.document import Document
import erpnext.tasks
class Newsletter(Document):
def onload(self):
if self.email_sent:
self.get("__onload").status_count = dict(frappe.db.sql("""select status, count(*)
self.get("__onload").status_count = dict(frappe.db.sql("""select status, count(name)
from `tabBulk Email` where ref_doctype=%s and ref_docname=%s
group by status""", (self.doctype, self.name))) or None
@@ -28,7 +29,13 @@ class Newsletter(Document):
throw(_("Newsletter has already been sent"))
self.recipients = self.get_recipients()
self.send_bulk()
if frappe.local.is_ajax:
# to avoid request timed out!
self.validate_send()
erpnext.tasks.send_newsletter.delay(frappe.local.site, self.name)
else:
self.send_bulk()
frappe.msgprint(_("Scheduled to send to {0} recipients").format(len(self.recipients)))
@@ -77,6 +84,10 @@ class Newsletter(Document):
return email_list
def send_bulk(self):
if not self.get("recipients"):
# in case it is called via worker
self.recipients = self.get_recipients()
self.validate_send()
sender = self.send_from or frappe.utils.get_formatted_email(self.owner)
@@ -98,10 +109,6 @@ class Newsletter(Document):
if self.get("__islocal"):
throw(_("Please save the Newsletter before sending"))
from frappe import conf
if (conf.get("status") or None) == "Trial":
throw(_("Newsletters is not allowed for Trial users"))
@frappe.whitelist()
def get_lead_options():
return {