From 47ded1a7f1f153273c11675d83a00f39c0269c9a Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 27 Sep 2023 19:56:26 +0530 Subject: [PATCH] fix: reload emails after sending it --- frontend/src/components/Activities.vue | 10 +++++++--- frontend/src/components/CommunicationArea.vue | 11 ++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/Activities.vue b/frontend/src/components/Activities.vue index 803c5d9f..4922bd30 100644 --- a/frontend/src/components/Activities.vue +++ b/frontend/src/components/Activities.vue @@ -454,8 +454,9 @@ @@ -508,6 +509,8 @@ const props = defineProps({ const lead = defineModel() const reload = defineModel('reload') +const reload_email = ref(false) + const versions = createResource({ url: 'crm.fcrm.doctype.crm_lead.api.get_activities', params: { name: lead.value.data.name }, @@ -739,10 +742,11 @@ async function updateNote(note) { } } -watch(reload, (value) => { - if (value) { +watch([reload, reload_email], ([reload_value, reload_email_value]) => { + if (reload_value || reload_email_value) { versions.reload() reload.value = false + reload_email.value = false } }) diff --git a/frontend/src/components/CommunicationArea.vue b/frontend/src/components/CommunicationArea.vue index f30c5d8d..f7efe47e 100644 --- a/frontend/src/components/CommunicationArea.vue +++ b/frontend/src/components/CommunicationArea.vue @@ -42,7 +42,7 @@ }, }" :editable="showCommunicationBox" - v-model="modelValue.data" + v-model="lead.data" placeholder="Add a reply..." /> @@ -56,7 +56,8 @@ import { usersStore } from '@/stores/users' import { call } from 'frappe-ui' import { ref, watch, computed, defineModel } from 'vue' -const modelValue = defineModel() +const lead = defineModel() +const reload = defineModel('reload') const { getUser } = usersStore() @@ -84,13 +85,13 @@ const onNewEmailChange = (value) => { async function sendMail() { await call('frappe.core.doctype.communication.email.make', { - recipients: modelValue.value.data.email, + recipients: lead.value.data.email, cc: '', bcc: '', subject: 'Email from Agent', content: newEmail.value, doctype: 'CRM Lead', - name: modelValue.value.data.name, + name: lead.value.data.name, send_email: 1, sender: getUser().name, sender_full_name: getUser()?.full_name || undefined, @@ -102,7 +103,7 @@ async function submitComment() { showCommunicationBox.value = false await sendMail() newEmail.value = '' - modelValue.value.reload() + reload.value = true } defineExpose({ show: showCommunicationBox })