diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index 52940e19c..88cb44c97 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -308,14 +308,18 @@ const ReportTable = (props) => { const sendMail = item?.SendMail || false; const getUrl = (x) => { //encode this url value `${item.objectId}/${x.Email}/${x.objectId}` to base64 using `btoa` function - const encodeBase64 = btoa( - `${item.objectId}/${x.Email}/${x.objectId}/${sendMail}` - ); - return `${host}/login/${encodeBase64}`; + if (x.objectId) { + const encodeBase64 = btoa( + `${item.objectId}/${x.signerPtr.Email}/${x.signerPtr.objectId}/${sendMail}` + ); + return `${host}/login/${encodeBase64}`; + } else { + const encodeBase64 = btoa(`${item.objectId}/${x.email}`); + return `${host}/login/${encodeBase64}`; + } }; - - const urls = item.Signers.map((x) => ({ - email: x.Email, + const urls = item?.Placeholders?.map((x) => ({ + email: x.email ? x.email : x.signerPtr.Email, url: getUrl(x) })); setShareUrls(urls); diff --git a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js index c58485c10..2f4aed714 100644 --- a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js +++ b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js @@ -166,8 +166,6 @@ export default async function createBatchDocs(request) { createdAt: response.data[i]?.success?.createdAt, })); for (let i = 0; i < updateDocuments.length; i++) { - console.log('updateDocuments ', updateDocuments); - sendMail(updateDocuments[i], sessionToken); } return 'success'; diff --git a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js index d3761e5ae..229d0b64c 100644 --- a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js +++ b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js @@ -102,6 +102,7 @@ export default function reportJson(id, userId) { 'AuditTrail.UserPtr', 'ExpiryDate', 'SendMail', + 'Placeholders', ], }; // completed documents report @@ -220,6 +221,7 @@ export default function reportJson(id, userId) { 'AuditTrail', 'AuditTrail.UserPtr', 'ExpiryDate', + 'Placeholders', ], }; // Recent signature requests report show on dashboard