1
0
forked from test/crm

fix: pass doctype also with name

This commit is contained in:
Shariq Ansari 2024-04-18 13:41:45 +05:30
parent 11770489dc
commit 4abd7291ad
3 changed files with 5 additions and 8 deletions

View File

@ -338,10 +338,10 @@ def get_linked_tasks(name):
return tasks or [] return tasks or []
@frappe.whitelist() @frappe.whitelist()
def get_whatsapp_messages(name): def get_whatsapp_messages(doctype, name):
whatsapp_messages = frappe.db.get_all( whatsapp_messages = frappe.db.get_all(
"WhatsApp Message", "WhatsApp Message",
filters={"reference_doctype": "CRM Lead", "reference_name": name, "status": ("not in", ["failed"])}, filters={"reference_doctype": doctype, "reference_name": name, "status": ("not in", ["failed"])},
fields=["name", "type", "to", "from", "content_type", "creation", "message", "status"], fields=["name", "type", "to", "from", "content_type", "creation", "message", "status"],
) )
return whatsapp_messages or [] return whatsapp_messages or []

View File

@ -112,10 +112,7 @@
> >
<WhatsAppArea class="px-10" :messages="whatsappMessages.data" /> <WhatsAppArea class="px-10" :messages="whatsappMessages.data" />
</div> </div>
<div <div v-else-if="activities?.length" class="activities flex-1 overflow-y-auto">
v-else-if="activities?.length"
class="activities flex-1 overflow-y-auto"
>
<div <div
v-if="title == 'Notes'" v-if="title == 'Notes'"
class="activity grid grid-cols-1 gap-4 px-10 pb-5 lg:grid-cols-2 xl:grid-cols-3" class="activity grid grid-cols-1 gap-4 px-10 pb-5 lg:grid-cols-2 xl:grid-cols-3"
@ -920,9 +917,10 @@ const all_activities = createResource({
const whatsappMessages = createResource({ const whatsappMessages = createResource({
url: 'crm.api.activities.get_whatsapp_messages', url: 'crm.api.activities.get_whatsapp_messages',
params: { name: doc.value.data.name }, params: { doctype: props.doctype, name: doc.value.data.name },
cache: ['whatsapp', doc.value.data.name], cache: ['whatsapp', doc.value.data.name],
auto: true, auto: true,
transform: (data) => sortByCreation(data),
onSuccess: () => nextTick(() => scroll()), onSuccess: () => nextTick(() => scroll()),
}) })

View File

@ -64,6 +64,5 @@ function formatWhatsAppMessage(message) {
message = message.replace(/(\d+)\. (.*?)(?=\s*(\d+)\.|$)/g, '<li>$2</li>') message = message.replace(/(\d+)\. (.*?)(?=\s*(\d+)\.|$)/g, '<li>$2</li>')
return message return message
} }
</script> </script>