test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: show notification badge if email came from notification

Browse Source
This commit is contained in:
Shariq Ansari 2024-05-13 15:56:06 +05:30
parent ed1081d718
commit 03e52c34e1
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crm/api/activities.py
View File

@ -113,6 +113,7 @@ def get_deal_activities(name):
for communication in docinfo.communications + docinfo.automated_messages: for communication in docinfo.communications + docinfo.automated_messages:
activity = { activity = {
"activity_type": "communication", "activity_type": "communication",
"communication_type": communication.communication_type,
"creation": communication.creation, "creation": communication.creation,
"data": { "data": {
"subject": communication.subject, "subject": communication.subject,
@ -225,6 +226,7 @@ def get_lead_activities(name):
for communication in docinfo.communications + docinfo.automated_messages: for communication in docinfo.communications + docinfo.automated_messages:
activity = { activity = {
"activity_type": "communication", "activity_type": "communication",
"communication_type": communication.communication_type,
"creation": communication.creation, "creation": communication.creation,
"data": { "data": {
"subject": communication.subject, "subject": communication.subject,

7
frontend/src/components/Activities.vue
View File

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