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

fix: show to,cc & bcc in email message

Browse Source
This commit is contained in:
Shariq Ansari 2023-12-26 19:57:36 +05:30
parent 185bc2c032
commit 81fd7875d6
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -354,7 +354,7 @@
<div <div
class="cursor-pointer rounded-md bg-gray-50 p-3 text-base leading-6 transition-all duration-300 ease-in-out" class="cursor-pointer rounded-md bg-gray-50 p-3 text-base leading-6 transition-all duration-300 ease-in-out"
> >
<div class="mb-3 flex items-center justify-between gap-2"> <div class="mb-1 flex items-center justify-between gap-2">
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<UserAvatar :user="activity.data.sender" size="md" /> <UserAvatar :user="activity.data.sender" size="md" />
<span>{{ activity.data.sender_full_name }}</span> <span>{{ activity.data.sender_full_name }}</span>
@ -376,6 +376,16 @@
</Button> </Button>
</div> </div>
</div> </div>
<div class="mb-3 text-sm text-gray-600 leading-5">
<span class="mr-1">TO:</span>
<span>{{ activity.data.recipients }}</span>
<span v-if="activity.data.cc">, </span>
<span v-if="activity.data.cc" class="mr-1">CC:</span>
<span v-if="activity.data.cc">{{ activity.data.cc }}</span>
<span v-if="activity.data.bcc">, </span>
<span v-if="activity.data.bcc" class="mr-1">BCC:</span>
<span v-if="activity.data.bcc">{{ activity.data.bcc }}</span>
</div>
<span class="prose-f" v-html="activity.data.content" /> <span class="prose-f" v-html="activity.data.content" />
<div class="flex flex-wrap gap-2"> <div class="flex flex-wrap gap-2">
<AttachmentItem <AttachmentItem

6
frontend/src/components/CommunicationArea.vue
View File

@ -109,10 +109,10 @@ async function sendMail() {
let cc = newEmailEditor.value.ccEmails let cc = newEmailEditor.value.ccEmails
let bcc = newEmailEditor.value.bccEmails let bcc = newEmailEditor.value.bccEmails
await call('frappe.core.doctype.communication.email.make', { await call('frappe.core.doctype.communication.email.make', {
recipients: recipients.join(','), recipients: recipients.join(', '),
attachments: attachments.value.map((x) => x.name), attachments: attachments.value.map((x) => x.name),
cc: cc.join(','), cc: cc.join(', '),
bcc: bcc.join(','), bcc: bcc.join(', '),
subject: 'Email from Agent', subject: 'Email from Agent',
content: newEmail.value, content: newEmail.value,
doctype: props.doctype, doctype: props.doctype,