Merge pull request #173 from neelbhanushali/email-notifications-in-activity

Email Notifications in Lead/Deal Activity

crm/api/activities.py

@@ -110,9 +110,10 @@ def get_deal_activities(name):
 		}
 		activities.append(activity)
 
-	for communication in docinfo.communications:
+	for communication in docinfo.communications + docinfo.automated_messages:
 		activity = {
 			"activity_type": "communication",
+			"communication_type": communication.communication_type,
 			"creation": communication.creation,
 			"data": {
 				"subject": communication.subject,
@@ -222,9 +223,10 @@ def get_lead_activities(name):
 		}
 		activities.append(activity)
 
-	for communication in docinfo.communications:
+	for communication in docinfo.communications + docinfo.automated_messages:
 		activity = {
 			"activity_type": "communication",
+			"communication_type": communication.communication_type,
 			"creation": communication.creation,
 			"data": {
 				"subject": communication.subject,

frontend/src/components/Activities.vue

@@ -386,6 +386,12 @@
                     {{ __(timeAgo(activity.creation)) }}
                   </div>
                 </Tooltip>
+                <Badge
+                  v-if="activity.communication_type == 'Automated Message'"
+                  :label="__('Notification')"
+                  variant="subtle"
+                  theme="green"
+                />
               </div>
               <div class="flex gap-0.5">
                 <Tooltip :text="__('Reply')">
@@ -834,6 +840,7 @@ import {
   Dropdown,
   TextEditor,
   Avatar,
+  Badge,
   createResource,
   call,
 } from 'frappe-ui'