Support Ticket: set resolution_date as None if missing
This commit is contained in:
parent
c58e6c0dff
commit
c70d2d23a8
@ -8,31 +8,31 @@ from erpnext.utilities.transaction_base import TransactionBase
|
|||||||
from frappe.utils import now, extract_email_id
|
from frappe.utils import now, extract_email_id
|
||||||
|
|
||||||
class SupportTicket(TransactionBase):
|
class SupportTicket(TransactionBase):
|
||||||
|
|
||||||
def get_sender(self, comm):
|
def get_sender(self, comm):
|
||||||
return frappe.db.get_value('Support Email Settings',None,'support_email')
|
return frappe.db.get_value('Support Email Settings',None,'support_email')
|
||||||
|
|
||||||
def get_subject(self, comm):
|
def get_subject(self, comm):
|
||||||
return '[' + self.name + '] ' + (comm.subject or 'No Subject Specified')
|
return '[' + self.name + '] ' + (comm.subject or 'No Subject Specified')
|
||||||
|
|
||||||
def get_content(self, comm):
|
def get_content(self, comm):
|
||||||
signature = frappe.db.get_value('Support Email Settings',None,'support_signature')
|
signature = frappe.db.get_value('Support Email Settings',None,'support_signature')
|
||||||
content = comm.content
|
content = comm.content
|
||||||
if signature:
|
if signature:
|
||||||
content += '<p>' + signature + '</p>'
|
content += '<p>' + signature + '</p>'
|
||||||
return content
|
return content
|
||||||
|
|
||||||
def get_portal_page(self):
|
def get_portal_page(self):
|
||||||
return "ticket"
|
return "ticket"
|
||||||
|
|
||||||
def validate(self):
|
def validate(self):
|
||||||
self.update_status()
|
self.update_status()
|
||||||
self.set_lead_contact(self.raised_by)
|
self.set_lead_contact(self.raised_by)
|
||||||
|
|
||||||
if self.status == "Closed":
|
if self.status == "Closed":
|
||||||
from frappe.widgets.form.assign_to import clear
|
from frappe.widgets.form.assign_to import clear
|
||||||
clear(self.doctype, self.name)
|
clear(self.doctype, self.name)
|
||||||
|
|
||||||
def set_lead_contact(self, email_id):
|
def set_lead_contact(self, email_id):
|
||||||
import email.utils
|
import email.utils
|
||||||
email_id = email.utils.parseaddr(email_id)
|
email_id = email.utils.parseaddr(email_id)
|
||||||
@ -41,8 +41,8 @@ class SupportTicket(TransactionBase):
|
|||||||
self.lead = frappe.db.get_value("Lead", {"email_id": email_id})
|
self.lead = frappe.db.get_value("Lead", {"email_id": email_id})
|
||||||
if not self.contact:
|
if not self.contact:
|
||||||
self.contact = frappe.db.get_value("Contact", {"email_id": email_id})
|
self.contact = frappe.db.get_value("Contact", {"email_id": email_id})
|
||||||
|
|
||||||
if not self.company:
|
if not self.company:
|
||||||
self.company = frappe.db.get_value("Lead", self.lead, "company") or \
|
self.company = frappe.db.get_value("Lead", self.lead, "company") or \
|
||||||
frappe.db.get_default("company")
|
frappe.db.get_default("company")
|
||||||
|
|
||||||
@ -53,15 +53,16 @@ class SupportTicket(TransactionBase):
|
|||||||
if self.status=="Closed" and status !="Closed":
|
if self.status=="Closed" and status !="Closed":
|
||||||
self.resolution_date = now()
|
self.resolution_date = now()
|
||||||
if self.status=="Open" and status !="Open":
|
if self.status=="Open" and status !="Open":
|
||||||
self.resolution_date = ""
|
# if no date, it should be set as None and not a blank string "", as per mysql strict config
|
||||||
|
self.resolution_date = None
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def set_status(name, status):
|
def set_status(name, status):
|
||||||
st = frappe.get_doc("Support Ticket", name)
|
st = frappe.get_doc("Support Ticket", name)
|
||||||
st.status = status
|
st.status = status
|
||||||
st.save()
|
st.save()
|
||||||
|
|
||||||
def auto_close_tickets():
|
def auto_close_tickets():
|
||||||
frappe.db.sql("""update `tabSupport Ticket` set status = 'Closed'
|
frappe.db.sql("""update `tabSupport Ticket` set status = 'Closed'
|
||||||
where status = 'Replied'
|
where status = 'Replied'
|
||||||
and date_sub(curdate(),interval 15 Day) > modified""")
|
and date_sub(curdate(),interval 15 Day) > modified""")
|
||||||
|
Loading…
Reference in New Issue
Block a user