test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #545 from frappe/develop

Browse Source
This commit is contained in:
Shariq Ansari 2025-01-23 22:27:57 +05:30 committed by GitHub
commit 24a6942968
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crm/fcrm/doctype/crm_telephony_agent/crm_telephony_agent.json
View File

@ -14,6 +14,7 @@
"section_break_ozjn", "section_break_ozjn",
"twilio", "twilio",
"twilio_number", "twilio_number",
"call_receiving_device",
"column_break_aydj", "column_break_aydj",
"exotel", "exotel",
"exotel_number", "exotel_number",
@ -100,11 +101,19 @@
"fieldtype": "Select", "fieldtype": "Select",
"label": "Default Medium", "label": "Default Medium",
"options": "\nTwilio\nExotel" "options": "\nTwilio\nExotel"
},
{
"default": "Computer",
"depends_on": "twilio",
"fieldname": "call_receiving_device",
"fieldtype": "Select",
"label": "Device",
"options": "Computer\nPhone"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2025-01-19 14:17:12.880185", "modified": "2025-01-23 22:24:53.448716",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "FCRM", "module": "FCRM",
"name": "CRM Telephony Agent", "name": "CRM Telephony Agent",

6
crm/integrations/exotel/handler.py
View File

@ -277,6 +277,12 @@ def update_call_log(call_payload, status="Ringing", call_log=None):
call_log.recording_url = call_payload.get("RecordingUrl") call_log.recording_url = call_payload.get("RecordingUrl")
call_log.start_time = call_payload.get("StartTime") call_log.start_time = call_payload.get("StartTime")
call_log.end_time = call_payload.get("EndTime") call_log.end_time = call_payload.get("EndTime")
if direction == "incoming":
call_log.receiver = call_payload.get("AgentEmail")
else:
call_log.caller = frappe.session.user
call_log.save(ignore_permissions=True) call_log.save(ignore_permissions=True)
frappe.db.commit() frappe.db.commit()
return call_log return call_log

4
crm/integrations/twilio/api.py
View File

@ -21,7 +21,7 @@ def generate_access_token():
if not twilio: if not twilio:
return {} return {}
from_number = frappe.db.get_value("Twilio Agents", frappe.session.user, "twilio_number") from_number = frappe.db.get_value("CRM Telephony Agent", frappe.session.user, "twilio_number")
if not from_number: if not from_number:
return { return {
"ok": False, "ok": False,
@ -40,7 +40,7 @@ def voice(**kwargs):
def _get_caller_number(caller): def _get_caller_number(caller):
identity = caller.replace("client:", "").strip() identity = caller.replace("client:", "").strip()
user = Twilio.emailid_from_identity(identity) user = Twilio.emailid_from_identity(identity)
return frappe.db.get_value("Twilio Agents", user, "twilio_number") return frappe.db.get_value("CRM Telephony Agent", user, "twilio_number")
args = frappe._dict(kwargs) args = frappe._dict(kwargs)
twilio = Twilio.connect() twilio = Twilio.connect()

4
crm/integrations/twilio/twilio_handler.py
View File

@ -162,7 +162,9 @@ def get_twilio_number_owners(phone_number):
# keep + sign in the number at start of the number # keep + sign in the number at start of the number
phone_number = "".join([c for c in phone_number if c.isdigit() or c == "+"]) phone_number = "".join([c for c in phone_number if c.isdigit() or c == "+"])
user_voice_settings = frappe.get_all( user_voice_settings = frappe.get_all(
"Twilio Agents", filters={"twilio_number": phone_number}, fields=["name", "call_receiving_device"] "CRM Telephony Agent",
filters={"twilio_number": phone_number},
fields=["name", "call_receiving_device"],
) )
user_wise_voice_settings = {user["name"]: user for user in user_voice_settings} user_wise_voice_settings = {user["name"]: user for user in user_voice_settings}