schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Get available employees from communication medium

Browse Source
This commit is contained in:
Suraj Shetty
2019-06-06 11:24:31 +05:30
parent 44c0e9d549
commit 87645e98ad
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/crm/doctype/utils.py
View File

@@ -79,4 +79,18 @@ def add_call_summary(docname, summary):
call_log.call_summary += '<br>' + content call_log.call_summary += '<br>' + content
call_log.save(ignore_permissions=True) call_log.save(ignore_permissions=True)
def get_employee_emails_for_popup():
employee_emails = []
now_time = frappe.utils.nowtime()
weekday = frappe.utils.get_weekday()
available_employee_groups = frappe.db.sql("""SELECT `parent`, `employee_group`
FROM `tabCommunication Medium Timeslot`
WHERE `day_of_week` = %s AND
%s BETWEEN `from_time` AND `to_time`
""", (weekday, now_time), as_dict=1)
for group in available_employee_groups:
employee_emails += [e.user_id for e in frappe.get_doc('Employee Group', group.employee_group).employee_list]
return employee_emails

29
erpnext/erpnext_integrations/exotel_integration.py
View File

@@ -1,5 +1,5 @@
import frappe import frappe
from erpnext.crm.doctype.utils import get_document_with_phone_number from erpnext.crm.doctype.utils import get_document_with_phone_number, get_employee_emails_for_popup
import requests import requests
# api/method/erpnext.erpnext_integrations.exotel_integration.handle_incoming_call # api/method/erpnext.erpnext_integrations.exotel_integration.handle_incoming_call
@@ -9,39 +9,34 @@ def handle_incoming_call(*args, **kwargs):
exotel_settings = get_exotel_settings() exotel_settings = get_exotel_settings()
if not exotel_settings.enabled: return if not exotel_settings.enabled: return
employee_email = kwargs.get('AgentEmail')
status = kwargs.get('Status') status = kwargs.get('Status')
if status == 'free': if status == 'free':
# call disconnected for agent # call disconnected for agent
# "and get_call_status(kwargs.get('CallSid')) in ['in-progress']" - additional check to ensure if the call was redirected # "and get_call_status(kwargs.get('CallSid')) in ['in-progress']" - additional check to ensure if the call was redirected
frappe.publish_realtime('call_disconnected', user=employee_email)
return return
call_log = get_call_log(kwargs) call_log = get_call_log(kwargs)
data = frappe._dict({ employee_emails = get_employee_emails_for_popup()
'call_from': kwargs.get('CallFrom'), for email in employee_emails:
'agent_email': kwargs.get('AgentEmail'), frappe.publish_realtime('show_call_popup', call_log, user=email)
'call_type': kwargs.get('Direction'),
'call_log': call_log,
'call_status_method': 'erpnext.erpnext_integrations.exotel_integration.get_call_status'
})
frappe.publish_realtime('show_call_popup', data, user=data.agent_email)
@frappe.whitelist(allow_guest=True) @frappe.whitelist(allow_guest=True)
def handle_end_call(*args, **kwargs): def handle_end_call(*args, **kwargs):
close_call_log(kwargs) frappe.publish_realtime('call_disconnected', data=kwargs.get('CallSid'))
update_call_log(kwargs, 'Completed')
@frappe.whitelist(allow_guest=True) @frappe.whitelist(allow_guest=True)
def handle_missed_call(*args, **kwargs): def handle_missed_call(*args, **kwargs):
close_call_log(kwargs) frappe.publish_realtime('call_disconnected', data=kwargs.get('CallSid'))
update_call_log(kwargs, 'Missed')
def close_call_log(call_payload): def update_call_log(call_payload, status):
call_log = get_call_log(call_payload) call_log = get_call_log(call_payload, False)
if call_log: if call_log:
call_log.status = 'Closed' call_log.call_status = status
call_log.call_duration = call_payload.get('DialCallDuration') or 0
call_log.save(ignore_permissions=True) call_log.save(ignore_permissions=True)
frappe.db.commit() frappe.db.commit()