nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 09:54:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: used get_employees_with_number, strip_number methods

Browse Source
This commit is contained in:
Subin Tom
2022-03-22 16:22:09 +05:30
parent 1ab5b7a811
commit b19305aa83
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
erpnext/telephony/doctype/call_log/call_log.py
View File

@@ -36,14 +36,11 @@ class CallLog(Document):
# Add Employee Name
if self.is_incoming_call():
# Taking the last 10 digits of the number
emp_number_reversed = (self.get("to"))[-1:-11:-1]
emp_number = emp_number_reversed[-1::-1]
employee = frappe.get_all("Employee", filters={
"cell_number": ["like", "%"+emp_number+"%"]
}, fields=["first_name", "middle_name", "last_name", "user_id"])
employee_number = strip_number(self.get('to'))
employee = get_employees_with_number(self.get("to"))
self.call_received_by = get_employee_name(employee[0])
self.employee_user_id = employee[0].get("user_id") or ''
self.call_received_by = employee[0].get("name")
self.employee_user_id = employee[0].get("user_id")
def after_insert(self):
self.trigger_call_popup()
@@ -78,7 +75,8 @@ class CallLog(Document):
def trigger_call_popup(self):
if self.is_incoming_call():
scheduled_employees = get_scheduled_employees_for_popup(self.medium)
employee_emails = get_employees_with_number(self.to)
employees = get_employees_with_number(self.to)
employee_emails = [employee.get("user_id") for employee in employees]
# check if employees with matched number are scheduled to receive popup
emails = set(scheduled_employees).intersection(employee_emails)
@@ -115,18 +113,17 @@ def get_employees_with_number(number):
number = strip_number(number)
if not number: return []
employee_emails = frappe.cache().hget('employees_with_number', number)
if employee_emails: return employee_emails
employee_doc_name_and_emails = frappe.cache().hget('employees_with_number', number)
if employee_doc_name_and_emails: return employee_doc_name_and_emails
employees = frappe.get_all('Employee', filters={
employee_doc_name_and_emails = frappe.get_all('Employee', filters={
'cell_number': ['like', '%{}%'.format(number)],
'user_id': ['!=', '']
}, fields=['user_id'])
}, fields=['name', 'user_id'])
employee_emails = [employee.user_id for employee in employees]
frappe.cache().hset('employees_with_number', number, employee_emails)
frappe.cache().hset('employees_with_number', number, employee_doc_name_and_emails)
return employee_emails
return employee_doc_name_and_emails
def link_existing_conversations(doc, state):
"""