Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-13 16:23:06 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: reverse meta relation and tidy code

Browse Source
This commit is contained in:
Mythie
2023-09-22 12:27:54 +00:00
parent e330e90688
commit f4c7799537
13 changed files with 165 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/lib/server-only/document/get-document-by-id.ts
View File

@ -13,6 +13,7 @@ export const getDocumentById = async ({ id, userId }: GetDocumentByIdOptions) =>
},
include: {
documentData: true,
documentMeta: true,
},
});
};

13
packages/lib/server-only/document/send-document.tsx
View File

@ -26,11 +26,11 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions)
},
include: {
Recipient: true,
DocumentMeta: true,
documentMeta: true,
},
});
const customEmail = document?.DocumentMeta;
const customEmail = document?.documentMeta;
if (!document) {
throw new Error('Document not found');
@ -67,10 +67,7 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions)
inviterEmail: user.email,
assetBaseUrl,
signDocumentLink,
customBody: renderCustomEmailTemplate(
customEmail?.customEmailBody || '',
customEmailTemplate,
),
customBody: renderCustomEmailTemplate(customEmail?.message || '', customEmailTemplate),
});
await mailer.sendMail({
@ -82,8 +79,8 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions)
name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com',
},
subject: customEmail?.customEmailSubject
? renderCustomEmailTemplate(customEmail.customEmailSubject, customEmailTemplate)
subject: customEmail?.subject
? renderCustomEmailTemplate(customEmail.subject, customEmailTemplate)
: 'Please sign this document',
html: render(template),
text: render(template, { plainText: true }),