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

Merge pull request #849 from shariquerik/communication-date

Browse Source
This commit is contained in:
Shariq Ansari 2025-05-22 18:53:20 +05:30 committed by GitHub
commit 0f0b012a44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crm/api/activities.py
View File

@ -124,6 +124,7 @@ def get_deal_activities(name):
activity = { activity = {
"activity_type": "communication", "activity_type": "communication",
"communication_type": communication.communication_type, "communication_type": communication.communication_type,
"communication_date": communication.communication_date or communication.creation,
"creation": communication.creation, "creation": communication.creation,
"data": { "data": {
"subject": communication.subject, "subject": communication.subject,
@ -255,6 +256,7 @@ def get_lead_activities(name):
activity = { activity = {
"activity_type": "communication", "activity_type": "communication",
"communication_type": communication.communication_type, "communication_type": communication.communication_type,
"communication_date": communication.communication_date or communication.creation,
"creation": communication.creation, "creation": communication.creation,
"data": { "data": {
"subject": communication.subject, "subject": communication.subject,

4
frontend/src/components/Activities/EmailArea.vue
View File

@ -22,9 +22,9 @@
variant="subtle" variant="subtle"
:theme="status.color" :theme="status.color"
/> />
<Tooltip :text="formatDate(activity.creation)"> <Tooltip :text="formatDate(activity.communication_date)">
<div class="text-sm text-ink-gray-5"> <div class="text-sm text-ink-gray-5">
{{ __(timeAgo(activity.creation)) }} {{ __(timeAgo(activity.communication_date)) }}
</div> </div>
</Tooltip> </Tooltip>
<div class="flex gap-0.5"> <div class="flex gap-0.5">