diff --git a/crm/fcrm/doctype/crm_call_log/crm_call_log.py b/crm/fcrm/doctype/crm_call_log/crm_call_log.py index 0147b9ac..42752c6a 100644 --- a/crm/fcrm/doctype/crm_call_log/crm_call_log.py +++ b/crm/fcrm/doctype/crm_call_log/crm_call_log.py @@ -69,64 +69,14 @@ class CRMCallLog(Document): "duration", "from", "to", + "note", + "recording_url", + "reference_doctype", + "reference_docname", "creation", ] return {'columns': columns, 'rows': rows} -@frappe.whitelist() -def get_call_log(name): - doc = frappe.get_doc("CRM Call Log", name) - doc = doc.as_dict() - if doc.reference_docname and doc.reference_doctype == "CRM Lead": - doc.lead = doc.reference_docname - doc.lead_name = frappe.db.get_value("CRM Lead", doc.reference_docname, "lead_name") - if doc.note: - note = frappe.db.get_values("FCRM Note", doc.note, ["title", "content"])[0] - doc.note_doc = { - "name": doc.note, - "title": note[0], - "content": note[1] - } - - def get_contact(number): - c = frappe.db.get_value("Contact", {"mobile_no": number}, ["full_name", "image"], as_dict=True) - if c: - return [c.full_name, c.image] - return [None, None] - - def get_lead_contact(number): - l = frappe.db.get_value("CRM Lead", {"mobile_no": number, "converted": 0}, ["lead_name", "image"], as_dict=True) - if l: - return [l.lead_name, l.image] - return [None, None] - - def get_user(user): - u = frappe.db.get_value("User", user, ["full_name", "user_image"], as_dict=True) - if u: - return [u.full_name, u.user_image] - return [None, None] - - if doc.type == "Incoming": - doc.caller = { - "label": get_contact(doc.get("from"))[0] or get_lead_contact(doc.get("from"))[0] or "Unknown", - "image": get_contact(doc.get("from"))[1] or get_lead_contact(doc.get("from"))[1] - } - doc.receiver = { - "label": get_user(doc.get("receiver"))[0], - "image": get_user(doc.get("receiver"))[1] - } - else: - doc.caller = { - "label": get_user(doc.get("caller"))[0], - "image": get_user(doc.get("caller"))[1] - } - doc.receiver = { - "label": get_contact(doc.get("to"))[0] or get_lead_contact(doc.get("to"))[0] or "Unknown", - "image": get_contact(doc.get("to"))[1] or get_lead_contact(doc.get("to"))[1] - } - - return doc - @frappe.whitelist() def create_lead_from_call_log(call_log): lead = frappe.new_doc("CRM Lead") diff --git a/frontend/src/components/Icons/CheckCircleIcon.vue b/frontend/src/components/Icons/CheckCircleIcon.vue new file mode 100644 index 00000000..5daed8c7 --- /dev/null +++ b/frontend/src/components/Icons/CheckCircleIcon.vue @@ -0,0 +1,23 @@ + diff --git a/frontend/src/components/ListViews/CallLogsListView.vue b/frontend/src/components/ListViews/CallLogsListView.vue index 7ccd86a6..b8302a50 100644 --- a/frontend/src/components/ListViews/CallLogsListView.vue +++ b/frontend/src/components/ListViews/CallLogsListView.vue @@ -3,10 +3,7 @@ :columns="columns" :rows="rows" :options="{ - getRowRoute: (row) => ({ - name: 'Call Log', - params: { callLogId: row.name }, - }), + onRowClick: (row) => emit('showCallLog', row.name), selectable: options.selectable, showTooltip: options.showTooltip, resizeColumn: options.resizeColumn, diff --git a/frontend/src/components/Modals/CallLogModal.vue b/frontend/src/components/Modals/CallLogModal.vue new file mode 100644 index 00000000..294103b2 --- /dev/null +++ b/frontend/src/components/Modals/CallLogModal.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/frontend/src/components/Modals/NoteModal.vue b/frontend/src/components/Modals/NoteModal.vue index 8597b461..fde58204 100644 --- a/frontend/src/components/Modals/NoteModal.vue +++ b/frontend/src/components/Modals/NoteModal.vue @@ -149,7 +149,7 @@ watch( nextTick(() => { title.value.el.focus() _note.value = { ...props.note } - if (_note.value.title) { + if (_note.value.title || _note.value.content) { editMode.value = true } }) diff --git a/frontend/src/pages/CallLog.vue b/frontend/src/pages/CallLog.vue deleted file mode 100644 index dd258e06..00000000 --- a/frontend/src/pages/CallLog.vue +++ /dev/null @@ -1,258 +0,0 @@ - - - - - diff --git a/frontend/src/pages/CallLogs.vue b/frontend/src/pages/CallLogs.vue index 28bb5983..280c11a4 100644 --- a/frontend/src/pages/CallLogs.vue +++ b/frontend/src/pages/CallLogs.vue @@ -31,6 +31,7 @@ rowCount: callLogs.data.row_count, totalCount: callLogs.data.total_count, }" + @showCallLog="showCallLog" @loadMore="() => loadMore++" @columnWidthUpdated="() => triggerResize++" @updatePageCount="(count) => (updatedPageCount = count)" @@ -47,6 +48,11 @@ {{ __('No Logs Found') }} +