From 4abd7291add662fb670e892412a50022a9b323b8 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 18 Apr 2024 13:41:45 +0530
Subject: [PATCH] fix: pass doctype also with name

---
 crm/api/activities.py                    | 4 ++--
 frontend/src/components/Activities.vue   | 8 +++-----
 frontend/src/components/WhatsAppArea.vue | 1 -
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/crm/api/activities.py b/crm/api/activities.py
index e2aa7ec6..93d8d1e6 100644
--- a/crm/api/activities.py
+++ b/crm/api/activities.py
@@ -338,10 +338,10 @@ def get_linked_tasks(name):
 	return tasks or []
 
 @frappe.whitelist()
-def get_whatsapp_messages(name):
+def get_whatsapp_messages(doctype, name):
 	whatsapp_messages = frappe.db.get_all(
 		"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"],
 	)
 	return whatsapp_messages or []
diff --git a/frontend/src/components/Activities.vue b/frontend/src/components/Activities.vue
index ef228ebe..16f33924 100644
--- a/frontend/src/components/Activities.vue
+++ b/frontend/src/components/Activities.vue
@@ -112,10 +112,7 @@
   >
     <WhatsAppArea class="px-10" :messages="whatsappMessages.data" />
   </div>
-  <div
-    v-else-if="activities?.length"
-    class="activities flex-1 overflow-y-auto"
-  >
+  <div v-else-if="activities?.length" class="activities flex-1 overflow-y-auto">
     <div
       v-if="title == 'Notes'"
       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({
   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],
   auto: true,
+  transform: (data) => sortByCreation(data),
   onSuccess: () => nextTick(() => scroll()),
 })
 
diff --git a/frontend/src/components/WhatsAppArea.vue b/frontend/src/components/WhatsAppArea.vue
index 8104fcbe..9cfe5818 100644
--- a/frontend/src/components/WhatsAppArea.vue
+++ b/frontend/src/components/WhatsAppArea.vue
@@ -64,6 +64,5 @@ function formatWhatsAppMessage(message) {
   message = message.replace(/(\d+)\. (.*?)(?=\s*(\d+)\.|$)/g, '<li>$2</li>')
 
   return message
-
 }
 </script>