From 391aa028e6316f006217b8eae253a1c7576ea721 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Jul 2011 14:07:50 +0530 Subject: [PATCH] cleanups to support email (dirty) --- favicon.ico | Bin 0 -> 1406 bytes patches/patch.py | 23 +++ .../doctype/email_settings/email_settings.py | 67 ++++---- .../doctype/email_settings/email_settings.txt | 115 ++++++++++++-- .../support_email_settings/__init__.py | 0 .../support_email_settings.py | 18 --- .../support_email_settings.txt | 144 ------------------ support/doctype/support_ticket/__init__.py | 51 ++++++- .../doctype/support_ticket/support_ticket.js | 4 +- .../doctype/support_ticket/support_ticket.py | 4 +- .../doctype/support_ticket/support_ticket.txt | 2 +- 11 files changed, 207 insertions(+), 221 deletions(-) create mode 100644 favicon.ico delete mode 100644 setup/doctype/support_email_settings/__init__.py delete mode 100644 setup/doctype/support_email_settings/support_email_settings.py delete mode 100644 setup/doctype/support_email_settings/support_email_settings.txt diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..8b2106b847e3a8bba936389cf3249605270ea5e5 GIT binary patch literal 1406 zcmeH{u};G<5QcvP39(z(NeC<~VJl4Z1(l9hIx;cjEZg_p{g!<<7!Wk#7~c8;utQ#(CWmsG0uim=DfeH#a}GDRZ#X`m zVen;f@c4qgVgh&HL+9iJb~?n-_za!yJKV!5hEEoG@r;2T;c!34ZZXB>>o+bwuVF`5 zaCbe@_m}t7UfqGZ1OK)IX4QZwYlNW=^hN?0gDlL*w2rmb#8HEY{*!gWATfq;tE?`e zi07(Uk{IK~i--=Gt2DrQrIsuubF&Jx modified") + def get_support_mails(): """ @@ -63,8 +105,3 @@ def get_support_mails(): """ SupportMailbox().get_messages() -def auto_close_tickets(): - """ - Auto Closes Waiting for Customer Support Ticket after 15 days - """ - webnotes.conn.sql("update `tabSupport Ticket` set status = 'Closed' where status = 'Waiting for Customer' and date_sub(curdate(),interval 15 Day) > modified") diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js index 2c1e77faed..914227b222 100644 --- a/support/doctype/support_ticket/support_ticket.js +++ b/support/doctype/support_ticket/support_ticket.js @@ -20,9 +20,9 @@ $.extend(cur_frm.cscript, { items: [ { column: 0, - label:'Support Email Settings', + label:'Email Settings', description:'Integrate your incoming support emails to support ticket', - onclick: function() { loaddoc('Support Email Settings','Support Email Settings'); } + onclick: function() { loaddoc('Email Settings','Email Settings'); } }, ] }) diff --git a/support/doctype/support_ticket/support_ticket.py b/support/doctype/support_ticket/support_ticket.py index 75defbeb34..c71304a0f7 100644 --- a/support/doctype/support_ticket/support_ticket.py +++ b/support/doctype/support_ticket/support_ticket.py @@ -19,7 +19,7 @@ class DocType(TransactionBase): response = self.doc.new_response + '\n\n[Please do not change the subject while responding.]' - signature = webnotes.conn.get_value('Support Email Settings',None,'signature') + signature = webnotes.conn.get_value('Email Settings',None,'support_signature') if signature: response += '\n\n' + signature @@ -27,7 +27,7 @@ class DocType(TransactionBase): sendmail(\ recipients = [self.doc.raised_by], \ - sender=webnotes.conn.get_value('Support Email Settings',None,'email'), \ + sender=webnotes.conn.get_value('Email Settings',None,'support_email'), \ subject=subject, \ msg=response) diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt index caeb801f9a..211f51240e 100644 --- a/support/doctype/support_ticket/support_ticket.txt +++ b/support/doctype/support_ticket/support_ticket.txt @@ -24,7 +24,7 @@ 'server_code_error': ' ', 'show_in_menu': 0, 'subject': '%(subject)s', - 'tag_fields': 'status,allocated_to', + 'tag_fields': 'status', 'version': 150 },